Merge pull request #1080 from blink1073/context-tests

Refactor the Document Registry

src/csvwidget/widget.ts

@@ -9,25 +9,25 @@ import {
   Message
 } from 'phosphor/lib/core/messaging';
 
+
+import {
+  PanelLayout
+} from 'phosphor/lib/ui/panel';
+
 import {
   Widget
 } from 'phosphor/lib/ui/widget';
 
 import {
-  ABCWidgetFactory, IDocumentModel, IDocumentContext
+  ABCWidgetFactory, DocumentRegistry
 } from '../docregistry';
 
 import {
   HTML_COMMON_CLASS
 } from '../renderers/widget';
 
-
 import * as d3Dsv from 'd3-dsv';
 
-import {
-  PanelLayout
-} from 'phosphor/lib/ui/panel';
-
 
 /**
  * The class name added to a csv widget.
@@ -68,7 +68,7 @@ class CSVWidget extends Widget {
   /**
    * Construct a new csv table widget.
    */
-  constructor(context: IDocumentContext<IDocumentModel>) {
+  constructor(context: DocumentRegistry.IContext<DocumentRegistry.IModel>) {
     super();
     this._context = context;
     this.node.tabIndex = -1;
@@ -100,7 +100,7 @@ class CSVWidget extends Widget {
     context.model.contentChanged.connect(() => {
       this.update();
     });
-    context.contentsModelChanged.connect(() => {
+    context.fileChanged.connect(() => {
       this.update();
     });
 
@@ -178,7 +178,7 @@ class CSVWidget extends Widget {
     this.node.focus();
   }
 
-  private _context: IDocumentContext<IDocumentModel>;
+  private _context: DocumentRegistry.IContext<DocumentRegistry.IModel>;
   private delimiter: string = ',';
   private _toolbar: Widget = null;
   private _table: Widget = null;
@@ -215,11 +215,11 @@ function createDelimiterSwitcherNode(): HTMLElement {
  * A widget factory for csv tables.
  */
 export
-class CSVWidgetFactory extends ABCWidgetFactory<CSVWidget, IDocumentModel> {
+class CSVWidgetFactory extends ABCWidgetFactory<CSVWidget, DocumentRegistry.IModel> {
   /**
    * Create a new widget given a context.
    */
-  createNew(context: IDocumentContext<IDocumentModel>, kernel?: Kernel.IModel): CSVWidget {
+  createNew(context: DocumentRegistry.IContext<DocumentRegistry.IModel>, kernel?: Kernel.IModel): CSVWidget {
     let widget = new CSVWidget(context);
     this.widgetCreated.emit(widget);
     return widget;

src/docmanager/manager.ts

@@ -26,18 +26,13 @@ import {
 } from 'phosphor/lib/ui/widget';
 
 import {
-  IDocumentRegistry, IWidgetFactory, IWidgetFactoryOptions,
-  IDocumentModel, IDocumentContext, IModelFactory
+  DocumentRegistry, Context
 } from '../docregistry';
 
 import {
   IWidgetOpener
 } from '../filebrowser';
 
-import {
-  Context
-} from './context';
-
 import {
   DocumentWidgetManager
 } from './widgetmanager';
@@ -83,7 +78,7 @@ class DocumentManager implements IDisposable {
    * #### Notes
    * This is a read-only property.
    */
-  get registry(): IDocumentRegistry {
+  get registry(): DocumentRegistry {
     return this._registry;
   }
 
@@ -215,7 +210,7 @@ class DocumentManager implements IDisposable {
   /**
    * Get the document context for a widget.
    */
-  contextForWidget(widget: Widget): IDocumentContext<IDocumentModel> {
+  contextForWidget(widget: Widget): DocumentRegistry.IContext<DocumentRegistry.IModel> {
     return this._widgetManager.contextForWidget(widget);
   }
 
@@ -250,7 +245,7 @@ class DocumentManager implements IDisposable {
   /**
    * Find a context for a given path and factory name.
    */
-  private _findContext(path: string, factoryName: string): Context<IDocumentModel> {
+  private _findContext(path: string, factoryName: string): Context<DocumentRegistry.IModel> {
     return find(this._contexts, context => {
       return (context.factoryName === factoryName &&
               context.path === path);
@@ -260,7 +255,7 @@ class DocumentManager implements IDisposable {
   /**
    * Get a context for a given path.
    */
-  private _contextForPath(path: string): Context<IDocumentModel> {
+  private _contextForPath(path: string): Context<DocumentRegistry.IModel> {
     return find(this._contexts, context => {
       return context.path === path;
     });
@@ -269,7 +264,7 @@ class DocumentManager implements IDisposable {
   /**
    * Create a context from a path and a model factory.
    */
-  private _createContext(path: string, factory: IModelFactory<IDocumentModel>): Context<IDocumentModel> {
+  private _createContext(path: string, factory: DocumentRegistry.IModelFactory<DocumentRegistry.IModel>): Context<DocumentRegistry.IModel> {
     let adopter = (widget: Widget) => {
       this._widgetManager.adoptWidget(context, widget);
       this._opener.open(widget);
@@ -289,8 +284,8 @@ class DocumentManager implements IDisposable {
 
   private _serviceManager: IServiceManager = null;
   private _widgetManager: DocumentWidgetManager = null;
-  private _registry: IDocumentRegistry = null;
-  private _contexts: Vector<Context<IDocumentModel>> = new Vector<Context<IDocumentModel>>();
+  private _registry: DocumentRegistry = null;
+  private _contexts: Vector<Context<DocumentRegistry.IModel>> = new Vector<Context<DocumentRegistry.IModel>>();
   private _opener: IWidgetOpener = null;
 }
 
@@ -308,7 +303,7 @@ namespace DocumentManager {
     /**
      * A document registry instance.
      */
-    registry: IDocumentRegistry;
+    registry: DocumentRegistry;
 
     /**
      * A service manager instance.
@@ -331,7 +326,7 @@ namespace Private {
    * An extended interface for a widget factory and its options.
    */
   export
-  interface IWidgetFactoryEx extends IWidgetFactoryOptions {
-    factory: IWidgetFactory<Widget, IDocumentModel>;
+  interface IWidgetFactoryEx extends DocumentRegistry.IWidgetFactoryOptions {
+    factory: DocumentRegistry.IWidgetFactory<Widget, DocumentRegistry.IModel>;
   }
 }

src/docmanager/widgetmanager.ts

@@ -46,7 +46,7 @@ import {
 } from '../dialog';
 
 import {
-  IDocumentRegistry, IDocumentContext, IDocumentModel
+  DocumentRegistry
 } from '../docregistry';
 
 
@@ -89,22 +89,22 @@ class DocumentWidgetManager implements IDisposable {
   /**
    * Create a widget for a document and handle its lifecycle.
    */
-  createWidget(name: string, context: IDocumentContext<IDocumentModel>, kernel?: Kernel.IModel): Widget {
+  createWidget(name: string, context: DocumentRegistry.IContext<DocumentRegistry.IModel>, kernel?: Kernel.IModel): Widget {
     let factory = this._registry.getWidgetFactory(name);
     let widget = factory.createNew(context, kernel);
     Private.nameProperty.set(widget, name);
 
     // Handle widget extensions.
     let disposables = new DisposableSet();
-    for (let extender of this._registry.getWidgetExtensions(name)) {
+    each(this._registry.getWidgetExtensions(name), extender => {
       disposables.add(extender.createNew(widget, context));
-    }
+    });
     widget.disposed.connect(() => {
       disposables.dispose();
     });
     this.adoptWidget(context, widget);
     this.setCaption(widget);
-    context.contentsModelChanged.connect(() => {
+    context.fileChanged.connect(() => {
       this.setCaption(widget);
     });
     context.populated.connect(() => {
@@ -117,7 +117,7 @@ class DocumentWidgetManager implements IDisposable {
    * Install the message hook for the widget and add to list
    * of known widgets.
    */
-  adoptWidget(context: IDocumentContext<IDocumentModel>, widget: Widget): void {
+  adoptWidget(context: DocumentRegistry.IContext<DocumentRegistry.IModel>, widget: Widget): void {
     let widgets = Private.widgetsProperty.get(context);
     widgets.pushBack(widget);
     installMessageHook(widget, (handler: IMessageHandler, msg: Message) => {
@@ -143,7 +143,7 @@ class DocumentWidgetManager implements IDisposable {
    * This can be used to use an existing widget instead of opening
    * a new widget.
    */
-  findWidget(context: IDocumentContext<IDocumentModel>, widgetName: string): Widget {
+  findWidget(context: DocumentRegistry.IContext<DocumentRegistry.IModel>, widgetName: string): Widget {
     let widgets = Private.widgetsProperty.get(context);
     return find(widgets, widget => {
       let name = Private.nameProperty.get(widget);
@@ -156,7 +156,7 @@ class DocumentWidgetManager implements IDisposable {
   /**
    * Get the document context for a widget.
    */
-  contextForWidget(widget: Widget): IDocumentContext<IDocumentModel> {
+  contextForWidget(widget: Widget): DocumentRegistry.IContext<DocumentRegistry.IModel> {
     return Private.contextProperty.get(widget);
   }
 
@@ -178,7 +178,7 @@ class DocumentWidgetManager implements IDisposable {
   /**
    * Close the widgets associated with a given context.
    */
-  close(context: IDocumentContext<IDocumentModel>): void {
+  close(context: DocumentRegistry.IContext<DocumentRegistry.IModel>): void {
     let widgets = Private.widgetsProperty.get(context);
     each(widgets, widget => {
       widget.close();
@@ -270,7 +270,7 @@ class DocumentWidgetManager implements IDisposable {
   }
 
   private _closeGuard = false;
-  private _registry: IDocumentRegistry = null;
+  private _registry: DocumentRegistry = null;
 }
 
 
@@ -287,7 +287,7 @@ namespace DocumentWidgetManager {
     /**
      * A document registry instance.
      */
-    registry: IDocumentRegistry;
+    registry: DocumentRegistry;
   }
 }
 
@@ -300,7 +300,7 @@ namespace Private {
    * A private attached property for a widget context.
    */
   export
-  const contextProperty = new AttachedProperty<Widget, IDocumentContext<IDocumentModel>>({
+  const contextProperty = new AttachedProperty<Widget, DocumentRegistry.IContext<DocumentRegistry.IModel>>({
     name: 'context'
   });
 
@@ -316,7 +316,7 @@ namespace Private {
    * A private attached property for the widgets associated with a context.
    */
   export
-  const widgetsProperty = new AttachedProperty<IDocumentContext<IDocumentModel>, Vector<Widget>>({
+  const widgetsProperty = new AttachedProperty<DocumentRegistry.IContext<DocumentRegistry.IModel>, Vector<Widget>>({
     name: 'widgets',
     create: () => {
       return new Vector<Widget>();

src/docmanager/context.ts → src/docregistry/context.ts

@@ -27,7 +27,7 @@ import {
 } from '../dialog';
 
 import {
-  IDocumentContext, IDocumentModel, IModelFactory
+  DocumentRegistry
 } from '../docregistry';
 
 import {
@@ -41,7 +41,7 @@ import {
  * This class is typically instantiated by the document manger.
  */
 export
-class Context<T extends IDocumentModel> implements IDocumentContext<T> {
+class Context<T extends DocumentRegistry.IModel> implements DocumentRegistry.IContext<T> {
   /**
    * Construct a new document context.
    */
@@ -60,27 +60,27 @@ class Context<T extends IDocumentModel> implements IDocumentContext<T> {
   /**
    * A signal emitted when the kernel changes.
    */
-  kernelChanged: ISignal<IDocumentContext<T>, IKernel>;
+  kernelChanged: ISignal<DocumentRegistry.IContext<T>, IKernel>;
 
   /**
    * A signal emitted when the path changes.
    */
-  pathChanged: ISignal<IDocumentContext<T>, string>;
+  pathChanged: ISignal<DocumentRegistry.IContext<T>, string>;
 
   /**
    * A signal emitted when the model is saved or reverted.
    */
-  contentsModelChanged: ISignal<IDocumentContext<T>, Contents.IModel>;
+  fileChanged: ISignal<DocumentRegistry.IContext<T>, Contents.IModel>;
 
   /**
    * A signal emitted when the context is fully populated for the first time.
    */
-  populated: ISignal<IDocumentContext<T>, void>;
+  populated: ISignal<DocumentRegistry.IContext<T>, void>;
 
   /**
    * A signal emitted when the context is disposed.
    */
-  disposed: ISignal<IDocumentContext<T>, void>;
+  disposed: ISignal<DocumentRegistry.IContext<T>, void>;
 
   /**
    * Get the model associated with the document.
@@ -202,23 +202,6 @@ class Context<T extends IDocumentModel> implements IDocumentContext<T> {
     }
   }
 
-  /**
-   * Set the path of the context.
-   *
-   * #### Notes
-   * This is not intended to be called by the user.
-   * It is assumed that the file has been renamed on the
-   * contents manager prior to this operation.
-   */
-  setPath(value: string): void {
-    this._path = value;
-    let session = this._session;
-    if (session) {
-      session.rename(value);
-    }
-    this.pathChanged.emit(value);
-  }
-
   /**
    * Save the document contents to disk.
    */
@@ -319,25 +302,25 @@ class Context<T extends IDocumentModel> implements IDocumentContext<T> {
   /**
    * Delete a checkpoint for the file.
    */
-  deleteCheckpoint(checkpointID: string): Promise<void> {
-    return this._manager.contents.deleteCheckpoint(this._path, checkpointID);
+  deleteCheckpoint(checkpointId: string): Promise<void> {
+    return this._manager.contents.deleteCheckpoint(this._path, checkpointId);
   }
 
   /**
    * Restore the file to a known checkpoint state.
    */
-  restoreCheckpoint(checkpointID?: string): Promise<void> {
+  restoreCheckpoint(checkpointId?: string): Promise<void> {
     let contents = this._manager.contents;
     let path = this._path;
-    if (checkpointID) {
-      return contents.restoreCheckpoint(path, checkpointID);
+    if (checkpointId) {
+      return contents.restoreCheckpoint(path, checkpointId);
     }
     return this.listCheckpoints().then(checkpoints => {
       if (!checkpoints.length) {
         return;
       }
-      checkpointID = checkpoints[checkpoints.length - 1].id;
-      return contents.restoreCheckpoint(path, checkpointID);
+      checkpointId = checkpoints[checkpoints.length - 1].id;
+      return contents.restoreCheckpoint(path, checkpointId);
     });
   }
 
@@ -381,6 +364,23 @@ class Context<T extends IDocumentModel> implements IDocumentContext<T> {
     });
   }
 
+  /**
+   * Set the path of the context.
+   *
+   * #### Notes
+   * This is not intended to be called by the user.
+   * It is assumed that the file has been renamed on the
+   * contents manager prior to this operation.
+   */
+  setPath(value: string): void {
+    this._path = value;
+    let session = this._session;
+    if (session) {
+      session.rename(value);
+    }
+    this.pathChanged.emit(value);
+  }
+
   /**
    * Start a session and set up its signals.
    */
@@ -420,7 +420,7 @@ class Context<T extends IDocumentModel> implements IDocumentContext<T> {
     let prevModel = this._contentsModel;
     this._contentsModel = newModel;
     if (!prevModel || newModel.last_modified !== prevModel.last_modified) {
-      this.contentsModelChanged.emit(newModel);
+      this.fileChanged.emit(newModel);
     }
   }
 
@@ -461,7 +461,7 @@ class Context<T extends IDocumentModel> implements IDocumentContext<T> {
   private _model: T = null;
   private _path = '';
   private _session: ISession = null;
-  private _factory: IModelFactory<T> = null;
+  private _factory: DocumentRegistry.IModelFactory<T> = null;
   private _saver: SaveHandler = null;
   private _isPopulated = false;
   private _contentsModel: Contents.IModel = null;
@@ -471,7 +471,7 @@ class Context<T extends IDocumentModel> implements IDocumentContext<T> {
 // Define the signals for the `Context` class.
 defineSignal(Context.prototype, 'kernelChanged');
 defineSignal(Context.prototype, 'pathChanged');
-defineSignal(Context.prototype, 'contentsModelChanged');
+defineSignal(Context.prototype, 'fileChanged');
 defineSignal(Context.prototype, 'populated');
 defineSignal(Context.prototype, 'disposed');
 
@@ -484,7 +484,7 @@ export namespace Context {
    * The options used to initialize a context.
    */
   export
-  interface IOptions<T extends IDocumentModel> {
+  interface IOptions<T extends DocumentRegistry.IModel> {
     /**
      * A service manager instance.
      */
@@ -493,7 +493,7 @@ export namespace Context {
     /**
      * The model factory used to create the model.
      */
-    factory: IModelFactory<T>;
+    factory: DocumentRegistry.IModelFactory<T>;
 
     /**
      * The initial path of the file.

src/docregistry/default.ts

@@ -23,8 +23,7 @@ import {
 } from '../common/interfaces';
 
 import {
-  IDocumentModel, IDocumentContext, IModelFactory,
-  IWidgetFactory
+  DocumentRegistry
 } from './index';
 
 
@@ -32,7 +31,7 @@ import {
  * The default implementation of a document model.
  */
 export
-class DocumentModel implements IDocumentModel {
+class DocumentModel implements DocumentRegistry.IModel {
   /**
    * Construct a new document model.
    */
@@ -43,12 +42,12 @@ class DocumentModel implements IDocumentModel {
   /**
    * A signal emitted when the document content changes.
    */
-  contentChanged: ISignal<IDocumentModel, void>;
+  contentChanged: ISignal<DocumentRegistry.IModel, void>;
 
   /**
    * A signal emitted when the document state changes.
    */
-  stateChanged: ISignal<IDocumentModel, IChangedArgs<any>>;
+  stateChanged: ISignal<DocumentRegistry.IModel, IChangedArgs<any>>;
 
   /**
    * Get whether the model factory has been disposed.
@@ -169,7 +168,7 @@ defineSignal(DocumentModel.prototype, 'stateChanged');
  * An implementation of a model factory for text files.
  */
 export
-class TextModelFactory implements IModelFactory<IDocumentModel> {
+class TextModelFactory implements DocumentRegistry.IModelFactory<DocumentRegistry.IModel> {
   /**
    * The name of the model type.
    *
@@ -220,7 +219,7 @@ class TextModelFactory implements IModelFactory<IDocumentModel> {
    *
    * @returns A new document model.
    */
-  createNew(languagePreference?: string): IDocumentModel {
+  createNew(languagePreference?: string): DocumentRegistry.IModel {
     return new DocumentModel(languagePreference);
   }
 
@@ -278,11 +277,11 @@ class Base64ModelFactory extends TextModelFactory {
  * The default implemetation of a widget factory.
  */
 export
-abstract class ABCWidgetFactory<T extends Widget, U extends IDocumentModel> implements IWidgetFactory<T, U> {
+abstract class ABCWidgetFactory<T extends Widget, U extends DocumentRegistry.IModel> implements DocumentRegistry.IWidgetFactory<T, U> {
   /**
    * A signal emitted when a widget is created.
    */
-  widgetCreated: ISignal<IWidgetFactory<T, U>, T>;
+  widgetCreated: ISignal<DocumentRegistry.IWidgetFactory<T, U>, T>;
 
   /**
    * Get whether the model factory has been disposed.
@@ -304,7 +303,7 @@ abstract class ABCWidgetFactory<T extends Widget, U extends IDocumentModel> impl
    * #### Notes
    * It should emit the [widgetCreated] signal with the new widget.
    */
-  abstract createNew(context: IDocumentContext<U>, kernel?: Kernel.IModel): T;
+  abstract createNew(context: DocumentRegistry.IContext<U>, kernel?: Kernel.IModel): T;
 
   private _isDisposed = false;
 }

src/docregistry/index.ts

@@ -1,7 +1,7 @@
 // Copyright (c) Jupyter Development Team.
 // Distributed under the terms of the Modified BSD License.
 
-export * from './interfaces';
+export * from './context';
 export * from './default';
 export * from './kernelactions';
 export * from './kernelselector';

src/docregistry/interfaces.ts

@@ -1,473 +0,0 @@
-// Copyright (c) Jupyter Development Team.
-// Distributed under the terms of the Modified BSD License.
-
-import {
-  Contents, IKernel, Session, Kernel
-} from 'jupyter-js-services';
-
-import {
-  IDisposable
-} from 'phosphor/lib/core/disposable';
-
-import {
-  ISignal
-} from 'phosphor/lib/core/signaling';
-
-import {
-  Widget
-} from 'phosphor/lib/ui/widget';
-
-import {
-  IChangedArgs
-} from '../common/interfaces';
-
-
-/**
- * The interface for a document model.
- */
-export
-interface IDocumentModel extends IDisposable {
-  /**
-   * A signal emitted when the document content changes.
-   */
-  contentChanged: ISignal<IDocumentModel, void>;
-
-  /**
-   * A signal emitted when the model state changes.
-   */
-  stateChanged: ISignal<IDocumentModel, IChangedArgs<any>>;
-
-  /**
-   * The dirty state of the model.
-   *
-   * #### Notes
-   * This should be cleared when the document is loaded from
-   * or saved to disk.
-   */
-  dirty: boolean;
-
-  /**
-   * The read-only state of the model.
-   */
-  readOnly: boolean;
-
-  /**
-   * The default kernel name of the document.
-   *
-   * #### Notes
-   * This is a read-only property.
-   */
-  defaultKernelName: string;
-
-  /**
-   * The default kernel language of the document.
-   *
-   * #### Notes
-   * This is a read-only property.
-   */
-  defaultKernelLanguage: string;
-
-  /**
-   * Serialize the model to a string.
-   */
-  toString(): string;
-
-  /**
-   * Deserialize the model from a string.
-   *
-   * #### Notes
-   * Should emit a [contentChanged] signal.
-   */
-  fromString(value: string): void;
-
-  /**
-   * Serialize the model to JSON.
-   */
-  toJSON(): any;
-
-  /**
-   * Deserialize the model from JSON.
-   *
-   * #### Notes
-   * Should emit a [contentChanged] signal.
-   */
-  fromJSON(value: any): void;
-}
-
-
-/**
- * The document context object.
- */
-export
-interface IDocumentContext<T extends IDocumentModel> extends IDisposable {
-  /**
-   * A signal emitted when the kernel changes.
-   */
-  kernelChanged: ISignal<IDocumentContext<T>, IKernel>;
-
-  /**
-   * A signal emitted when the path changes.
-   */
-  pathChanged: ISignal<IDocumentContext<T>, string>;
-
-  /**
-   * A signal emitted when the contentsModel changes.
-   */
-  contentsModelChanged: ISignal<IDocumentContext<T>, Contents.IModel>;
-
-  /**
-   * A signal emitted when the context is fully populated for the first time.
-   */
-  populated: ISignal<IDocumentContext<T>, void>;
-
-  /**
-   * A signal emitted when the context is disposed.
-   */
-  disposed: ISignal<IDocumentContext<T>, void>;
-
-  /**
-   * Get the model associated with the document.
-   *
-   * #### Notes
-   * This is a read-only property
-   */
-  model: T;
-
-  /**
-   * The current kernel associated with the document.
-   *
-   * #### Notes
-   * This is a read-only propery.
-   */
-  kernel: IKernel;
-
-  /**
-   * The current path associated with the document.
-   *
-   * #### Notes
-   * This is a read-only property.
-   */
-  path: string;
-
-  /**
-   * The current contents model associated with the document
-   *
-   * #### Notes
-   * This is a read-only property.  The model will have an
-   * empty `contents` field.  It will be `null` until the
-   * first save or load to disk.
-   */
-  contentsModel: Contents.IModel;
-
-  /**
-   * Get the kernel spec information.
-   *
-   * #### Notes
-   * This is a read-only property.
-   */
-  kernelspecs: Kernel.ISpecModels;
-
-  /**
-   * Test whether the context is fully populated.
-   *
-   * #### Notes
-   * This is a read-only property.
-   */
-  isPopulated: boolean;
-
-  /**
-   * Change the current kernel associated with the document.
-   *
-   * #### Notes
-   * If no options are given, the session is shut down.
-   */
-  changeKernel(options?: Kernel.IModel): Promise<IKernel>;
-
-  /**
-   * Save the document contents to disk.
-   */
-  save(): Promise<void>;
-
-  /**
-   * Save the document to a different path chosen by the user.
-   */
-  saveAs(): Promise<void>;
-
-  /**
-   * Revert the document contents to disk contents.
-   */
-  revert(): Promise<void>;
-
-  /**
-   * Create a checkpoint for the file.
-   *
-   * @returns A promise which resolves with the new checkpoint model when the
-   *   checkpoint is created.
-   */
-  createCheckpoint(): Promise<Contents.ICheckpointModel>;
-
-  /**
-   * Delete a checkpoint for the file.
-   *
-   * @param checkpointID - The id of the checkpoint to delete.
-   *
-   * @returns A promise which resolves when the checkpoint is deleted.
-   */
-  deleteCheckpoint(checkpointID: string): Promise<void>;
-
-  /**
-   * Restore the file to a known checkpoint state.
-   *
-   * @param checkpointID - The optional id of the checkpoint to restore,
-   *   defaults to the most recent checkpoint.
-   *
-   * @returns A promise which resolves when the checkpoint is restored.
-   */
-  restoreCheckpoint(checkpointID?: string): Promise<void>;
-
-  /**
-   * List available checkpoints for the file.
-   *
-   * @returns A promise which resolves with a list of checkpoint models for
-   *    the file.
-   */
-  listCheckpoints(): Promise<Contents.ICheckpointModel[]>;
-
-  /**
-   * Get the list of running sessions.
-   */
-  listSessions(): Promise<Session.IModel[]>;
-
-  /**
-   * Resolve a url to a correct server path.
-   */
-  resolveUrl(url: string): string;
-
-  /**
-   * Add a sibling widget to the document manager.
-   *
-   * @param widget - The widget to add to the document manager.
-   *
-   * @returns A disposable used to remove the sibling if desired.
-   *
-   * #### Notes
-   * It is assumed that the widget has the same model and context
-   * as the original widget.
-   */
-  addSibling(widget: Widget): IDisposable;
-}
-
-
-/**
- * The options used to register a widget factory.
- */
-export
-interface IWidgetFactoryOptions {
-  /**
-   * The file extensions the widget can view.
-   *
-   * #### Notes
-   * Use "*" to denote all files. Specific file extensions must be preceded
-   * with '.', like '.png', '.txt', etc.
-   */
-  fileExtensions: string[];
-
-  /**
-   * The name of the widget to display in dialogs.
-   */
-  displayName: string;
-
-  /**
-   * The registered name of the model type used to create the widgets.
-   */
-  modelName: string;
-
-  /**
-   * The file extensions for which the factory should be the default.
-   *
-   * #### Notes
-   * Use "*" to denote all files. Specific file extensions must be preceded
-   * with '.', like '.png', '.txt', etc. Entries in this attribute must also
-   * be included in the fileExtensions attribute.
-   * The default is an empty array.
-   *
-   * **See also:** [[fileExtensions]].
-   */
-  defaultFor?: string[];
-
-  /**
-   * Whether the widgets prefer having a kernel started.
-   *
-   * The default is `false`.
-   */
-  preferKernel?: boolean;
-
-  /**
-   * Whether the widgets can start a kernel when opened.
-   *
-   * The default is `false`.
-   */
-  canStartKernel?: boolean;
-}
-
-
-/**
- * The interface for a widget factory.
- */
-export
-interface IWidgetFactory<T extends Widget, U extends IDocumentModel> extends IDisposable {
-  /**
-   * A signal emitted when a widget is created.
-   */
-  widgetCreated: ISignal<IWidgetFactory<T, U>, T>;
-
-  /**
-   * Create a new widget.
-   *
-   * #### Notes
-   * It should emit the [widgetCreated] signal with the new widget.
-   */
-  createNew(context: IDocumentContext<U>, kernel?: Kernel.IModel): T;
-}
-
-
-/**
- * An interface for a widget extension.
- */
-export
-interface IWidgetExtension<T extends Widget, U extends IDocumentModel> {
-  /**
-   * Create a new extension for a given widget.
-   */
-  createNew(widget: T, context: IDocumentContext<U>): IDisposable;
-}
-
-
-/**
- * The interface for a model factory.
- */
-export
-interface IModelFactory<T extends IDocumentModel> extends IDisposable {
-  /**
-   * The name of the model.
-   *
-   * #### Notes
-   * This is a read-only property.
-   */
-  name: string;
-
-  /**
-   * The content type of the file (defaults to `"file"`).
-   *
-   * #### Notes
-   * This is a read-only property.
-   */
-  contentType: Contents.ContentType;
-
-  /**
-   * The format of the file (default to `"text"`).
-   *
-   * This is a read-only property.
-   */
-  fileFormat: Contents.FileFormat;
-
-  /**
-   * Create a new model for a given path.
-   *
-   * @param languagePreference - An optional kernel language preference.
-   *
-   * @returns A new document model.
-   */
-  createNew(languagePreference?: string): T;
-
-  /**
-   * Get the preferred kernel language given an extension.
-   */
-  preferredLanguage(ext: string): string;
-}
-
-
-/**
- * A kernel preference for a given file path and widget.
- */
-export
-interface IKernelPreference {
-  /**
-   * The preferred kernel language.
-   */
-  language: string;
-
-  /**
-   * Whether to prefer having a kernel started when opening.
-   */
-  preferKernel: boolean;
-
-  /**
-   * Whether a kernel when can be started when opening.
-   */
-  canStartKernel: boolean;
-}
-
-
-/**
- * An interface for a file type.
- */
-export
-interface IFileType {
-  /**
-   * The name of the file type.
-   */
-  name: string;
-
-  /**
-   * The extension of the file type (e.g. `".txt"`).
-   */
-  extension: string;
-
-  /**
-   * The optional mimetype of the file type.
-   */
-  mimetype?: string;
-
-  /**
-   * The optional icon class to use for the file type.
-   */
-  icon?: string;
-
-  /**
-   * The content type of the new file (defaults to `"file"`).
-   */
-  contentType?: Contents.ContentType;
-
-  /**
-   * The format of the new file (default to `"text"`).
-   */
-  fileFormat?: Contents.FileFormat;
-}
-
-
-/**
- * An interface for a "Create New" item.
- */
-export
-interface IFileCreator {
-  /**
-   * The name of the file creator.
-   */
-  name: string;
-
-  /**
-   * The filetype name associated with the creator.
-   */
-  fileType: string;
-
-  /**
-   * The optional widget name.
-   */
-  widgetName?: string;
-
-  /**
-   * The optional kernel name.
-   */
-  kernelName?: string;
-}

src/docregistry/kernelselector.ts

@@ -10,8 +10,8 @@ import {
 } from '../dialog';
 
 import {
-  IDocumentContext, IDocumentModel
-} from './interfaces';
+  DocumentRegistry
+} from './registry';
 
 
 /**
@@ -124,7 +124,7 @@ function selectKernel(options: IKernelSelection): Promise<Kernel.IModel> {
  * Change the kernel on a context.
  */
 export
-function selectKernelForContext(context: IDocumentContext<IDocumentModel>, host?: HTMLElement): Promise<void> {
+function selectKernelForContext(context: DocumentRegistry.IContext<DocumentRegistry.IModel>, host?: HTMLElement): Promise<void> {
   return context.listSessions().then(sessions => {
     let options: IKernelSelection = {
       name: context.path.split('/').pop(),

src/docmanager/savehandler.ts → src/docregistry/savehandler.ts

@@ -18,7 +18,7 @@ okButton, cancelButton, showDialog
 } from '../dialog';
 
 import {
-  IDocumentContext, IDocumentModel
+  DocumentRegistry
 } from '../docregistry';
 
 
@@ -39,7 +39,7 @@ class SaveHandler implements IDisposable {
     this._minInterval = options.saveInterval || 120;
     this._interval = this._minInterval;
     // Restart the timer when the contents model is updated.
-    this._context.contentsModelChanged.connect(() => {
+    this._context.fileChanged.connect(() => {
       this._setTimer();
     });
     this._context.disposed.connect(this.dispose, this);
@@ -166,7 +166,7 @@ class SaveHandler implements IDisposable {
   private _autosaveTimer = -1;
   private _minInterval = -1;
   private _interval = -1;
-  private _context: IDocumentContext<IDocumentModel> = null;
+  private _context: DocumentRegistry.IContext<DocumentRegistry.IModel> = null;
   private _manager: IServiceManager = null;
   private _stopped = false;
   private _inDialog = false;
@@ -186,7 +186,7 @@ namespace SaveHandler {
     /**
      * The context asssociated with the file.
      */
-    context: IDocumentContext<IDocumentModel>;
+    context: DocumentRegistry.IContext<DocumentRegistry.IModel>;
 
     /**
      * The service manager to use for checking last saved.

src/editorwidget/widget.ts

@@ -27,7 +27,7 @@ import {
 } from '../codemirror/widget';
 
 import {
-  ABCWidgetFactory, IDocumentModel, IDocumentContext
+  ABCWidgetFactory, DocumentRegistry
 } from '../docregistry';
 
 
@@ -66,7 +66,7 @@ class EditorWidget extends CodeMirrorWidget {
   /**
    * Construct a new editor widget.
    */
-  constructor(context: IDocumentContext<IDocumentModel>) {
+  constructor(context: DocumentRegistry.IContext<DocumentRegistry.IModel>) {
     super({
       extraKeys: {
         'Tab': 'indentMore',
@@ -115,11 +115,11 @@ class EditorWidget extends CodeMirrorWidget {
   /**
    * Get the context for the editor widget.
    */
-  get context(): IDocumentContext<IDocumentModel> {
+  get context(): DocumentRegistry.IContext<DocumentRegistry.IModel> {
     return this._context;
   }
 
-  private _context: IDocumentContext<IDocumentModel>;
+  private _context: DocumentRegistry.IContext<DocumentRegistry.IModel>;
 }
 
 
@@ -127,11 +127,11 @@ class EditorWidget extends CodeMirrorWidget {
  * A widget factory for editors.
  */
 export
-class EditorWidgetFactory extends ABCWidgetFactory<EditorWidget, IDocumentModel> {
+class EditorWidgetFactory extends ABCWidgetFactory<EditorWidget, DocumentRegistry.IModel> {
   /**
    * Create a new widget given a context.
    */
-  createNew(context: IDocumentContext<IDocumentModel>, kernel?: Kernel.IModel): EditorWidget {
+  createNew(context: DocumentRegistry.IContext<DocumentRegistry.IModel>, kernel?: Kernel.IModel): EditorWidget {
     if (kernel) {
       context.changeKernel(kernel);
     }

src/filebrowser/buttons.ts

@@ -5,6 +5,10 @@ import {
   Kernel
 } from 'jupyter-js-services';
 
+import {
+  each
+} from 'phosphor/lib/algorithm/iteration';
+
 import {
   DisposableSet
 } from 'phosphor/lib/core/disposable';
@@ -425,7 +429,7 @@ namespace Private {
     let prefix = `file-buttons-${++id}`;
     let disposables = new DisposableSet();
     let registry = widget.manager.registry;
-    let creators = registry.listCreators();
+    let creators = registry.creators;
     let command: string;
 
     // Remove all the commands associated with this menu upon disposal.
@@ -438,7 +442,7 @@ namespace Private {
     }));
     menu.addItem({ command });
 
-    for (let creator of creators) {
+    each(creators, creator => {
       command = `${prefix}:new-${creator.name}`;
       disposables.add(commands.addCommand(command, {
         execute: () => {
@@ -447,7 +451,7 @@ namespace Private {
         label: creator.name
       }));
       menu.addItem({ command });
-    }
+    });
     return menu;
   }
 

src/filebrowser/dialogs.ts

@@ -22,7 +22,7 @@ import {
 } from '../docmanager';
 
 import {
-  IKernelPreference, populateKernels
+  DocumentRegistry, populateKernels
 } from '../docregistry';
 
 import {
@@ -500,18 +500,18 @@ class CreateNewHandler extends Widget {
    * Populate the file types.
    */
   protected populateFileTypes(): void {
-    let fileTypes = this._manager.registry.listFileTypes();
+    let fileTypes = this._manager.registry.fileTypes;
     let dropdown = this.fileTypeDropdown;
     let option = document.createElement('option');
     option.text = 'File';
     option.value = this._sentinal;
-    for (let ft of fileTypes) {
+    each(fileTypes, ft => {
       option = document.createElement('option');
       option.text = `${ft.name} (${ft.extension})`;
       option.value = ft.extension;
       dropdown.appendChild(option);
       this._extensions.push(ft.extension);
-    }
+    });
     if (this.ext in this._extensions) {
       dropdown.value = this.ext;
     } else {
@@ -654,7 +654,7 @@ namespace Private {
     /**
      * The kernel preference.
      */
-    preference: IKernelPreference;
+    preference: DocumentRegistry.IKernelPreference;
 
     /**
      * The kernel specs.

src/filebrowser/plugin.ts

@@ -110,7 +110,7 @@ function activateFileBrowser(app: JupyterLab, manager: IServiceManager, registry
   });
 
   let category = 'File Operations';
-  let creators = registry.listCreators();
+  let creators = registry.creators;
   let creatorCmds: { [key: string]: DisposableSet } = Object.create(null);
 
   let addCreator = (name: string) => {
@@ -125,9 +125,9 @@ function activateFileBrowser(app: JupyterLab, manager: IServiceManager, registry
     disposables.add(palette.addItem({ command, category }));
   };
 
-  for (let creator of creators) {
+  each(creators, creator => {
     addCreator(creator.name);
-  }
+  });
 
   // Add a context menu to the dir listing.
   let node = fbWidget.node.getElementsByClassName('jp-DirListing-content')[0];

src/imagewidget/widget.ts

@@ -14,7 +14,7 @@ import {
 } from 'phosphor/lib/ui/widget';
 
 import {
-  ABCWidgetFactory, IDocumentModel, IDocumentContext
+  ABCWidgetFactory, DocumentRegistry
 } from '../docregistry';
 
 /**
@@ -31,7 +31,7 @@ class ImageWidget extends Widget {
   /**
    * Construct a new image widget.
    */
-  constructor(context: IDocumentContext<IDocumentModel>) {
+  constructor(context: DocumentRegistry.IContext<DocumentRegistry.IModel>) {
     super({ node: Private.createNode() });
     this._context = context;
     this.node.tabIndex = -1;
@@ -42,7 +42,7 @@ class ImageWidget extends Widget {
     }
     context.pathChanged.connect(() => this.update());
     context.model.contentChanged.connect(() => this.update());
-    context.contentsModelChanged.connect(() => this.update());
+    context.fileChanged.connect(() => this.update());
   }
 
   /**
@@ -95,7 +95,7 @@ class ImageWidget extends Widget {
     this.node.focus();
   }
 
-  private _context: IDocumentContext<IDocumentModel>;
+  private _context: DocumentRegistry.IContext<DocumentRegistry.IModel>;
   private _scale = 1;
 }
 
@@ -104,11 +104,11 @@ class ImageWidget extends Widget {
  * A widget factory for images.
  */
 export
-class ImageWidgetFactory extends ABCWidgetFactory<ImageWidget, IDocumentModel> {
+class ImageWidgetFactory extends ABCWidgetFactory<ImageWidget, DocumentRegistry.IModel> {
   /**
    * Create a new widget given a context.
    */
-  createNew(context: IDocumentContext<IDocumentModel>, kernel?: Kernel.IModel): ImageWidget {
+  createNew(context: DocumentRegistry.IContext<DocumentRegistry.IModel>, kernel?: Kernel.IModel): ImageWidget {
     let widget = new ImageWidget(context);
     this.widgetCreated.emit(widget);
     return widget;

src/markdownwidget/plugin.ts

@@ -6,7 +6,7 @@ import {
 } from '../application';
 
 import {
-  IDocumentRegistry, IWidgetFactoryOptions
+  DocumentRegistry, IDocumentRegistry
 } from '../docregistry';
 
 import {
@@ -37,7 +37,7 @@ const markdownHandlerExtension: JupyterLabPlugin<void> = {
   id: 'jupyter.extensions.rendered-markdown',
   requires: [IDocumentRegistry, IRenderMime],
   activate: (app: JupyterLab, registry: IDocumentRegistry, rendermime: IRenderMime) => {
-    let options: IWidgetFactoryOptions = {
+    let options: DocumentRegistry.IWidgetFactoryOptions = {
       fileExtensions: ['.md'],
       displayName: 'Rendered Markdown',
       modelName: 'text',

src/markdownwidget/widget.ts

@@ -22,7 +22,7 @@ import {
 } from '../common/activitymonitor';
 
 import {
-  IDocumentModel, IDocumentContext, ABCWidgetFactory
+  DocumentRegistry, ABCWidgetFactory
 } from '../docregistry';
 
 import {
@@ -49,7 +49,7 @@ class MarkdownWidget extends Widget {
   /**
    * Construct a new markdown widget.
    */
-  constructor(context: IDocumentContext<IDocumentModel>, rendermime: RenderMime) {
+  constructor(context: DocumentRegistry.IContext<DocumentRegistry.IModel>, rendermime: RenderMime) {
     super();
     this.addClass(MD_CLASS);
     this.layout = new PanelLayout();
@@ -100,7 +100,7 @@ class MarkdownWidget extends Widget {
     layout.addWidget(widget);
   }
 
-  private _context: IDocumentContext<IDocumentModel> = null;
+  private _context: DocumentRegistry.IContext<DocumentRegistry.IModel> = null;
   private _monitor: ActivityMonitor<any, any> = null;
   private _rendermime: RenderMime = null;
 }
@@ -110,7 +110,7 @@ class MarkdownWidget extends Widget {
  * A widget factory for Markdown.
  */
 export
-class MarkdownWidgetFactory extends ABCWidgetFactory<MarkdownWidget, IDocumentModel> {
+class MarkdownWidgetFactory extends ABCWidgetFactory<MarkdownWidget, DocumentRegistry.IModel> {
   /**
    * Construct a new markdown widget factory.
    */
@@ -122,7 +122,7 @@ class MarkdownWidgetFactory extends ABCWidgetFactory<MarkdownWidget, IDocumentMo
   /**
    * Create a new widget given a context.
    */
-  createNew(context: IDocumentContext<IDocumentModel>, kernel?: Kernel.IModel): MarkdownWidget {
+  createNew(context: DocumentRegistry.IContext<DocumentRegistry.IModel>, kernel?: Kernel.IModel): MarkdownWidget {
     let widget = new MarkdownWidget(context, this._rendermime.clone());
     this.widgetCreated.emit(widget);
     return widget;

src/notebook/notebook/model.ts

@@ -18,7 +18,7 @@ import {
 } from '../../common/observablelist';
 
 import {
-  DocumentModel, IDocumentModel
+  DocumentModel, DocumentRegistry
 } from '../../docregistry';
 
 import {
@@ -47,11 +47,11 @@ import {
  * The definition of a model object for a notebook widget.
  */
 export
-interface INotebookModel extends IDocumentModel {
+interface INotebookModel extends DocumentRegistry.IModel {
   /**
    * A signal emitted when a metadata field changes.
    */
-  metadataChanged: ISignal<IDocumentModel, IChangedArgs<any>>;
+  metadataChanged: ISignal<DocumentRegistry.IModel, IChangedArgs<any>>;
 
   /**
    * The list of cells in the notebook.
@@ -170,7 +170,7 @@ class NotebookModel extends DocumentModel implements INotebookModel {
   /**
    * A signal emitted when a metadata field changes.
    */
-  metadataChanged: ISignal<IDocumentModel, IChangedArgs<any>>;
+  metadataChanged: ISignal<DocumentRegistry.IModel, IChangedArgs<any>>;
 
   /**
    * Get the observable list of notebook cells.

src/notebook/notebook/modelfactory.ts

@@ -6,7 +6,7 @@ import {
 } from 'jupyter-js-services';
 
 import {
-  IModelFactory
+  DocumentRegistry
 } from '../../docregistry';
 
 import {
@@ -18,7 +18,7 @@ import {
  * A model factory for notebooks.
  */
 export
-class NotebookModelFactory implements IModelFactory<INotebookModel> {
+class NotebookModelFactory implements DocumentRegistry.IModelFactory<INotebookModel> {
   /**
    * The name of the model.
    *

src/notebook/notebook/panel.ts

@@ -34,7 +34,7 @@ import {
 } from '../../common/interfaces';
 
 import {
-  IDocumentContext, findKernel
+  DocumentRegistry, findKernel
 } from '../../docregistry';
 
 import {
@@ -200,10 +200,10 @@ class NotebookPanel extends Widget {
    * Changing the context also changes the model on the
    * `content`.
    */
-  get context(): IDocumentContext<INotebookModel> {
+  get context(): DocumentRegistry.IContext<INotebookModel> {
     return this._context;
   }
-  set context(newValue: IDocumentContext<INotebookModel>) {
+  set context(newValue: DocumentRegistry.IContext<INotebookModel>) {
     newValue = newValue || null;
     if (newValue === this._context) {
       return;
@@ -257,7 +257,7 @@ class NotebookPanel extends Widget {
    * #### Notes
    * The default implementation is a no-op.
    */
-  protected onContextChanged(oldValue: IDocumentContext<INotebookModel>, newValue: IDocumentContext<INotebookModel>): void {
+  protected onContextChanged(oldValue: DocumentRegistry.IContext<INotebookModel>, newValue: DocumentRegistry.IContext<INotebookModel>): void {
     // This is a no-op.
   }
 
@@ -274,14 +274,14 @@ class NotebookPanel extends Widget {
   /**
    * Handle a change to the document path.
    */
-  protected onPathChanged(sender: IDocumentContext<INotebookModel>, path: string): void {
+  protected onPathChanged(sender: DocumentRegistry.IContext<INotebookModel>, path: string): void {
     this.title.label = path.split('/').pop();
   }
 
   /**
    * Handle a context population.
    */
-  protected onPopulated(sender: IDocumentContext<INotebookModel>, args: void): void {
+  protected onPopulated(sender: DocumentRegistry.IContext<INotebookModel>, args: void): void {
     let model = sender.model;
     // Clear the undo state of the cells.
     if (model) {
@@ -300,7 +300,7 @@ class NotebookPanel extends Widget {
   /**
    * Handle a change in the context.
    */
-  private _onContextChanged(oldValue: IDocumentContext<INotebookModel>, newValue: IDocumentContext<INotebookModel>): void {
+  private _onContextChanged(oldValue: DocumentRegistry.IContext<INotebookModel>, newValue: DocumentRegistry.IContext<INotebookModel>): void {
     if (oldValue) {
       oldValue.kernelChanged.disconnect(this._onKernelChanged, this);
       oldValue.pathChanged.disconnect(this.onPathChanged, this);
@@ -335,7 +335,7 @@ class NotebookPanel extends Widget {
   /**
    * Handle a change in the kernel by updating the document metadata.
    */
-  private _onKernelChanged(context: IDocumentContext<INotebookModel>, kernel: IKernel): void {
+  private _onKernelChanged(context: DocumentRegistry.IContext<INotebookModel>, kernel: IKernel): void {
     this._completerHandler.kernel = kernel;
     this.content.inspectionHandler.kernel = kernel;
     this.kernelChanged.emit(kernel);
@@ -394,7 +394,7 @@ class NotebookPanel extends Widget {
   private _completer: CompleterWidget = null;
   private _completerHandler: CellCompleterHandler = null;
   private _content: Notebook = null;
-  private _context: IDocumentContext<INotebookModel> = null;
+  private _context: DocumentRegistry.IContext<INotebookModel> = null;
   private _renderer: NotebookPanel.IRenderer = null;
   private _rendermime: RenderMime = null;
 }

src/notebook/notebook/widgetfactory.ts

@@ -2,7 +2,7 @@
 // Distributed under the terms of the Modified BSD License.
 
 import {
-  IKernel, Kernel
+  Kernel
 } from 'jupyter-js-services';
 
 import {
@@ -10,7 +10,7 @@ import {
 } from 'phosphor/lib/core/mimedata';
 
 import {
-  ABCWidgetFactory, IDocumentContext
+  ABCWidgetFactory, DocumentRegistry
 } from '../../docregistry';
 
 import {
@@ -70,7 +70,7 @@ class NotebookWidgetFactory extends ABCWidgetFactory<NotebookPanel, INotebookMod
    * The factory will start the appropriate kernel and populate
    * the default toolbar items using `ToolbarItems.populateDefaults`.
    */
-  createNew(context: IDocumentContext<INotebookModel>, kernel?: Kernel.IModel): NotebookPanel {
+  createNew(context: DocumentRegistry.IContext<INotebookModel>, kernel?: Kernel.IModel): NotebookPanel {
     let rendermime = this._rendermime.clone();
     if (kernel) {
       context.changeKernel(kernel);

src/notebook/plugin.ts

@@ -26,7 +26,7 @@ import {
 } from '../mainmenu';
 
 import {
-  IDocumentRegistry, IWidgetFactoryOptions,
+  IDocumentRegistry, DocumentRegistry,
   restartKernel, selectKernelForContext
 } from '../docregistry';
 
@@ -133,7 +133,7 @@ const notebookTrackerProvider: JupyterLabPlugin<INotebookTracker> = {
 function activateNotebookHandler(app: JupyterLab, registry: IDocumentRegistry, services: IServiceManager, rendermime: IRenderMime, clipboard: IClipboard, mainMenu: IMainMenu, palette: ICommandPalette, inspector: IInspector, renderer: NotebookPanel.IRenderer): INotebookTracker {
   let widgetFactory = new NotebookWidgetFactory(rendermime, clipboard, renderer);
   let tracker = new FocusTracker<NotebookPanel>();
-  let options: IWidgetFactoryOptions = {
+  let options: DocumentRegistry.IWidgetFactoryOptions = {
     fileExtensions: ['.ipynb'],
     displayName: 'Notebook',
     modelName: 'notebook',

test/src/docregistry/context.spec.ts

@@ -0,0 +1,121 @@
+// Copyright (c) Jupyter Development Team.
+// Distributed under the terms of the Modified BSD License.
+
+import expect = require('expect.js');
+
+import {
+  Context
+} from '../../../lib/docregistry/context';
+
+
+describe('docregistry/context', () => {
+
+  describe('Context', () => {
+
+    describe('#constructor()', () => {
+
+    });
+
+    describe('#kernelChanged', () => {
+
+    });
+
+    describe('#pathChanged', () => {
+
+    });
+
+    describe('#fileChanged', () => {
+
+    });
+
+    describe('#populated', () => {
+
+    });
+
+    describe('#disposed', () => {
+
+    });
+
+    describe('#model', () => {
+
+    });
+
+    describe('#kernel', () => {
+
+    });
+
+    describe('#path', () => {
+
+    });
+
+    describe('#contentsModel', () => {
+
+    });
+
+    describe('#kernelspecs', () => {
+
+    });
+
+    describe('#isPopulated', () => {
+
+    });
+
+    describe('#factoryName', () => {
+
+    });
+
+    describe('#isDisposed', () => {
+
+    });
+
+    describe('#dispose()', () => {
+
+    });
+
+    describe('#changeKernel()', () => {
+
+    });
+
+    describe('#save()', () => {
+
+    });
+
+    describe('#saveAs()', () => {
+
+    });
+
+    describe('#revert()', () => {
+
+    });
+
+    describe('#createCheckpoint()', () => {
+
+    });
+
+    describe('#deleteCheckpoint()', () => {
+
+    });
+
+    describe('#restoreCheckpoint()', () => {
+
+    });
+
+    describe('#listCheckpoints()', () => {
+
+    });
+
+    describe('#listSessions()', () => {
+
+    });
+
+    describe('#resolveUrl()', () => {
+
+    });
+
+    describe('#addSibling()', () => {
+
+    });
+
+  });
+
+});

test/src/docregistry/default.spec.ts

@@ -13,21 +13,17 @@ import {
 
 import {
   ABCWidgetFactory, Base64ModelFactory, DocumentModel,
-  IDocumentModel, IDocumentContext, TextModelFactory
+  DocumentRegistry, TextModelFactory, Context
 } from '../../../lib/docregistry';
 
-import {
-  Context
-} from '../../../lib/docmanager/context';
-
 import {
   createFileContext
 } from '../utils';
 
 
-class WidgetFactory extends ABCWidgetFactory<Widget, IDocumentModel> {
+class WidgetFactory extends ABCWidgetFactory<Widget, DocumentRegistry.IModel> {
 
-  createNew(context: IDocumentContext<IDocumentModel>, kernel?: Kernel.IModel): Widget {
+  createNew(context: DocumentRegistry.IContext<DocumentRegistry.IModel>, kernel?: Kernel.IModel): Widget {
     return new Widget();
   }
 }
@@ -35,7 +31,7 @@ class WidgetFactory extends ABCWidgetFactory<Widget, IDocumentModel> {
 
 describe('docmanager/default', () => {
 
-  let context: Context<IDocumentModel>;
+  let context: Context<DocumentRegistry.IModel>;
 
   beforeEach((done) => {
     createFileContext().then(c => {

test/src/docregistry/registry.spec.ts

@@ -16,22 +16,21 @@ import {
 } from 'phosphor/lib/ui/widget';
 
 import {
-  ABCWidgetFactory, Base64ModelFactory, DocumentRegistry,
-  IDocumentModel, IDocumentContext, IWidgetExtension, TextModelFactory
+  ABCWidgetFactory, Base64ModelFactory, DocumentRegistry, TextModelFactory
 } from '../../../lib/docregistry';
 
 
-class WidgetFactory extends ABCWidgetFactory<Widget, IDocumentModel> {
+class WidgetFactory extends ABCWidgetFactory<Widget, DocumentRegistry.IModel> {
 
-  createNew(context: IDocumentContext<IDocumentModel>, kernel?: Kernel.IModel): Widget {
+  createNew(context: DocumentRegistry.IContext<DocumentRegistry.IModel>, kernel?: Kernel.IModel): Widget {
     return new Widget();
   }
 }
 
 
-class WidgetExtension implements IWidgetExtension<Widget, IDocumentModel> {
+class WidgetExtension implements DocumentRegistry.IWidgetExtension<Widget, DocumentRegistry.IModel> {
 
-   createNew(widget: Widget, context: IDocumentContext<IDocumentModel>): IDisposable {
+   createNew(widget: Widget, context: DocumentRegistry.IContext<DocumentRegistry.IModel>): IDisposable {
      return new DisposableDelegate(null);
    }
 }
@@ -170,7 +169,6 @@ describe('docregistry/registry', () => {
       it('should add the model factory to the registry', () => {
         let factory = new TextModelFactory();
         registry.addModelFactory(factory);
-        expect(registry.listModelFactories()).to.eql(['text']);
       });
 
       it('should be a no-op a factory with the given `name` is already registered', () => {
@@ -178,7 +176,6 @@ describe('docregistry/registry', () => {
         registry.addModelFactory(factory);
         let disposable = registry.addModelFactory(new TextModelFactory());
         disposable.dispose();
-        expect(registry.listModelFactories()).to.eql(['text']);
       });
 
       it('should be a no-op if the same factory is already registered', () => {
@@ -186,14 +183,12 @@ describe('docregistry/registry', () => {
         registry.addModelFactory(factory);
         let disposable = registry.addModelFactory(factory);
         disposable.dispose();
-        expect(registry.listModelFactories()).to.eql(['text']);
       });
 
       it('should be removed from the registry when disposed', () => {
         let factory = new TextModelFactory();
         let disposable = registry.addModelFactory(factory);
         disposable.dispose();
-        expect(registry.listModelFactories()).to.eql([]);
       });
 
     });
@@ -203,7 +198,7 @@ describe('docregistry/registry', () => {
       it('should add a widget extension to the registry', () => {
         let extension = new WidgetExtension();
         registry.addWidgetExtension('foo', extension);
-        expect(registry.getWidgetExtensions('foo')).to.eql([extension]);
+        expect(registry.getWidgetExtensions('foo').at(0)).to.be(extension);
       });
 
       it('should be a no-op if the extension is already registered for a given widget factory', () => {
@@ -211,14 +206,14 @@ describe('docregistry/registry', () => {
         registry.addWidgetExtension('foo', extension);
         let disposable = registry.addWidgetExtension('foo', extension);
         disposable.dispose();
-        expect(registry.getWidgetExtensions('foo')).to.eql([extension]);
+        expect(registry.getWidgetExtensions('foo').at(0)).to.be(extension);
       });
 
       it('should be removed from the registry when disposed', () => {
         let extension = new WidgetExtension();
         let disposable = registry.addWidgetExtension('foo', extension);
         disposable.dispose();
-        expect(registry.getWidgetExtensions('foo')).to.eql([]);
+        expect(registry.getWidgetExtensions('foo').length).to.be(0);
       });
 
     });
@@ -228,14 +223,14 @@ describe('docregistry/registry', () => {
       it('should add a file type to the document registry', () => {
         let fileType = { name: 'notebook', extension: '.ipynb' };
         registry.addFileType(fileType);
-        expect(registry.listFileTypes()).to.eql([fileType]);
+        expect(registry.fileTypes.at(0)).to.be(fileType);
       });
 
       it('should be removed from the registry when disposed', () => {
         let fileType = { name: 'notebook', extension: '.ipynb' };
         let disposable = registry.addFileType(fileType);
         disposable.dispose();
-        expect(registry.listFileTypes()).to.eql([]);
+        expect(registry.fileTypes.length).to.be(0);
       });
 
       it('should be a no-op if a file type of the same name is registered', () => {
@@ -243,7 +238,7 @@ describe('docregistry/registry', () => {
         registry.addFileType(fileType);
         let disposable = registry.addFileType(fileType);
         disposable.dispose();
-        expect(registry.listFileTypes()).to.eql([fileType]);
+        expect(registry.fileTypes.at(0)).to.be(fileType);
       });
 
     });
@@ -253,26 +248,28 @@ describe('docregistry/registry', () => {
       it('should add a file type to the document registry', () => {
         let creator = { name: 'notebook', fileType: 'notebook' };
         registry.addCreator(creator);
-        expect(registry.listCreators()).to.eql([creator]);
+        expect(registry.creators.at(0)).to.be(creator);
       });
 
       it('should be removed from the registry when disposed', () => {
         let creator = { name: 'notebook', fileType: 'notebook' };
         let disposable = registry.addCreator(creator);
         disposable.dispose();
-        expect(registry.listCreators()).to.eql([]);
+        expect(registry.creators.length).to.be(0);
       });
 
-      it('should add after a named creator if given', () => {
+      it('should end up in locale order', () => {
         let creators = [
           { name: 'Python Notebook', fileType: 'notebook' },
           { name: 'R Notebook', fileType: 'notebook' },
-          { name: 'Shell Notebook', fileType: 'notebook' }
+          { name: 'CSharp Notebook', fileType: 'notebook' }
         ];
         registry.addCreator(creators[0]);
         registry.addCreator(creators[1]);
-        registry.addCreator(creators[2], creators[1].name);
-        expect(registry.listCreators()).to.eql([ creators[0], creators[2], creators[1]]);
+        registry.addCreator(creators[2]);
+        expect(registry.creators.at(0)).to.be(creators[2]);
+        expect(registry.creators.at(1)).to.be(creators[0]);
+        expect(registry.creators.at(2)).to.be(creators[1]);
       });
 
       it('should be a no-op if a file type of the same name is registered', () => {
@@ -280,7 +277,7 @@ describe('docregistry/registry', () => {
         registry.addCreator(creator);
         let disposable = registry.addCreator(creator);
         disposable.dispose();
-        expect(registry.listCreators()).to.eql([creator]);
+        expect(registry.creators.at(0)).to.eql(creator);
       });
 
     });
@@ -392,45 +389,36 @@ describe('docregistry/registry', () => {
 
     });
 
-    describe('#listModelFactories()', () => {
-
-      it('should list the currently registered model factories', () => {
-        expect(registry.listModelFactories()).to.eql([]);
-        registry.addModelFactory(new TextModelFactory());
-        registry.addModelFactory(new Base64ModelFactory());
-        expect(registry.listModelFactories()).to.eql(['text', 'base64']);
-      });
+    describe('#fileTypes', () => {
 
-    });
-
-    describe('#listFileTypes()', () => {
-
-      it('should list the registered file types', () => {
-        expect(registry.listFileTypes()).to.eql([]);
+      it('should get the registered file types', () => {
+        expect(registry.fileTypes.length).to.be(0);
         let fileTypes = [
           { name: 'notebook', extension: '.ipynb' },
           { name: 'python', extension: '.py' }
         ];
         registry.addFileType(fileTypes[0]);
         registry.addFileType(fileTypes[1]);
-        expect(registry.listFileTypes()).to.eql(fileTypes);
+        expect(registry.fileTypes.at(0)).to.be(fileTypes[0]);
+        expect(registry.fileTypes.at(1)).to.be(fileTypes[1]);
       });
 
     });
 
-    describe('#listCreators()', () => {
+    describe('#creators', () => {
 
-      it('should list the registered file creators', () => {
-        expect(registry.listCreators()).to.eql([]);
+      it('should get the registered file creators', () => {
+        expect(registry.creators.length).to.be(0);
         let creators = [
           { name: 'Python Notebook', fileType: 'notebook' },
           { name: 'R Notebook', fileType: 'notebook' },
-          { name: 'Shell Notebook', fileType: 'notebook' }
+          { name: 'CSharp Notebook', fileType: 'notebook' }
         ];
         registry.addCreator(creators[0]);
         registry.addCreator(creators[1]);
         registry.addCreator(creators[2]);
-        expect(registry.listCreators()).to.eql(creators);
+        expect(registry.creators.length).to.be(3);
+        expect(registry.creators.at(0).name).to.be('CSharp Notebook');
       });
 
     });
@@ -553,9 +541,12 @@ describe('docregistry/registry', () => {
         registry.addWidgetExtension('fizz', foo);
         registry.addWidgetExtension('fizz', bar);
         registry.addWidgetExtension('buzz', foo);
-        expect(registry.getWidgetExtensions('fizz')).to.eql([foo, bar]);
-        expect(registry.getWidgetExtensions('buzz')).to.eql([foo]);
-        expect(registry.getWidgetExtensions('baz')).to.eql([]);
+        expect(registry.getWidgetExtensions('fizz').at(0)).to.be(foo);
+        expect(registry.getWidgetExtensions('fizz').at(1)).to.be(bar);
+        expect(registry.getWidgetExtensions('fizz').length).to.be(2);
+        expect(registry.getWidgetExtensions('buzz').at(0)).to.be(foo);
+        expect(registry.getWidgetExtensions('buzz').length).to.be(1);
+        expect(registry.getWidgetExtensions('baz')).to.be(void 0);
       });
 
     });

test/src/index.ts

@@ -1,48 +1,50 @@
 // Copyright (c) Jupyter Development Team.
 // Distributed under the terms of the Modified BSD License.
 
-import './common/activitymonitor.spec';
-import './common/observablelist.spec';
-import './common/vdom.spec';
+// import './common/activitymonitor.spec';
+// import './common/observablelist.spec';
+// import './common/vdom.spec';
 
-import './completer/handler.spec';
-import './completer/model.spec';
-import './completer/widget.spec';
+// import './completer/handler.spec';
+// import './completer/model.spec';
+// import './completer/widget.spec';
 
-import './console/history.spec';
+// import './console/history.spec';
 
-import './dialog/dialog.spec';
+// import './dialog/dialog.spec';
 
-import './docregistry/default.spec';
+// import './docregistry/context.spec';
+
+// import './docregistry/default.spec';
 import './docregistry/registry.spec';
 
-import './filebrowser/model.spec';
+// import './filebrowser/model.spec';
 
-import './inspector/inspector.spec';
+// import './inspector/inspector.spec';
 
-import './markdownwidget/widget.spec';
+// import './markdownwidget/widget.spec';
 
-import './renderers/renderers.spec';
-import './renderers/latex.spec';
+// import './renderers/renderers.spec';
+// import './renderers/latex.spec';
 
-import './rendermime/rendermime.spec';
+// import './rendermime/rendermime.spec';
 
-import './notebook/cells/editor.spec';
-import './notebook/cells/model.spec';
-import './notebook/cells/widget.spec';
+// import './notebook/cells/editor.spec';
+// import './notebook/cells/model.spec';
+// import './notebook/cells/widget.spec';
 
-import './notebook/notebook/actions.spec';
-import './notebook/notebook/default-toolbar.spec';
-import './notebook/notebook/model.spec';
-import './notebook/notebook/modelfactory.spec';
-import './notebook/notebook/panel.spec';
-import './notebook/notebook/trust.spec';
-import './notebook/notebook/widget.spec';
-import './notebook/notebook/widgetfactory.spec';
+// import './notebook/notebook/actions.spec';
+// import './notebook/notebook/default-toolbar.spec';
+// import './notebook/notebook/model.spec';
+// import './notebook/notebook/modelfactory.spec';
+// import './notebook/notebook/panel.spec';
+// import './notebook/notebook/trust.spec';
+// import './notebook/notebook/widget.spec';
+// import './notebook/notebook/widgetfactory.spec';
 
-import './notebook/output-area/model.spec';
-import './notebook/output-area/widget.spec';
+// import './notebook/output-area/model.spec';
+// import './notebook/output-area/widget.spec';
 
-import './toolbar/toolbar.spec';
+// import './toolbar/toolbar.spec';
 
 import 'phosphor/styles/base.css';

test/src/markdownwidget/widget.spec.ts

@@ -20,13 +20,9 @@ import {
 } from '../../../lib/markdownwidget/widget';
 
 import {
-  IDocumentModel
+  DocumentRegistry, Context
 } from '../../../lib/docregistry';
 
-import {
-  Context
-} from '../../../lib/docmanager/context';
-
 import {
   createFileContext, defaultRenderMime
 } from '../utils';
@@ -54,7 +50,7 @@ const contextPromise = createFileContext();
 
 describe('markdownwidget/widget', () => {
 
-  let context: Context<IDocumentModel>;
+  let context: Context<DocumentRegistry.IModel>;
 
   beforeEach((done) => {
     contextPromise.then(c => {

test/src/notebook/notebook/default-toolbar.spec.ts

@@ -44,7 +44,7 @@ import {
 
 import {
   Context
-} from '../../../../lib/docmanager/context';
+} from '../../../../lib/docregistry/context';
 
 import {
   createNotebookContext, defaultRenderMime
@@ -110,7 +110,7 @@ describe('notebook/notebook/default-toolbar', () => {
       it('should save when clicked', (done) => {
         let button = ToolbarItems.createSaveButton(panel);
         Widget.attach(button, document.body);
-        context.contentsModelChanged.connect(() => {
+        context.fileChanged.connect(() => {
           button.dispose();
           done();
         });

test/src/notebook/notebook/panel.spec.ts

@@ -12,7 +12,7 @@ import {
 } from '../../../../lib/common/interfaces';
 
 import {
-  IDocumentContext
+  DocumentRegistry, Context
 } from '../../../../lib/docregistry';
 
 import {
@@ -35,10 +35,6 @@ import {
   Notebook
 } from '../../../../lib/notebook/notebook/widget';
 
-import {
-  Context
-} from '../../../../lib/docmanager/context';
-
 import {
   createNotebookContext, defaultRenderMime
 } from '../../utils';
@@ -65,7 +61,7 @@ class LogNotebookPanel extends NotebookPanel {
 
   methods: string[] = [];
 
-  protected onContextChanged(oldValue: IDocumentContext<INotebookModel>, newValue: IDocumentContext<INotebookModel>): void {
+  protected onContextChanged(oldValue: DocumentRegistry.IContext<INotebookModel>, newValue: DocumentRegistry.IContext<INotebookModel>): void {
     super.onContextChanged(oldValue, newValue);
     this.methods.push('onContextChanged');
   }
@@ -75,12 +71,12 @@ class LogNotebookPanel extends NotebookPanel {
     this.methods.push('onModelStateChanged');
   }
 
-  protected onPathChanged(sender: IDocumentContext<INotebookModel>, path: string): void {
+  protected onPathChanged(sender: DocumentRegistry.IContext<INotebookModel>, path: string): void {
     super.onPathChanged(sender, path);
     this.methods.push('onPathChanged');
   }
 
-  protected onPopulated(sender: IDocumentContext<INotebookModel>, args: void): void {
+  protected onPopulated(sender: DocumentRegistry.IContext<INotebookModel>, args: void): void {
     super.onPopulated(sender, args);
     this.methods.push('onPopulated');
   }

test/src/notebook/notebook/widgetfactory.spec.ts

@@ -21,7 +21,7 @@ import {
 
 import {
   Context
-} from '../../../../lib/docmanager/context';
+} from '../../../../lib/docregistry/context';
 
 import {
   createNotebookContext, defaultRenderMime

test/src/utils.ts

@@ -16,13 +16,9 @@ import {
 } from 'phosphor/lib/ui/widget';
 
 import {
-  TextModelFactory, IDocumentModel
+  TextModelFactory, DocumentRegistry, Context
 } from '../../lib/docregistry';
 
-import {
-  Context
-} from '../../lib/docmanager/context';
-
 import {
   INotebookModel
 } from '../../lib/notebook/notebook/model';
@@ -58,7 +54,7 @@ function defaultRenderMime(): RenderMime {
  * Create a context for a file.
  */
 export
-function createFileContext(path?: string): Promise<Context<IDocumentModel>> {
+function createFileContext(path?: string): Promise<Context<DocumentRegistry.IModel>> {
   return Private.servicePromise.then(manager => {
     let factory = Private.textFactory;
     path = path || utils.uuid() + '.txt';