@jupyterlab/settingeditor-extension 4.0.0-alpha.2 → 4.0.0-alpha.20

package/lib/index.d.ts

@@ -3,9 +3,6 @@
  * @module settingeditor-extension
  */
 import { JupyterFrontEndPlugin } from '@jupyterlab/application';
-import { ISettingEditorTracker } from '@jupyterlab/settingeditor';
-/**
- * The default setting editor extension.
- */
-declare const plugin: JupyterFrontEndPlugin<ISettingEditorTracker>;
-export default plugin;
+import { IJSONSettingEditorTracker, ISettingEditorTracker } from '@jupyterlab/settingeditor/lib/tokens';
+declare const _default: (JupyterFrontEndPlugin<ISettingEditorTracker> | JupyterFrontEndPlugin<IJSONSettingEditorTracker>)[];
+export default _default;

package/lib/index.js

@@ -9,8 +9,9 @@
 import { ILabStatus, ILayoutRestorer } from '@jupyterlab/application';
 import { ICommandPalette, MainAreaWidget, WidgetTracker } from '@jupyterlab/apputils';
 import { IEditorServices } from '@jupyterlab/codeeditor';
+import { CommandToolbarButton, IFormRendererRegistry, launchIcon, Toolbar } from '@jupyterlab/ui-components';
 import { IRenderMimeRegistry } from '@jupyterlab/rendermime';
-import { ISettingEditorTracker, SettingEditor } from '@jupyterlab/settingeditor';
+import { IJSONSettingEditorTracker, ISettingEditorTracker } from '@jupyterlab/settingeditor/lib/tokens';
 import { ISettingRegistry } from '@jupyterlab/settingregistry';
 import { IStateDB } from '@jupyterlab/statedb';
 import { ITranslator } from '@jupyterlab/translation';
@@ -21,6 +22,7 @@ import { saveIcon, settingsIcon, undoIcon } from '@jupyterlab/ui-components';
 var CommandIDs;
 (function (CommandIDs) {
     CommandIDs.open = 'settingeditor:open';
+    CommandIDs.openJSON = 'settingeditor:open-json';
     CommandIDs.revert = 'settingeditor:revert';
     CommandIDs.save = 'settingeditor:save';
 })(CommandIDs || (CommandIDs = {}));
@@ -28,9 +30,120 @@ var CommandIDs;
  * The default setting editor extension.
  */
 const plugin = {
+    id: '@jupyterlab/settingeditor-extension:form-ui',
+    requires: [
+        ISettingRegistry,
+        IStateDB,
+        ITranslator,
+        IFormRendererRegistry,
+        ILabStatus
+    ],
+    optional: [ILayoutRestorer, ICommandPalette, IJSONSettingEditorTracker],
+    autoStart: true,
+    provides: ISettingEditorTracker,
+    activate
+};
+/**
+ * Activate the setting editor extension.
+ */
+function activate(app, registry, state, translator, editorRegistry, status, restorer, palette, jsonEditor) {
+    const trans = translator.load('jupyterlab');
+    const { commands, shell } = app;
+    const namespace = 'setting-editor';
+    const tracker = new WidgetTracker({
+        namespace
+    });
+    // Handle state restoration.
+    if (restorer) {
+        void restorer.restore(tracker, {
+            command: CommandIDs.open,
+            args: widget => ({}),
+            name: widget => namespace
+        });
+    }
+    const openUi = async (args) => {
+        if (tracker.currentWidget && !tracker.currentWidget.isDisposed) {
+            if (!tracker.currentWidget.isAttached) {
+                shell.add(tracker.currentWidget, 'main', { type: 'Settings' });
+            }
+            shell.activateById(tracker.currentWidget.id);
+            return;
+        }
+        const key = plugin.id;
+        const { SettingsEditor } = await import('@jupyterlab/settingeditor');
+        const editor = new MainAreaWidget({
+            content: new SettingsEditor({
+                editorRegistry,
+                key,
+                registry,
+                state,
+                commands,
+                toSkip: [
+                    '@jupyterlab/application-extension:context-menu',
+                    '@jupyterlab/mainmenu-extension:plugin'
+                ],
+                translator,
+                status,
+                query: args.query
+            })
+        });
+        if (jsonEditor) {
+            editor.toolbar.addItem('spacer', Toolbar.createSpacerItem());
+            editor.toolbar.addItem('open-json-editor', new CommandToolbarButton({
+                commands,
+                id: CommandIDs.openJSON,
+                icon: launchIcon,
+                label: trans.__('JSON Settings Editor')
+            }));
+        }
+        editor.id = namespace;
+        editor.title.icon = settingsIcon;
+        editor.title.label = trans.__('Settings');
+        editor.title.closable = true;
+        void tracker.add(editor);
+        shell.add(editor, 'main', { type: 'Settings' });
+    };
+    commands.addCommand(CommandIDs.open, {
+        execute: async (args) => {
+            var _a;
+            if (args.settingEditorType === 'ui') {
+                void commands.execute(CommandIDs.open, { query: (_a = args.query) !== null && _a !== void 0 ? _a : '' });
+            }
+            else if (args.settingEditorType === 'json') {
+                void commands.execute(CommandIDs.openJSON);
+            }
+            else {
+                void registry.load(plugin.id).then(settings => {
+                    var _a;
+                    settings.get('settingEditorType').composite ===
+                        'json'
+                        ? void commands.execute(CommandIDs.openJSON)
+                        : void openUi({ query: (_a = args.query) !== null && _a !== void 0 ? _a : '' });
+                });
+            }
+        },
+        label: args => {
+            if (args.label) {
+                return args.label;
+            }
+            return trans.__('Settings Editor');
+        }
+    });
+    if (palette) {
+        palette.addItem({
+            category: trans.__('Settings'),
+            command: CommandIDs.open,
+            args: { settingEditorType: 'ui' }
+        });
+    }
+    return tracker;
+}
+/**
+ * The default setting editor extension.
+ */
+const jsonPlugin = {
     id: '@jupyterlab/settingeditor-extension:plugin',
     requires: [
-        ILayoutRestorer,
         ISettingRegistry,
         IEditorServices,
         IStateDB,
@@ -38,39 +151,46 @@ const plugin = {
         ILabStatus,
         ITranslator
     ],
-    optional: [ICommandPalette],
+    optional: [ILayoutRestorer, ICommandPalette],
     autoStart: true,
-    provides: ISettingEditorTracker,
-    activate
+    provides: IJSONSettingEditorTracker,
+    activate: activateJSON
 };
 /**
  * Activate the setting editor extension.
  */
-function activate(app, restorer, registry, editorServices, state, rendermime, status, translator, palette) {
+function activateJSON(app, registry, editorServices, state, rendermime, status, translator, restorer, palette) {
     const trans = translator.load('jupyterlab');
     const { commands, shell } = app;
-    const namespace = 'setting-editor';
+    const namespace = 'json-setting-editor';
     const factoryService = editorServices.factoryService;
     const editorFactory = factoryService.newInlineEditor;
     const tracker = new WidgetTracker({
         namespace
     });
-    let editor;
     // Handle state restoration.
-    void restorer.restore(tracker, {
-        command: CommandIDs.open,
-        args: widget => ({}),
-        name: widget => namespace
-    });
-    commands.addCommand(CommandIDs.open, {
-        execute: () => {
-            if (tracker.currentWidget) {
+    if (restorer) {
+        void restorer.restore(tracker, {
+            command: CommandIDs.openJSON,
+            args: widget => ({}),
+            name: widget => namespace
+        });
+    }
+    commands.addCommand(CommandIDs.openJSON, {
+        execute: async () => {
+            if (tracker.currentWidget && !tracker.currentWidget.isDisposed) {
+                if (!tracker.currentWidget.isAttached) {
+                    shell.add(tracker.currentWidget, 'main', {
+                        type: 'Advanced Settings'
+                    });
+                }
                 shell.activateById(tracker.currentWidget.id);
                 return;
             }
             const key = plugin.id;
             const when = app.restored;
-            editor = new SettingEditor({
+            const { JsonSettingEditor } = await import('@jupyterlab/settingeditor');
+            const editor = new JsonSettingEditor({
                 commands: {
                     registry: commands,
                     revert: CommandIDs.revert,
@@ -107,19 +227,22 @@ function activate(app, restorer, registry, editorServices, state, rendermime, st
                     }
                 });
             });
-            editor.id = namespace;
-            editor.title.icon = settingsIcon;
-            editor.title.label = trans.__('Settings');
-            const main = new MainAreaWidget({ content: editor });
-            void tracker.add(main);
-            shell.add(main);
+            const container = new MainAreaWidget({
+                content: editor
+            });
+            container.id = namespace;
+            container.title.icon = settingsIcon;
+            container.title.label = trans.__('Advanced Settings Editor');
+            container.title.closable = true;
+            void tracker.add(container);
+            shell.add(container, 'main', { type: 'Advanced Settings' });
         },
         label: trans.__('Advanced Settings Editor')
     });
     if (palette) {
         palette.addItem({
             category: trans.__('Settings'),
-            command: CommandIDs.open
+            command: CommandIDs.openJSON
         });
     }
     commands.addCommand(CommandIDs.revert, {
@@ -139,5 +262,5 @@ function activate(app, restorer, registry, editorServices, state, rendermime, st
     });
     return tracker;
 }
-export default plugin;
+export default [plugin, jsonPlugin];
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupyterlab/settingeditor-extension",
-  "version": "4.0.0-alpha.2",
+  "version": "4.0.0-alpha.20",
   "description": "JupyterLab - Setting Editor Extension",
   "homepage": "https://github.com/jupyterlab/jupyterlab",
   "bugs": {
@@ -28,7 +28,8 @@
     "lib/*.js",
     "schema/*.json",
     "style/**/*.css",
-    "style/index.js"
+    "style/index.js",
+    "src/**/*.{ts,tsx}"
   ],
   "scripts": {
     "build": "tsc -b",
@@ -37,21 +38,21 @@
     "watch": "tsc -b --watch"
   },
   "dependencies": {
-    "@jupyterlab/application": "^4.0.0-alpha.2",
-    "@jupyterlab/apputils": "^4.0.0-alpha.2",
-    "@jupyterlab/codeeditor": "^4.0.0-alpha.2",
-    "@jupyterlab/rendermime": "^4.0.0-alpha.2",
-    "@jupyterlab/settingeditor": "^4.0.0-alpha.2",
-    "@jupyterlab/settingregistry": "^4.0.0-alpha.2",
-    "@jupyterlab/statedb": "^4.0.0-alpha.2",
-    "@jupyterlab/translation": "^4.0.0-alpha.2",
-    "@jupyterlab/ui-components": "^4.0.0-alpha.17",
-    "@lumino/disposable": "^1.10.1"
+    "@jupyterlab/application": "^4.0.0-alpha.20",
+    "@jupyterlab/apputils": "^4.0.0-alpha.20",
+    "@jupyterlab/codeeditor": "^4.0.0-alpha.20",
+    "@jupyterlab/rendermime": "^4.0.0-alpha.20",
+    "@jupyterlab/settingeditor": "^4.0.0-alpha.20",
+    "@jupyterlab/settingregistry": "^4.0.0-alpha.20",
+    "@jupyterlab/statedb": "^4.0.0-alpha.20",
+    "@jupyterlab/translation": "^4.0.0-alpha.20",
+    "@jupyterlab/ui-components": "^4.0.0-alpha.35",
+    "@lumino/disposable": "^2.0.0-rc.0"
   },
   "devDependencies": {
     "rimraf": "~3.0.0",
-    "typedoc": "~0.21.2",
-    "typescript": "~4.5.2"
+    "typedoc": "~0.23.25",
+    "typescript": "~5.0.0-beta"
   },
   "publishConfig": {
     "access": "public"

package/schema/form-ui.json

@@ -0,0 +1,14 @@
+{
+  "title": "Settings Editor Form UI",
+  "description": "Settings editor form ui settings.",
+  "properties": {
+    "settingEditorType": {
+      "title": "Type of editor for the setting.",
+      "description": "Set the type of editor to use while editing your settings.",
+      "enum": ["json", "ui"],
+      "default": "ui"
+    }
+  },
+  "additionalProperties": false,
+  "type": "object"
+}

package/schema/plugin.json

@@ -4,11 +4,13 @@
   "jupyter.lab.shortcuts": [
     {
       "command": "settingeditor:open",
+      "args": {},
       "keys": ["Accel ,"],
       "selector": "body"
     },
     {
       "command": "settingeditor:save",
+      "args": {},
       "keys": ["Accel S"],
       "selector": ".jp-SettingEditor"
     }

package/src/index.ts

@@ -0,0 +1,341 @@
+/* -----------------------------------------------------------------------------
+| Copyright (c) Jupyter Development Team.
+| Distributed under the terms of the Modified BSD License.
+|----------------------------------------------------------------------------*/
+/**
+ * @packageDocumentation
+ * @module settingeditor-extension
+ */
+
+import {
+  ILabStatus,
+  ILayoutRestorer,
+  JupyterFrontEnd,
+  JupyterFrontEndPlugin
+} from '@jupyterlab/application';
+import {
+  ICommandPalette,
+  MainAreaWidget,
+  WidgetTracker
+} from '@jupyterlab/apputils';
+import { IEditorServices } from '@jupyterlab/codeeditor';
+import {
+  CommandToolbarButton,
+  IFormRendererRegistry,
+  launchIcon,
+  Toolbar
+} from '@jupyterlab/ui-components';
+import { IRenderMimeRegistry } from '@jupyterlab/rendermime';
+import {
+  IJSONSettingEditorTracker,
+  ISettingEditorTracker
+} from '@jupyterlab/settingeditor/lib/tokens';
+import type {
+  JsonSettingEditor,
+  SettingsEditor
+} from '@jupyterlab/settingeditor';
+import { ISettingRegistry } from '@jupyterlab/settingregistry';
+import { IStateDB } from '@jupyterlab/statedb';
+import { ITranslator } from '@jupyterlab/translation';
+import { saveIcon, settingsIcon, undoIcon } from '@jupyterlab/ui-components';
+import { IDisposable } from '@lumino/disposable';
+
+/**
+ * The command IDs used by the setting editor.
+ */
+namespace CommandIDs {
+  export const open = 'settingeditor:open';
+
+  export const openJSON = 'settingeditor:open-json';
+
+  export const revert = 'settingeditor:revert';
+
+  export const save = 'settingeditor:save';
+}
+
+type SettingEditorType = 'ui' | 'json';
+
+/**
+ * The default setting editor extension.
+ */
+const plugin: JupyterFrontEndPlugin<ISettingEditorTracker> = {
+  id: '@jupyterlab/settingeditor-extension:form-ui',
+  requires: [
+    ISettingRegistry,
+    IStateDB,
+    ITranslator,
+    IFormRendererRegistry,
+    ILabStatus
+  ],
+  optional: [ILayoutRestorer, ICommandPalette, IJSONSettingEditorTracker],
+  autoStart: true,
+  provides: ISettingEditorTracker,
+  activate
+};
+
+/**
+ * Activate the setting editor extension.
+ */
+function activate(
+  app: JupyterFrontEnd,
+  registry: ISettingRegistry,
+  state: IStateDB,
+  translator: ITranslator,
+  editorRegistry: IFormRendererRegistry,
+  status: ILabStatus,
+  restorer: ILayoutRestorer | null,
+  palette: ICommandPalette | null,
+  jsonEditor: IJSONSettingEditorTracker | null
+): ISettingEditorTracker {
+  const trans = translator.load('jupyterlab');
+  const { commands, shell } = app;
+  const namespace = 'setting-editor';
+  const tracker = new WidgetTracker<MainAreaWidget<SettingsEditor>>({
+    namespace
+  });
+
+  // Handle state restoration.
+  if (restorer) {
+    void restorer.restore(tracker, {
+      command: CommandIDs.open,
+      args: widget => ({}),
+      name: widget => namespace
+    });
+  }
+
+  const openUi = async (args: { query: string }) => {
+    if (tracker.currentWidget && !tracker.currentWidget.isDisposed) {
+      if (!tracker.currentWidget.isAttached) {
+        shell.add(tracker.currentWidget, 'main', { type: 'Settings' });
+      }
+      shell.activateById(tracker.currentWidget.id);
+      return;
+    }
+
+    const key = plugin.id;
+
+    const { SettingsEditor } = await import('@jupyterlab/settingeditor');
+
+    const editor = new MainAreaWidget<SettingsEditor>({
+      content: new SettingsEditor({
+        editorRegistry,
+        key,
+        registry,
+        state,
+        commands,
+        toSkip: [
+          '@jupyterlab/application-extension:context-menu',
+          '@jupyterlab/mainmenu-extension:plugin'
+        ],
+        translator,
+        status,
+        query: args.query as string
+      })
+    });
+
+    if (jsonEditor) {
+      editor.toolbar.addItem('spacer', Toolbar.createSpacerItem());
+      editor.toolbar.addItem(
+        'open-json-editor',
+        new CommandToolbarButton({
+          commands,
+          id: CommandIDs.openJSON,
+          icon: launchIcon,
+          label: trans.__('JSON Settings Editor')
+        })
+      );
+    }
+
+    editor.id = namespace;
+    editor.title.icon = settingsIcon;
+    editor.title.label = trans.__('Settings');
+    editor.title.closable = true;
+
+    void tracker.add(editor);
+    shell.add(editor, 'main', { type: 'Settings' });
+  };
+
+  commands.addCommand(CommandIDs.open, {
+    execute: async (args: {
+      query?: string;
+      settingEditorType?: SettingEditorType;
+    }) => {
+      if (args.settingEditorType === 'ui') {
+        void commands.execute(CommandIDs.open, { query: args.query ?? '' });
+      } else if (args.settingEditorType === 'json') {
+        void commands.execute(CommandIDs.openJSON);
+      } else {
+        void registry.load(plugin.id).then(settings => {
+          (settings.get('settingEditorType').composite as SettingEditorType) ===
+          'json'
+            ? void commands.execute(CommandIDs.openJSON)
+            : void openUi({ query: args.query ?? '' });
+        });
+      }
+    },
+    label: args => {
+      if (args.label) {
+        return args.label as string;
+      }
+      return trans.__('Settings Editor');
+    }
+  });
+
+  if (palette) {
+    palette.addItem({
+      category: trans.__('Settings'),
+      command: CommandIDs.open,
+      args: { settingEditorType: 'ui' }
+    });
+  }
+
+  return tracker;
+}
+
+/**
+ * The default setting editor extension.
+ */
+const jsonPlugin: JupyterFrontEndPlugin<IJSONSettingEditorTracker> = {
+  id: '@jupyterlab/settingeditor-extension:plugin',
+  requires: [
+    ISettingRegistry,
+    IEditorServices,
+    IStateDB,
+    IRenderMimeRegistry,
+    ILabStatus,
+    ITranslator
+  ],
+  optional: [ILayoutRestorer, ICommandPalette],
+  autoStart: true,
+  provides: IJSONSettingEditorTracker,
+  activate: activateJSON
+};
+
+/**
+ * Activate the setting editor extension.
+ */
+function activateJSON(
+  app: JupyterFrontEnd,
+  registry: ISettingRegistry,
+  editorServices: IEditorServices,
+  state: IStateDB,
+  rendermime: IRenderMimeRegistry,
+  status: ILabStatus,
+  translator: ITranslator,
+  restorer: ILayoutRestorer | null,
+  palette: ICommandPalette | null
+): IJSONSettingEditorTracker {
+  const trans = translator.load('jupyterlab');
+  const { commands, shell } = app;
+  const namespace = 'json-setting-editor';
+  const factoryService = editorServices.factoryService;
+  const editorFactory = factoryService.newInlineEditor;
+  const tracker = new WidgetTracker<MainAreaWidget<JsonSettingEditor>>({
+    namespace
+  });
+
+  // Handle state restoration.
+  if (restorer) {
+    void restorer.restore(tracker, {
+      command: CommandIDs.openJSON,
+      args: widget => ({}),
+      name: widget => namespace
+    });
+  }
+
+  commands.addCommand(CommandIDs.openJSON, {
+    execute: async () => {
+      if (tracker.currentWidget && !tracker.currentWidget.isDisposed) {
+        if (!tracker.currentWidget.isAttached) {
+          shell.add(tracker.currentWidget, 'main', {
+            type: 'Advanced Settings'
+          });
+        }
+        shell.activateById(tracker.currentWidget.id);
+        return;
+      }
+
+      const key = plugin.id;
+      const when = app.restored;
+
+      const { JsonSettingEditor } = await import('@jupyterlab/settingeditor');
+
+      const editor = new JsonSettingEditor({
+        commands: {
+          registry: commands,
+          revert: CommandIDs.revert,
+          save: CommandIDs.save
+        },
+        editorFactory,
+        key,
+        registry,
+        rendermime,
+        state,
+        translator,
+        when
+      });
+
+      let disposable: IDisposable | null = null;
+      // Notify the command registry when the visibility status of the setting
+      // editor's commands change. The setting editor toolbar listens for this
+      // signal from the command registry.
+      editor.commandsChanged.connect((sender: any, args: string[]) => {
+        args.forEach(id => {
+          commands.notifyCommandChanged(id);
+        });
+        if (editor.canSaveRaw) {
+          if (!disposable) {
+            disposable = status.setDirty();
+          }
+        } else if (disposable) {
+          disposable.dispose();
+          disposable = null;
+        }
+        editor.disposed.connect(() => {
+          if (disposable) {
+            disposable.dispose();
+          }
+        });
+      });
+
+      const container = new MainAreaWidget<JsonSettingEditor>({
+        content: editor
+      });
+
+      container.id = namespace;
+      container.title.icon = settingsIcon;
+      container.title.label = trans.__('Advanced Settings Editor');
+      container.title.closable = true;
+
+      void tracker.add(container);
+      shell.add(container, 'main', { type: 'Advanced Settings' });
+    },
+    label: trans.__('Advanced Settings Editor')
+  });
+  if (palette) {
+    palette.addItem({
+      category: trans.__('Settings'),
+      command: CommandIDs.openJSON
+    });
+  }
+
+  commands.addCommand(CommandIDs.revert, {
+    execute: () => {
+      tracker.currentWidget?.content.revert();
+    },
+    icon: undoIcon,
+    label: trans.__('Revert User Settings'),
+    isEnabled: () => tracker.currentWidget?.content.canRevertRaw ?? false
+  });
+
+  commands.addCommand(CommandIDs.save, {
+    execute: () => tracker.currentWidget?.content.save(),
+    icon: saveIcon,
+    label: trans.__('Save User Settings'),
+    isEnabled: () => tracker.currentWidget?.content.canSaveRaw ?? false
+  });
+
+  return tracker;
+}
+
+export default [plugin, jsonPlugin];