Add support for JupyterLab 3.6/4+ and Notebook v7+

Author: ryantam626

docs/changelog.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## Dev
+
+**Jupyterlab extension**
+
+- Support for JupyterLab 3.6+/4+ and Notebook v7, courtesy of mcrutch;
+
 ## 2.0.0 2023-05-08
 
 **General**

package.json

@@ -56,18 +56,18 @@
         "watch:labextension": "jupyter labextension watch ."
     },
     "dependencies": {
-        "@jupyterlab/application": "^3.1.0",
-        "@jupyterlab/settingregistry": "^3.1.0",
+        "@jupyterlab/application": "^3.6.0 || ~4.0.0",
+        "@jupyterlab/settingregistry": "^3.6.0 || ~4.0.0",
         "@jupyterlab/coreutils": "^5.1.0",
         "@jupyterlab/services": "^6.1.0",
-        "@jupyterlab/fileeditor": "^3.0.0",
-        "@jupyterlab/mainmenu": "^3.0.0"
+        "@jupyterlab/fileeditor": "^3.6.0 || ~4.0.0",
+        "@jupyterlab/mainmenu": "^3.6.0 || ~4.0.0"
     },
     "devDependencies": {
         "@babel/core": "^7.0.0",
         "@babel/preset-env": "^7.0.0",
-        "@jupyterlab/builder": "^3.1.0",
-        "@jupyterlab/testutils": "^3.0.0",
+        "@jupyterlab/builder": "^3.6.0 || ~4.0.0",
+        "@jupyterlab/testutils": "^3.6.0 || ~4.0.0",
         "@types/jest": "^26.0.0",
         "@typescript-eslint/eslint-plugin": "^4.8.1",
         "@typescript-eslint/parser": "^4.8.1",

pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["hatchling>=1.4.0", "jupyterlab>=3.4.7,<4.0.0", "hatch-nodejs-version"]
+requires = ["hatchling>=1.4.0", "jupyterlab>=3.6,<5", "hatch-nodejs-version"]
 build-backend = "hatchling.build"
 
 [project]

src/formatter.ts

@@ -87,7 +87,7 @@ export class JupyterlabNotebookCodeFormatter extends JupyterlabCodeFormatter {
     }
 
     const metadata =
-      this.notebookTracker.currentWidget.content.model!.metadata.toJSON();
+      this.notebookTracker.currentWidget.content.model!.sharedModel.metadata;;
 
     if (!metadata) {
       return null;
@@ -148,7 +148,7 @@ export class JupyterlabNotebookCodeFormatter extends JupyterlabCodeFormatter {
       if (formatterToUse === 'noop' || formatterToUse === 'skip') {
         continue;
       }
-      const currentTexts = selectedCells.map(cell => cell.model.value.text);
+      const currentTexts = selectedCells.map(cell => cell.model.sharedModel.source);
       const formattedTexts = await this.formatCode(
         currentTexts,
         formatterToUse,
@@ -162,7 +162,7 @@ export class JupyterlabNotebookCodeFormatter extends JupyterlabCodeFormatter {
         const cell = selectedCells[i];
         const currentText = currentTexts[i];
         const formattedText = formattedTexts.code[i];
-        const cellValueHasNotChanged = cell.model.value.text === currentText;
+        const cellValueHasNotChanged = cell.model.sharedModel.source === currentText;
         if (cellValueHasNotChanged) {
           if (formattedText.error) {
             if (showErrors) {
@@ -172,7 +172,7 @@ export class JupyterlabNotebookCodeFormatter extends JupyterlabCodeFormatter {
               );
             }
           } else {
-            cell.model.value.text = formattedText.code;
+            cell.model.sharedModel.source = formattedText.code;
           }
         } else {
           if (showErrors) {
@@ -236,7 +236,7 @@ export class JupyterlabFileEditorCodeFormatter extends JupyterlabCodeFormatter {
     const editorWidget = this.editorTracker.currentWidget;
     this.working = true;
     const editor = editorWidget!.content.editor;
-    const code = editor.model.value.text;
+    const code = editor.model.sharedModel.source;
     this.formatCode(
       [code],
       formatter,
@@ -253,7 +253,7 @@ export class JupyterlabFileEditorCodeFormatter extends JupyterlabCodeFormatter {
           this.working = false;
           return;
         }
-        this.editorTracker.currentWidget!.content.editor.model.value.text =
+        this.editorTracker.currentWidget!.content.editor.model.sharedModel.source =
           data.code[0].code;
         this.working = false;
       })

yarn.lock

@@ -1285,7 +1285,7 @@
     y-protocols "^1.0.5"
     yjs "^13.5.40"
 
-"@jupyterlab/application@^3.1.0":
+"@jupyterlab/application@^3.6.0 || ~4.0.0":
   version "3.6.3"
   resolved "https://registry.yarnpkg.com/@jupyterlab/application/-/application-3.6.3.tgz#7e199f77a4536bc7429fbecf9ba1850f51d9de52"
   integrity sha512-G0tR6sUSCuHB8vGQnaB5lfihKNJVHtqYNoMlsZYF9rYpZEhW1TRD4uE5rg4RfDDR+GghjckQlP3rRNB2Vn4tMA==
@@ -1352,7 +1352,7 @@
     "@lumino/disposable" "^1.10.0"
     "@lumino/signaling" "^1.10.0"
 
-"@jupyterlab/builder@^3.1.0":
+"@jupyterlab/builder@^3.6.0 || ~4.0.0":
   version "3.6.3"
   resolved "https://registry.yarnpkg.com/@jupyterlab/builder/-/builder-3.6.3.tgz#a4b22efe34e9598b84122ff10509d3d890017b6a"
   integrity sha512-oY1a/r75RMoPzhSmuVu+DfjL0cKk1ceHTniZsM2wPuhjjyoF875u6CDzArJatpOOuTgLm7CY5OcU3LCIK1OAgg==
@@ -1565,7 +1565,7 @@
     "@lumino/widgets" "^1.37.2"
     react "^17.0.1"
 
-"@jupyterlab/fileeditor@^3.0.0":
+"@jupyterlab/fileeditor@^3.6.0 || ~4.0.0":
   version "3.6.3"
   resolved "https://registry.yarnpkg.com/@jupyterlab/fileeditor/-/fileeditor-3.6.3.tgz#3eff401fe35e3c3f0b960d0252e1c7068aeb1d96"
   integrity sha512-O3VM2Dd5tsMNC/mvwGGTBdrQuQYVqqQ7SUAlF8eFnDLnmMranq05s5fNRADQLJez6FtR8lDZR8vmxRcOhUN5iw==
@@ -1581,7 +1581,7 @@
     "@lumino/widgets" "^1.37.2"
     react "^17.0.1"
 
-"@jupyterlab/mainmenu@^3.0.0":
+"@jupyterlab/mainmenu@^3.6.0 || ~4.0.0":
   version "3.6.3"
   resolved "https://registry.yarnpkg.com/@jupyterlab/mainmenu/-/mainmenu-3.6.3.tgz#5d322db9b8d742b7042109ab7e8c733696ae38fc"
   integrity sha512-ohZzHDeReKX3zbLz2bUsYRSdkX6bVhNoCer3Rat8gjfb8vr/bqK9ReAvvoA4rRqm0mrfqwotpZSzbE4+y5KqZA==
@@ -1711,7 +1711,7 @@
     node-fetch "^2.6.0"
     ws "^7.4.6"
 
-"@jupyterlab/settingregistry@^3.1.0", "@jupyterlab/settingregistry@^3.6.3":
+"@jupyterlab/settingregistry@^3.6.0 || ~4.0.0", "@jupyterlab/settingregistry@^3.6.3":
   version "3.6.3"
   resolved "https://registry.yarnpkg.com/@jupyterlab/settingregistry/-/settingregistry-3.6.3.tgz#642f8b6449d626821ef13a7e778ae716fa8331c9"
   integrity sha512-pnzIge0ZC8V63R97HiNroJ0eaPM0DN6x65SStyLuv/K8Qez4XqpOdc0Wfell5ri5mxMvm1qKekuFeTikqSXQKQ==
@@ -1755,7 +1755,7 @@
     react "^17.0.1"
     typestyle "^2.0.4"
 
-"@jupyterlab/testutils@^3.0.0":
+"@jupyterlab/testutils@^3.6.0 || ~4.0.0":
   version "3.6.3"
   resolved "https://registry.yarnpkg.com/@jupyterlab/testutils/-/testutils-3.6.3.tgz#f6785f616ad23c37a07f6c7350def440a9a0cffa"
   integrity sha512-ryydfRiTWCWebLWevKyY/ZqEV5MIdH4VV4Cdn3KsBhZ/jD/wN9BGpX4w/PlXkz211KfC6izbuhC8NwOV33SH4g==