Rendermime Refactor

examples/app/index.js

@@ -16,7 +16,6 @@ var mods = [
   require('@jupyterlab/console-extension'),
   require('@jupyterlab/csvviewer-extension'),
   require('@jupyterlab/docmanager-extension'),
-  require('@jupyterlab/docregistry-extension'),
   require('@jupyterlab/fileeditor-extension'),
   require('@jupyterlab/faq-extension'),
   require('@jupyterlab/filebrowser-extension'),
@@ -26,7 +25,6 @@ var mods = [
   require('@jupyterlab/launcher-extension'),
   require('@jupyterlab/markdownviewer-extension'),
   require('@jupyterlab/notebook-extension'),
-  require('@jupyterlab/rendermime-extension'),
   require('@jupyterlab/running-extension'),
   require('@jupyterlab/services-extension'),
   require('@jupyterlab/settingeditor-extension'),

examples/app/package.json

@@ -14,7 +14,6 @@
     "@jupyterlab/console-extension": "^0.7.0",
     "@jupyterlab/csvviewer-extension": "^0.7.1",
     "@jupyterlab/docmanager-extension": "^0.7.0",
-    "@jupyterlab/docregistry-extension": "^0.7.0",
     "@jupyterlab/faq-extension": "^0.7.0",
     "@jupyterlab/filebrowser-extension": "^0.7.0",
     "@jupyterlab/fileeditor-extension": "^0.7.0",
@@ -24,7 +23,6 @@
     "@jupyterlab/launcher-extension": "^0.7.1",
     "@jupyterlab/markdownviewer-extension": "^0.7.0",
     "@jupyterlab/notebook-extension": "^0.7.0",
-    "@jupyterlab/rendermime-extension": "^0.7.0",
     "@jupyterlab/running-extension": "^0.7.0",
     "@jupyterlab/services-extension": "^0.7.0",
     "@jupyterlab/settingeditor-extension": "^0.2.0",

examples/console/src/index.ts

@@ -69,7 +69,9 @@ function startApp(path: string, manager: ServiceManager.IManager) {
     commands.processKeydownEvent(event);
   });
 
-  let rendermime = new RenderMime({ items: RenderMime.getDefaultItems() });
+  let initialFactories = RenderMime.getDefaultFactories();
+  let rendermime = new RenderMime({ initialFactories });
+
   let editorFactory = editorServices.factoryService.newInlineEditor.bind(
     editorServices.factoryService);
   let contentFactory = new ConsolePanel.ContentFactory({ editorFactory });

examples/notebook/src/index.ts

@@ -94,7 +94,9 @@ function createApp(manager: ServiceManager.IManager): void {
     commands.processKeydownEvent(event);
   }, useCapture);
 
-  let rendermime = new RenderMime({ items: RenderMime.getDefaultItems() });
+  let initialFactories = RenderMime.getDefaultFactories();
+  let rendermime = new RenderMime({ initialFactories });
+
   let opener = {
     open: (widget: Widget) => {
       // Do nothing for sibling widgets for now.

jupyterlab/index.js

@@ -9,7 +9,6 @@ require('font-awesome/css/font-awesome.min.css');
 require('@jupyterlab/theming/style/index.css');
 
 var app = require('@jupyterlab/application').JupyterLab;
-var RenderMime = require('@jupyterlab/rendermime').RenderMime;
 
 function main() {
     var version = PageConfig.getOption('appVersion') || 'unknown';
@@ -22,6 +21,8 @@ function main() {
     if (version[0] === 'v') {
         version = version.slice(1);
     }
+
+    // Get the disabled extensions.
     var disabled = [];
     try {
         var option = PageConfig.getOption('disabledExtensions');
@@ -30,14 +31,29 @@ function main() {
         // No-op
     }
 
+    // Handle the registered mime extensions.
+    var mimeExtensions = [];
+    {{#each jupyterlab_mime_extensions}}
+    try {
+        if (disabled.indexOf('{{this}}') === -1) {
+            mimeExtensions.push(require('{{this}}'));
+        }
+    } catch (e) {
+        console.error(e);
+    }
+    {{/each}}
+
     lab = new app({
         namespace: namespace,
         name: name,
         version: version,
         devMode: devMode.toLowerCase() === 'true',
         settingsDir: settingsDir,
-        assetsDir: assetsDir
+        assetsDir: assetsDir,
+        mimeExtensions: mimeExtensions
     });
+
+    // Handled the registered standard extensions.
     {{#each jupyterlab_extensions}}
     try {
         if (disabled.indexOf('{{this}}') === -1) {
@@ -47,15 +63,8 @@ function main() {
         console.error(e);
     }
     {{/each}}
-    {{#each jupyterlab_mime_extensions}}
-    try {
-        if (disabled.indexOf('{{this}}') === -1) {
-            RenderMime.registerExtensionModule(require('{{this}}'));
-        }
-    } catch (e) {
-        console.error(e);
-    }
-    {{/each}}
+
+    // Handle the ignored plugins.
     var ignorePlugins = [];
     try {
         var option = PageConfig.getOption('ignorePlugins');

jupyterlab/package.json

@@ -26,7 +26,6 @@
     "@jupyterlab/docmanager": "^0.7.0",
     "@jupyterlab/docmanager-extension": "^0.7.0",
     "@jupyterlab/docregistry": "^0.7.0",
-    "@jupyterlab/docregistry-extension": "^0.7.0",
     "@jupyterlab/faq-extension": "^0.7.0",
     "@jupyterlab/filebrowser": "^0.7.0",
     "@jupyterlab/filebrowser-extension": "^0.7.0",
@@ -39,13 +38,11 @@
     "@jupyterlab/inspector-extension": "^0.7.0",
     "@jupyterlab/launcher": "^0.7.0",
     "@jupyterlab/launcher-extension": "^0.7.1",
-    "@jupyterlab/markdownviewer": "^0.7.0",
     "@jupyterlab/markdownviewer-extension": "^0.7.0",
     "@jupyterlab/notebook": "^0.7.0",
     "@jupyterlab/notebook-extension": "^0.7.0",
     "@jupyterlab/outputarea": "^0.7.0",
     "@jupyterlab/rendermime": "^0.7.0",
-    "@jupyterlab/rendermime-extension": "^0.7.0",
     "@jupyterlab/running": "^0.7.0",
     "@jupyterlab/running-extension": "^0.7.0",
     "@jupyterlab/services": "^0.46.0",
@@ -117,7 +114,6 @@
       "@jupyterlab/console-extension",
       "@jupyterlab/csvviewer-extension",
       "@jupyterlab/docmanager-extension",
-      "@jupyterlab/docregistry-extension",
       "@jupyterlab/fileeditor-extension",
       "@jupyterlab/faq-extension",
       "@jupyterlab/filebrowser-extension",
@@ -127,7 +123,6 @@
       "@jupyterlab/launcher-extension",
       "@jupyterlab/markdownviewer-extension",
       "@jupyterlab/notebook-extension",
-      "@jupyterlab/rendermime-extension",
       "@jupyterlab/running-extension",
       "@jupyterlab/services-extension",
       "@jupyterlab/settingeditor-extension",

packages/all-packages/package.json

@@ -33,7 +33,6 @@
     "@jupyterlab/docmanager": "^0.7.0",
     "@jupyterlab/docmanager-extension": "^0.7.0",
     "@jupyterlab/docregistry": "^0.7.0",
-    "@jupyterlab/docregistry-extension": "^0.7.0",
     "@jupyterlab/faq-extension": "^0.7.0",
     "@jupyterlab/filebrowser": "^0.7.0",
     "@jupyterlab/filebrowser-extension": "^0.7.0",
@@ -46,13 +45,11 @@
     "@jupyterlab/inspector-extension": "^0.7.0",
     "@jupyterlab/launcher": "^0.7.0",
     "@jupyterlab/launcher-extension": "^0.7.1",
-    "@jupyterlab/markdownviewer": "^0.7.0",
     "@jupyterlab/markdownviewer-extension": "^0.7.0",
     "@jupyterlab/notebook": "^0.7.0",
     "@jupyterlab/notebook-extension": "^0.7.0",
     "@jupyterlab/outputarea": "^0.7.0",
     "@jupyterlab/rendermime": "^0.7.0",
-    "@jupyterlab/rendermime-extension": "^0.7.0",
     "@jupyterlab/running": "^0.7.0",
     "@jupyterlab/running-extension": "^0.7.0",
     "@jupyterlab/services": "^0.46.0",

packages/all-packages/src/index.ts

@@ -21,7 +21,6 @@ import "@jupyterlab/csvviewer-extension";
 import "@jupyterlab/docmanager";
 import "@jupyterlab/docmanager-extension";
 import "@jupyterlab/docregistry";
-import "@jupyterlab/docregistry-extension";
 import "@jupyterlab/fileeditor";
 import "@jupyterlab/fileeditor-extension";
 import "@jupyterlab/faq-extension";
@@ -34,13 +33,11 @@ import "@jupyterlab/inspector";
 import "@jupyterlab/inspector-extension";
 import "@jupyterlab/launcher";
 import "@jupyterlab/launcher-extension";
-import "@jupyterlab/markdownviewer";
 import "@jupyterlab/markdownviewer-extension";
 import "@jupyterlab/notebook";
 import "@jupyterlab/notebook-extension";
 import "@jupyterlab/outputarea";
 import "@jupyterlab/rendermime";
-import "@jupyterlab/rendermime-extension";
 import "@jupyterlab/running";
 import "@jupyterlab/running-extension";
 import "@jupyterlab/services";

packages/application/package.json

@@ -15,6 +15,9 @@
   "dependencies": {
     "@jupyterlab/apputils": "^0.7.0",
     "@jupyterlab/coreutils": "^0.7.0",
+    "@jupyterlab/docregistry": "^0.7.0",
+    "@jupyterlab/rendermime": "^0.7.0",
+    "@jupyterlab/rendermime-interfaces": "^0.1.0",
     "@phosphor/algorithm": "^1.1.1",
     "@phosphor/application": "^1.3.0",
     "@phosphor/coreutils": "^1.1.1",

packages/application/src/index.ts

@@ -1,10 +1,26 @@
 // Copyright (c) Jupyter Development Team.
 // Distributed under the terms of the Modified BSD License.
 
+import {
+  CommandLinker
+} from '@jupyterlab/apputils';
+
+import {
+  Base64ModelFactory, DocumentRegistry, TextModelFactory
+} from '@jupyterlab/docregistry';
+
+import {
+  IRenderMime, RenderMime
+} from '@jupyterlab/rendermime';
+
 import {
   Application, IPlugin
 } from '@phosphor/application';
 
+import {
+  createRendermimePlugins
+} from './mimerenderers';
+
 import {
   ApplicationShell
 } from './shell';
@@ -42,8 +58,49 @@ class JupyterLab extends Application<ApplicationShell> {
     if (options.devMode) {
       this.shell.addClass('jp-mod-devMode');
     }
+    let linker = new CommandLinker({ commands: this.commands });
+    this.commandLinker = linker;
+
+    let linkHandler = {
+      handleLink: (node: HTMLElement, path: string) => {
+        linker.connectNode(node, 'file-operations:open', { path });
+      }
+    };
+    let initialFactories = RenderMime.getDefaultFactories();
+    this.rendermime = new RenderMime({ initialFactories, linkHandler });
+
+    let registry = this.docRegistry = new DocumentRegistry();
+    registry.addModelFactory(new TextModelFactory());
+    registry.addModelFactory(new Base64ModelFactory());
+    registry.addFileType({
+      name: 'Text',
+      extension: '.txt',
+      contentType: 'file',
+      fileFormat: 'text'
+    });
+    registry.addCreator({ name: 'Text File', fileType: 'Text', });
+
+    if (options.mimeExtensions) {
+      let plugins = createRendermimePlugins(options.mimeExtensions);
+      plugins.forEach(plugin => { this.registerPlugin(plugin); });
+    }
   }
 
+  /**
+   * The document registry instance used by the application.
+   */
+  readonly docRegistry: DocumentRegistry;
+
+  /**
+   * The rendermime instance used by the application.
+   */
+  readonly rendermime: RenderMime;
+
+  /**
+   * The command linker used by the application.
+   */
+  readonly commandLinker: CommandLinker;
+
   /**
    * The information about the application.
    */
@@ -136,6 +193,11 @@ namespace JupyterLab {
      * The assets directory of the app on the server.
      */
     assetsDir?: string;
+
+    /**
+     * The mime renderer extensions.
+     */
+    mimeExtensions?: IRenderMime.IExtensionModule[];
   }
 
   /**

packages/application/src/layoutrestorer.ts

@@ -262,6 +262,16 @@ class LayoutRestorer implements ILayoutRestorer {
       }
     }, this);
 
+    // Whenever a widget is updated, get its new name.
+    tracker.widgetUpdated.connect((sender, widget) => {
+      const widgetName = name(widget);
+      if (widgetName) {
+        let name = `${namespace}:${widgetName}`;
+        Private.nameProperty.set(widget, name);
+        this._widgets.set(name, widget);
+      }
+    });
+
     const first = this._first;
     const promise = tracker.restore({
       args, command, name,