@jupyterlab/notebook 4.0.0-alpha.13 → 4.0.0-alpha.14

package/lib/model.d.ts

@@ -1,11 +1,11 @@
-import { CellModel, CodeCellModel, ICellModel, ICodeCellModel, IMarkdownCellModel, IRawCellModel } from '@jupyterlab/cells';
 import { IChangedArgs } from '@jupyterlab/coreutils';
 import { DocumentRegistry } from '@jupyterlab/docregistry';
 import * as nbformat from '@jupyterlab/nbformat';
-import { IModelDB, IObservableJSON, IObservableUndoableList } from '@jupyterlab/observables';
-import * as models from '@jupyterlab/shared-models';
+import { IObservableJSON } from '@jupyterlab/observables';
+import * as sharedModels from '@jupyterlab/shared-models';
 import { ITranslator } from '@jupyterlab/translation';
 import { ISignal } from '@lumino/signaling';
+import { CellList } from './celllist';
 /**
  * The definition of a model object for a notebook widget.
  */
@@ -13,11 +13,7 @@ export interface INotebookModel extends DocumentRegistry.IModel {
     /**
      * The list of cells in the notebook.
      */
-    readonly cells: IObservableUndoableList<ICellModel>;
-    /**
-     * The cell model factory for the notebook.
-     */
-    readonly contentFactory: NotebookModel.IContentFactory;
+    readonly cells: CellList;
     /**
      * The major version number of the nbformat.
      */
@@ -35,10 +31,9 @@ export interface INotebookModel extends DocumentRegistry.IModel {
      */
     readonly deletedCells: string[];
     /**
-     * If the model is initialized or not.
+     * Shared model
      */
-    isInitialized: boolean;
-    readonly sharedModel: models.ISharedNotebook;
+    readonly sharedModel: sharedModels.ISharedNotebook;
 }
 /**
  * An implementation of a notebook Model.
@@ -73,7 +68,7 @@ export declare class NotebookModel implements INotebookModel {
     /**
      * Get the observable list of notebook cells.
      */
-    get cells(): IObservableUndoableList<ICellModel>;
+    get cells(): CellList;
     /**
      * The major version number of the nbformat.
      */
@@ -90,10 +85,6 @@ export declare class NotebookModel implements INotebookModel {
      * A list of deleted cells for the notebook..
      */
     get deletedCells(): string[];
-    /**
-     * If the model is initialized or not.
-     */
-    get isInitialized(): boolean;
     /**
      * The default kernel language of the document.
      */
@@ -124,14 +115,6 @@ export declare class NotebookModel implements INotebookModel {
      * Should emit a [contentChanged] signal.
      */
     fromJSON(value: nbformat.INotebookContent): void;
-    /**
-     * Initialize the model with its current state.
-     *
-     * # Notes
-     * Adds an empty code cell if the model is empty
-     * and clears undo state.
-     */
-    initialize(): void;
     /**
      * Handle a change in the cells list.
      */
@@ -154,33 +137,24 @@ export declare class NotebookModel implements INotebookModel {
      * Whether the model is disposed.
      */
     get isDisposed(): boolean;
-    /**
-     * The cell model factory for the notebook.
-     */
-    readonly contentFactory: NotebookModel.IContentFactory;
     /**
      * The shared notebook model.
      */
-    readonly sharedModel: models.ISharedNotebook;
+    readonly sharedModel: sharedModels.ISharedNotebook;
     /**
      * A mutex to update the shared model.
      */
     protected readonly _modelDBMutex: (f: () => void) => void;
-    /**
-     * The underlying `IModelDB` instance in which model
-     * data is stored.
-     */
-    readonly modelDB: IModelDB;
     private _dirty;
     private _readOnly;
     private _contentChanged;
     private _stateChanged;
     private _trans;
     private _cells;
+    private _metadata;
     private _nbformat;
     private _nbformatMinor;
     private _deletedCells;
-    private _isInitialized;
     private _isDisposed;
 }
 /**
@@ -196,166 +170,16 @@ export declare namespace NotebookModel {
          */
         languagePreference?: string;
         /**
-         * A factory for creating cell models.
-         *
-         * The default is a shared factory instance.
+         * Default cell type.
          */
-        contentFactory?: IContentFactory;
-        /**
-         * A modelDB for storing notebook data.
-         */
-        modelDB?: IModelDB;
+        defaultCell?: 'code' | 'markdown' | 'raw';
         /**
          * Language translator.
          */
         translator?: ITranslator;
-        /**
-         * If the model is initialized or not.
-         */
-        isInitialized?: boolean;
         /**
          * Defines if the document can be undo/redo.
          */
         disableDocumentWideUndoRedo?: boolean;
     }
-    /**
-     * A factory for creating notebook model content.
-     */
-    interface IContentFactory {
-        /**
-         * The factory for output area models.
-         */
-        readonly codeCellContentFactory: CodeCellModel.IContentFactory;
-        /**
-         * The IModelDB in which to put data for the notebook model.
-         */
-        modelDB: IModelDB | undefined;
-        /**
-         * Create a new cell by cell type.
-         *
-         * @param type:  the type of the cell to create.
-         *
-         * @param options: the cell creation options.
-         *
-         * #### Notes
-         * This method is intended to be a convenience method to programmatically
-         * call the other cell creation methods in the factory.
-         */
-        createCell(type: nbformat.CellType, options: CellModel.IOptions): ICellModel;
-        /**
-         * Create a new code cell.
-         *
-         * @param options - The options used to create the cell.
-         *
-         * @returns A new code cell. If a source cell is provided, the
-         *   new cell will be initialized with the data from the source.
-         */
-        createCodeCell(options: CodeCellModel.IOptions): ICodeCellModel;
-        /**
-         * Create a new markdown cell.
-         *
-         * @param options - The options used to create the cell.
-         *
-         * @returns A new markdown cell. If a source cell is provided, the
-         *   new cell will be initialized with the data from the source.
-         */
-        createMarkdownCell(options: CellModel.IOptions): IMarkdownCellModel;
-        /**
-         * Create a new raw cell.
-         *
-         * @param options - The options used to create the cell.
-         *
-         * @returns A new raw cell. If a source cell is provided, the
-         *   new cell will be initialized with the data from the source.
-         */
-        createRawCell(options: CellModel.IOptions): IRawCellModel;
-        /**
-         * Clone the content factory with a new IModelDB.
-         */
-        clone(modelDB: IModelDB): IContentFactory;
-    }
-    /**
-     * The default implementation of an `IContentFactory`.
-     */
-    class ContentFactory {
-        /**
-         * Create a new cell model factory.
-         */
-        constructor(options: ContentFactory.IOptions);
-        /**
-         * The factory for code cell content.
-         */
-        readonly codeCellContentFactory: CodeCellModel.IContentFactory;
-        /**
-         * The IModelDB in which to put the notebook data.
-         */
-        readonly modelDB: IModelDB | undefined;
-        /**
-         * Create a new cell by cell type.
-         *
-         * @param type:  the type of the cell to create.
-         *
-         * @param options: the cell creation options.
-         *
-         * #### Notes
-         * This method is intended to be a convenience method to programmatically
-         * call the other cell creation methods in the factory.
-         */
-        createCell(type: nbformat.CellType, options: CellModel.IOptions): ICellModel;
-        /**
-         * Create a new code cell.
-         *
-         * @param source - The data to use for the original source data.
-         *
-         * @returns A new code cell. If a source cell is provided, the
-         *   new cell will be initialized with the data from the source.
-         *   If the contentFactory is not provided, the instance
-         *   `codeCellContentFactory` will be used.
-         */
-        createCodeCell(options: CodeCellModel.IOptions): ICodeCellModel;
-        /**
-         * Create a new markdown cell.
-         *
-         * @param source - The data to use for the original source data.
-         *
-         * @returns A new markdown cell. If a source cell is provided, the
-         *   new cell will be initialized with the data from the source.
-         */
-        createMarkdownCell(options: CellModel.IOptions): IMarkdownCellModel;
-        /**
-         * Create a new raw cell.
-         *
-         * @param source - The data to use for the original source data.
-         *
-         * @returns A new raw cell. If a source cell is provided, the
-         *   new cell will be initialized with the data from the source.
-         */
-        createRawCell(options: CellModel.IOptions): IRawCellModel;
-        /**
-         * Clone the content factory with a new IModelDB.
-         */
-        clone(modelDB: IModelDB): ContentFactory;
-    }
-    /**
-     * A namespace for the notebook model content factory.
-     */
-    namespace ContentFactory {
-        /**
-         * The options used to initialize a `ContentFactory`.
-         */
-        interface IOptions {
-            /**
-             * The factory for code cell model content.
-             */
-            codeCellContentFactory?: CodeCellModel.IContentFactory;
-            /**
-             * The modelDB in which to place new content.
-             */
-            modelDB?: IModelDB;
-        }
-    }
-    /**
-     * The default `ContentFactory` instance.
-     */
-    const defaultContentFactory: ContentFactory;
 }

package/lib/model.js

@@ -1,12 +1,10 @@
 // Copyright (c) Jupyter Development Team.
 // Distributed under the terms of the Modified BSD License.
 import { Dialog, showDialog } from '@jupyterlab/apputils';
-import { CodeCellModel, MarkdownCellModel, RawCellModel } from '@jupyterlab/cells';
 import * as nbformat from '@jupyterlab/nbformat';
-import { ModelDB } from '@jupyterlab/observables';
-import * as models from '@jupyterlab/shared-models';
+import { ObservableJSON } from '@jupyterlab/observables';
+import * as sharedModels from '@jupyterlab/shared-models';
 import { nullTranslator } from '@jupyterlab/translation';
-import { UUID } from '@lumino/coreutils';
 import { Signal } from '@lumino/signaling';
 import { CellList } from './celllist';
 /**
@@ -17,10 +15,11 @@ export class NotebookModel {
      * Construct a new notebook model.
      */
     constructor(options = {}) {
+        var _a;
         /**
          * A mutex to update the shared model.
          */
-        this._modelDBMutex = models.createMutex();
+        this._modelDBMutex = sharedModels.createMutex();
         this._dirty = false;
         this._readOnly = false;
         this._contentChanged = new Signal(this);
@@ -28,27 +27,21 @@ export class NotebookModel {
         this._nbformat = nbformat.MAJOR_VERSION;
         this._nbformatMinor = nbformat.MINOR_VERSION;
         this._isDisposed = false;
-        if (options.modelDB) {
-            this.modelDB = options.modelDB;
-        }
-        else {
-            this.modelDB = new ModelDB();
-        }
-        this.sharedModel = models.YNotebook.create(options.disableDocumentWideUndoRedo || false);
-        this._isInitialized = options.isInitialized === false ? false : true;
-        const factory = options.contentFactory || NotebookModel.defaultContentFactory;
-        this.contentFactory = factory.clone(this.modelDB.view('cells'));
-        this._cells = new CellList(this.modelDB, this.contentFactory, this.sharedModel);
+        this.sharedModel = sharedModels.YNotebook.create({
+            disableDocumentWideUndoRedo: (_a = options.disableDocumentWideUndoRedo) !== null && _a !== void 0 ? _a : false,
+            initialCellType: options.defaultCell
+        });
+        this._cells = new CellList(this.sharedModel);
         this._trans = (options.translator || nullTranslator).load('jupyterlab');
         this._cells.changed.connect(this._onCellsChanged, this);
         // Handle initial metadata.
-        const metadata = this.modelDB.createMap('metadata');
-        if (!metadata.has('language_info')) {
+        this._metadata = new ObservableJSON();
+        if (!this._metadata.has('language_info')) {
             const name = options.languagePreference || '';
-            metadata.set('language_info', { name });
+            this._metadata.set('language_info', { name });
         }
         this._ensureMetadata();
-        metadata.changed.connect(this._onMetadataChanged, this);
+        this._metadata.changed.connect(this._onMetadataChanged, this);
         this._deletedCells = [];
         this.sharedModel.changed.connect(this._onStateChanged, this);
     }
@@ -100,7 +93,7 @@ export class NotebookModel {
      * The metadata associated with the notebook.
      */
     get metadata() {
-        return this.modelDB.get('metadata');
+        return this._metadata;
     }
     /**
      * Get the observable list of notebook cells.
@@ -133,12 +126,6 @@ export class NotebookModel {
     get deletedCells() {
         return this._deletedCells;
     }
-    /**
-     * If the model is initialized or not.
-     */
-    get isInitialized() {
-        return this._isInitialized;
-    }
     /**
      * The default kernel language of the document.
      */
@@ -157,8 +144,8 @@ export class NotebookModel {
         const cells = this.cells;
         this._cells = null;
         cells.dispose();
+        this.sharedModel.dispose();
         this._isDisposed = true;
-        this.modelDB.dispose();
         Signal.clearData(this);
     }
     /**
@@ -209,35 +196,21 @@ export class NotebookModel {
      * Should emit a [contentChanged] signal.
      */
     fromJSON(value) {
-        const cells = [];
-        const factory = this.contentFactory;
-        const useId = value.nbformat === 4 && value.nbformat_minor >= 5;
-        for (const cell of value.cells) {
-            const options = { cell };
-            if (useId) {
-                options.id = cell.id;
-            }
-            switch (cell.cell_type) {
-                case 'code':
-                    cells.push(factory.createCodeCell(options));
-                    break;
-                case 'markdown':
-                    cells.push(factory.createMarkdownCell(options));
-                    break;
-                case 'raw':
-                    cells.push(factory.createRawCell(options));
-                    break;
-                default:
-                    continue;
-            }
-        }
-        this.cells.beginCompoundOperation();
-        this.cells.clear();
-        this.cells.pushAll(cells);
-        this.cells.endCompoundOperation();
+        this.sharedModel.transact(() => {
+            const useId = value.nbformat === 4 && value.nbformat_minor >= 5;
+            const ycells = value.cells.map(cell => {
+                if (!useId) {
+                    delete cell.id;
+                }
+                return sharedModels.createCell(cell);
+            });
+            this.sharedModel.insertCells(this.sharedModel.cells.length, ycells);
+            this.sharedModel.deleteCellRange(0, this.sharedModel.cells.length);
+        });
         this.sharedModel.nbformat_minor =
             nbformat.MINOR_VERSION;
-        this.sharedModel.nbformat = nbformat.MAJOR_VERSION;
+        this.sharedModel.nbformat =
+            nbformat.MAJOR_VERSION;
         const origNbformat = value.metadata.orig_nbformat;
         if (value.nbformat !== this._nbformat) {
             this.sharedModel.nbformat = value.nbformat;
@@ -283,21 +256,6 @@ close the notebook without saving it.`, origNbformat, this._nbformat);
         this._ensureMetadata();
         this.dirty = true;
     }
-    /**
-     * Initialize the model with its current state.
-     *
-     * # Notes
-     * Adds an empty code cell if the model is empty
-     * and clears undo state.
-     */
-    initialize() {
-        if (!this.cells.length) {
-            const factory = this.contentFactory;
-            this.cells.push(factory.createCodeCell({}));
-        }
-        this._isInitialized = true;
-        this.cells.clearUndo();
-    }
     /**
      * Handle a change in the cells list.
      */
@@ -385,114 +343,4 @@ close the notebook without saving it.`, origNbformat, this._nbformat);
         return this._isDisposed;
     }
 }
-/**
- * The namespace for the `NotebookModel` class statics.
- */
-(function (NotebookModel) {
-    /**
-     * The default implementation of an `IContentFactory`.
-     */
-    class ContentFactory {
-        /**
-         * Create a new cell model factory.
-         */
-        constructor(options) {
-            this.codeCellContentFactory =
-                options.codeCellContentFactory || CodeCellModel.defaultContentFactory;
-            this.modelDB = options.modelDB;
-        }
-        /**
-         * Create a new cell by cell type.
-         *
-         * @param type:  the type of the cell to create.
-         *
-         * @param options: the cell creation options.
-         *
-         * #### Notes
-         * This method is intended to be a convenience method to programmatically
-         * call the other cell creation methods in the factory.
-         */
-        createCell(type, options) {
-            switch (type) {
-                case 'code':
-                    return this.createCodeCell(options);
-                case 'markdown':
-                    return this.createMarkdownCell(options);
-                case 'raw':
-                default:
-                    return this.createRawCell(options);
-            }
-        }
-        /**
-         * Create a new code cell.
-         *
-         * @param source - The data to use for the original source data.
-         *
-         * @returns A new code cell. If a source cell is provided, the
-         *   new cell will be initialized with the data from the source.
-         *   If the contentFactory is not provided, the instance
-         *   `codeCellContentFactory` will be used.
-         */
-        createCodeCell(options) {
-            if (options.contentFactory) {
-                options.contentFactory = this.codeCellContentFactory;
-            }
-            if (this.modelDB) {
-                if (!options.id) {
-                    options.id = UUID.uuid4();
-                }
-                options.modelDB = this.modelDB.view(options.id);
-            }
-            return new CodeCellModel(options);
-        }
-        /**
-         * Create a new markdown cell.
-         *
-         * @param source - The data to use for the original source data.
-         *
-         * @returns A new markdown cell. If a source cell is provided, the
-         *   new cell will be initialized with the data from the source.
-         */
-        createMarkdownCell(options) {
-            if (this.modelDB) {
-                if (!options.id) {
-                    options.id = UUID.uuid4();
-                }
-                options.modelDB = this.modelDB.view(options.id);
-            }
-            return new MarkdownCellModel(options);
-        }
-        /**
-         * Create a new raw cell.
-         *
-         * @param source - The data to use for the original source data.
-         *
-         * @returns A new raw cell. If a source cell is provided, the
-         *   new cell will be initialized with the data from the source.
-         */
-        createRawCell(options) {
-            if (this.modelDB) {
-                if (!options.id) {
-                    options.id = UUID.uuid4();
-                }
-                options.modelDB = this.modelDB.view(options.id);
-            }
-            return new RawCellModel(options);
-        }
-        /**
-         * Clone the content factory with a new IModelDB.
-         */
-        clone(modelDB) {
-            return new ContentFactory({
-                modelDB: modelDB,
-                codeCellContentFactory: this.codeCellContentFactory
-            });
-        }
-    }
-    NotebookModel.ContentFactory = ContentFactory;
-    /**
-     * The default `ContentFactory` instance.
-     */
-    NotebookModel.defaultContentFactory = new ContentFactory({});
-})(NotebookModel || (NotebookModel = {}));
 //# sourceMappingURL=model.js.map

package/lib/model.js.map

@@ -1 +1 @@
-{"version":3,"file":"model.js","sourceRoot":"","sources":["../src/model.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"model.js","sourceRoot":"","sources":["../src/model.ts"],"names":[],"mappings":"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"}

package/lib/modelfactory.d.ts

@@ -1,8 +1,6 @@
-import { CodeCellModel } from '@jupyterlab/cells';
 import { DocumentRegistry } from '@jupyterlab/docregistry';
-import { IModelDB } from '@jupyterlab/observables';
 import { Contents } from '@jupyterlab/services';
-import { INotebookModel, NotebookModel } from './model';
+import { INotebookModel } from './model';
 /**
  * A model factory for notebooks.
  */
@@ -11,10 +9,6 @@ export declare class NotebookModelFactory implements DocumentRegistry.IModelFact
      * Construct a new notebook model factory.
      */
     constructor(options: NotebookModelFactory.IOptions);
-    /**
-     * The content model factory used by the NotebookModelFactory.
-     */
-    readonly contentFactory: NotebookModel.IContentFactory;
     /**
      * Define the disableDocumentWideUndoRedo property.
      */
@@ -46,7 +40,7 @@ export declare class NotebookModelFactory implements DocumentRegistry.IModelFact
      *
      * @returns A new document model.
      */
-    createNew(languagePreference?: string, modelDB?: IModelDB, isInitialized?: boolean): INotebookModel;
+    createNew(languagePreference?: string): INotebookModel;
     /**
      * Get the preferred kernel language given a path.
      */
@@ -69,14 +63,5 @@ export declare namespace NotebookModelFactory {
          * Defines if the document can be undo/redo.
          */
         disableDocumentWideUndoRedo?: boolean;
-        /**
-         * The factory for code cell content.
-         */
-        codeCellContentFactory?: CodeCellModel.IContentFactory;
-        /**
-         * The content factory used by the NotebookModelFactory.  If
-         * given, it will supersede the `codeCellContentFactory`.
-         */
-        contentFactory?: NotebookModel.IContentFactory;
     }
 }

package/lib/modelfactory.js

@@ -12,10 +12,6 @@ export class NotebookModelFactory {
         this._disposed = false;
         this._disableDocumentWideUndoRedo =
             options.disableDocumentWideUndoRedo || false;
-        const codeCellContentFactory = options.codeCellContentFactory;
-        this.contentFactory =
-            options.contentFactory ||
-                new NotebookModel.ContentFactory({ codeCellContentFactory });
     }
     /**
      * Define the disableDocumentWideUndoRedo property.
@@ -60,13 +56,9 @@ export class NotebookModelFactory {
      *
      * @returns A new document model.
      */
-    createNew(languagePreference, modelDB, isInitialized) {
-        const contentFactory = this.contentFactory;
+    createNew(languagePreference) {
         return new NotebookModel({
             languagePreference,
-            contentFactory,
-            modelDB,
-            isInitialized,
             disableDocumentWideUndoRedo: this._disableDocumentWideUndoRedo
         });
     }