@jupytergis/base 0.3.0 → 0.4.1

package/lib/annotations/components/Annotation.js

@@ -13,7 +13,7 @@ const Annotation = ({ itemId, annotationModel, rightPanelModel, children }) => {
      * Update the model when it changes.
      */
     rightPanelModel === null || rightPanelModel === void 0 ? void 0 : rightPanelModel.documentChanged.connect((_, widget) => {
-        setJgisModel(widget === null || widget === void 0 ? void 0 : widget.context.model);
+        setJgisModel(widget === null || widget === void 0 ? void 0 : widget.model);
     });
     const handleSubmit = () => {
         annotationModel.addContent(itemId, messageContent);

package/lib/annotations/model.d.ts

@@ -1,28 +1,27 @@
 import { IAnnotation, IAnnotationModel, IJupyterGISModel } from '@jupytergis/schema';
-import { DocumentRegistry } from '@jupyterlab/docregistry';
 import { User } from '@jupyterlab/services';
 import { ISignal } from '@lumino/signaling';
 export declare class AnnotationModel implements IAnnotationModel {
     constructor(options: AnnotationModel.IOptions);
     get updateSignal(): ISignal<this, null>;
     get user(): User.IIdentity | undefined;
-    set context(context: DocumentRegistry.IContext<IJupyterGISModel> | undefined);
-    get context(): DocumentRegistry.IContext<IJupyterGISModel> | undefined;
-    get contextChanged(): ISignal<this, void>;
+    set model(model: IJupyterGISModel | undefined);
+    get model(): IJupyterGISModel | undefined;
+    get modelChanged(): ISignal<this, void>;
     update(): void;
     getAnnotation(id: string): IAnnotation | undefined;
     getAnnotationIds(): string[];
     addAnnotation(key: string, value: IAnnotation): void;
     removeAnnotation(key: string): void;
     addContent(id: string, value: string): void;
-    private _context;
-    private _contextChanged;
+    private _model;
+    private _modelChanged;
     private _updateSignal;
     private _user?;
 }
 declare namespace AnnotationModel {
     interface IOptions {
-        context: DocumentRegistry.IContext<IJupyterGISModel> | undefined;
+        model: IJupyterGISModel | undefined;
     }
 }
 export {};

package/lib/annotations/model.js

@@ -1,9 +1,9 @@
 import { Signal } from '@lumino/signaling';
 export class AnnotationModel {
     constructor(options) {
-        this._contextChanged = new Signal(this);
+        this._modelChanged = new Signal(this);
         this._updateSignal = new Signal(this);
-        this.context = options.context;
+        this.model = options.model;
     }
     get updateSignal() {
         return this._updateSignal;
@@ -11,25 +11,25 @@ export class AnnotationModel {
     get user() {
         return this._user;
     }
-    set context(context) {
+    set model(model) {
         var _a;
-        this._context = context;
-        const state = (_a = this._context) === null || _a === void 0 ? void 0 : _a.model.sharedModel.awareness.getLocalState();
+        this._model = model;
+        const state = (_a = this._model) === null || _a === void 0 ? void 0 : _a.sharedModel.awareness.getLocalState();
         this._user = state === null || state === void 0 ? void 0 : state.user;
-        this._contextChanged.emit(void 0);
+        this._modelChanged.emit(void 0);
     }
-    get context() {
-        return this._context;
+    get model() {
+        return this._model;
     }
-    get contextChanged() {
-        return this._contextChanged;
+    get modelChanged() {
+        return this._modelChanged;
     }
     update() {
         this._updateSignal.emit(null);
     }
     getAnnotation(id) {
         var _a;
-        const rawData = (_a = this._context) === null || _a === void 0 ? void 0 : _a.model.sharedModel.getMetadata(id);
+        const rawData = (_a = this._model) === null || _a === void 0 ? void 0 : _a.sharedModel.getMetadata(id);
         if (rawData) {
             return JSON.parse(rawData);
         }
@@ -37,7 +37,7 @@ export class AnnotationModel {
     getAnnotationIds() {
         var _a;
         const annotationIds = [];
-        for (const id in (_a = this._context) === null || _a === void 0 ? void 0 : _a.model.sharedModel.metadata) {
+        for (const id in (_a = this._model) === null || _a === void 0 ? void 0 : _a.sharedModel.metadata) {
             if (id.startsWith('annotation')) {
                 annotationIds.push(id);
             }
@@ -46,11 +46,11 @@ export class AnnotationModel {
     }
     addAnnotation(key, value) {
         var _a;
-        (_a = this._context) === null || _a === void 0 ? void 0 : _a.model.sharedModel.setMetadata(`annotation_${key}`, JSON.stringify(value));
+        (_a = this._model) === null || _a === void 0 ? void 0 : _a.sharedModel.setMetadata(`annotation_${key}`, JSON.stringify(value));
     }
     removeAnnotation(key) {
         var _a;
-        (_a = this._context) === null || _a === void 0 ? void 0 : _a.model.removeMetadata(key);
+        (_a = this._model) === null || _a === void 0 ? void 0 : _a.removeMetadata(key);
     }
     addContent(id, value) {
         var _a;
@@ -61,7 +61,7 @@ export class AnnotationModel {
         const currentAnnotation = this.getAnnotation(id);
         if (currentAnnotation) {
             const newAnnotation = Object.assign(Object.assign({}, currentAnnotation), { contents: [...currentAnnotation.contents, newContent] });
-            (_a = this._context) === null || _a === void 0 ? void 0 : _a.model.sharedModel.setMetadata(id, JSON.stringify(newAnnotation));
+            (_a = this._model) === null || _a === void 0 ? void 0 : _a.sharedModel.setMetadata(id, JSON.stringify(newAnnotation));
         }
     }
 }

package/lib/commands.d.ts

@@ -1,11 +1,10 @@
 import { IJGISFormSchemaRegistry, IJGISLayerBrowserRegistry } from '@jupytergis/schema';
 import { JupyterFrontEnd } from '@jupyterlab/application';
-import { WidgetTracker } from '@jupyterlab/apputils';
 import { ICompletionProviderManager } from '@jupyterlab/completer';
 import { IStateDB } from '@jupyterlab/statedb';
 import { ITranslator } from '@jupyterlab/translation';
-import { JupyterGISWidget } from './widget';
+import { JupyterGISTracker } from './types';
 /**
  * Add the commands to the application's command registry.
  */
-export declare function addCommands(app: JupyterFrontEnd, tracker: WidgetTracker<JupyterGISWidget>, translator: ITranslator, formSchemaRegistry: IJGISFormSchemaRegistry, layerBrowserRegistry: IJGISLayerBrowserRegistry, state: IStateDB, completionProviderManager: ICompletionProviderManager | undefined): void;
+export declare function addCommands(app: JupyterFrontEnd, tracker: JupyterGISTracker, translator: ITranslator, formSchemaRegistry: IJGISFormSchemaRegistry, layerBrowserRegistry: IJGISLayerBrowserRegistry, state: IStateDB, completionProviderManager: ICompletionProviderManager | undefined): void;