@codingame/monaco-vscode-notifications-service-override 11.1.1 → 12.0.0

package/index.d.ts

@@ -1 +1,2 @@
-export { default } from 'vscode/service-override/notifications';
+import { type IEditorOverrideServices } from "vscode/vscode/vs/editor/standalone/browser/standaloneServices";
+export default function getServiceOverride(): IEditorOverrideServices;

package/index.js

@@ -1 +1,44 @@
-export { default } from './notifications.js';
+
+import { NotificationsToasts } from '@codingame/monaco-vscode-494be54c-bd37-5b3c-af70-02f086e28768-common/vscode/vs/workbench/browser/parts/notifications/notificationsToasts';
+import 'vscode/vscode/vs/editor/standalone/browser/standaloneServices';
+import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import { NotificationService } from './vscode/src/vs/workbench/services/notification/common/notificationService.js';
+import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
+import { getClientArea } from 'vscode/vscode/vs/base/browser/dom';
+import { registerNotificationCommands } from '@codingame/monaco-vscode-494be54c-bd37-5b3c-af70-02f086e28768-common/vscode/vs/workbench/browser/parts/notifications/notificationsCommands';
+import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
+import { NotificationsCenter } from '@codingame/monaco-vscode-494be54c-bd37-5b3c-af70-02f086e28768-common/vscode/vs/workbench/browser/parts/notifications/notificationsCenter';
+import { NotificationsAlerts } from '@codingame/monaco-vscode-494be54c-bd37-5b3c-af70-02f086e28768-common/vscode/vs/workbench/browser/parts/notifications/notificationsAlerts';
+import { NotificationsTelemetry } from '@codingame/monaco-vscode-494be54c-bd37-5b3c-af70-02f086e28768-common/vscode/vs/workbench/browser/parts/notifications/notificationsTelemetry';
+import { ILayoutService } from 'vscode/vscode/vs/platform/layout/browser/layoutService.service';
+import { NotificationsStatus } from '@codingame/monaco-vscode-494be54c-bd37-5b3c-af70-02f086e28768-common/vscode/vs/workbench/browser/parts/notifications/notificationsStatus';
+import { onRenderWorkbench } from 'vscode/lifecycle';
+
+onRenderWorkbench(async (accessor) => {
+    const container = accessor.get(ILayoutService).mainContainer;
+    const model = accessor.get(INotificationService).model;
+    const instantiationService = accessor.get(IInstantiationService);
+    setTimeout(() => {
+        const notificationsCenter = instantiationService.createInstance(NotificationsCenter, container, model);
+        const notificationsToasts = instantiationService.createInstance(NotificationsToasts, container, model);
+        instantiationService.createInstance(NotificationsAlerts, model);
+        const notificationsStatus = instantiationService.createInstance(NotificationsStatus, model);
+        instantiationService.createInstance(NotificationsTelemetry);
+        notificationsCenter.onDidChangeVisibility(() => {
+            notificationsStatus.update(notificationsCenter.isVisible, notificationsToasts.isVisible);
+            notificationsToasts.update(notificationsCenter.isVisible);
+        });
+        notificationsToasts.onDidChangeVisibility(() => {
+            notificationsStatus.update(notificationsCenter.isVisible, notificationsToasts.isVisible);
+        });
+        registerNotificationCommands(notificationsCenter, notificationsToasts, model);
+        notificationsToasts.layout(getClientArea(container));
+    });
+});
+function getServiceOverride() {
+    return {
+        [INotificationService.toString()]: new SyncDescriptor(NotificationService, [], true)
+    };
+}
+
+export { getServiceOverride as default };

package/package.json

@@ -1,6 +1,8 @@
 {
   "name": "@codingame/monaco-vscode-notifications-service-override",
-  "version": "11.1.1",
+  "version": "12.0.0",
+  "private": false,
+  "description": "VSCode public API plugged on the monaco editor - notifications service-override",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -12,8 +14,12 @@
     "url": "git+ssh://git@github.com/CodinGame/monaco-vscode-api.git"
   },
   "type": "module",
-  "private": false,
-  "description": "VSCode public API plugged on the monaco editor - notifications service-override",
+  "dependencies": {
+    "@codingame/monaco-vscode-494be54c-bd37-5b3c-af70-02f086e28768-common": "12.0.0",
+    "vscode": "npm:@codingame/monaco-vscode-api@12.0.0"
+  },
+  "peerDependencies": {},
+  "peerDependenciesMeta": {},
   "main": "index.js",
   "module": "index.js",
   "types": "index.d.ts",
@@ -22,11 +28,12 @@
       "default": "./index.js"
     },
     "./vscode/*": {
-      "default": "./vscode/src/*.js"
+      "default": "./vscode/src/*.js",
+      "types": "./vscode/src/*.d.ts"
+    },
+    "./*": {
+      "default": "./*.js",
+      "types": "./*.d.ts"
     }
-  },
-  "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@11.1.1",
-    "@codingame/monaco-vscode-notifications-workbench-common": "11.1.1"
   }
 }

package/vscode/src/vs/workbench/services/notification/common/notificationService.d.ts

@@ -0,0 +1,37 @@
+import { INotification, INotificationHandle, Severity, NotificationMessage, IPromptChoice, IPromptOptions, IStatusMessageOptions, NotificationsFilter, INotificationSource, INotificationSourceFilter } from "vscode/vscode/vs/platform/notification/common/notification";
+import { INotificationService } from "vscode/vscode/vs/platform/notification/common/notification.service";
+import { NotificationsModel } from "@codingame/monaco-vscode-494be54c-bd37-5b3c-af70-02f086e28768-common/vscode/vs/workbench/common/notifications";
+import { Disposable, IDisposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { Event } from "vscode/vscode/vs/base/common/event";
+import { IStorageService } from "vscode/vscode/vs/platform/storage/common/storage.service";
+export declare class NotificationService extends Disposable implements INotificationService {
+    private readonly storageService;
+    readonly _serviceBrand: undefined;
+    readonly model: NotificationsModel;
+    private readonly _onDidAddNotification;
+    readonly onDidAddNotification: Event<INotification>;
+    private readonly _onDidRemoveNotification;
+    readonly onDidRemoveNotification: Event<INotification>;
+    constructor(storageService: IStorageService);
+    private registerListeners;
+    private static readonly GLOBAL_FILTER_SETTINGS_KEY;
+    private static readonly PER_SOURCE_FILTER_SETTINGS_KEY;
+    private readonly _onDidChangeFilter;
+    readonly onDidChangeFilter: Event<void>;
+    private globalFilterEnabled;
+    private readonly mapSourceToFilter;
+    setFilter(filter: NotificationsFilter | INotificationSourceFilter): void;
+    getFilter(source?: INotificationSource): NotificationsFilter;
+    private updateSourceFilter;
+    private saveSourceFilters;
+    getFilters(): INotificationSourceFilter[];
+    private updateFilters;
+    removeFilter(sourceId: string): void;
+    info(message: NotificationMessage | NotificationMessage[]): void;
+    warn(message: NotificationMessage | NotificationMessage[]): void;
+    error(message: NotificationMessage | NotificationMessage[]): void;
+    notify(notification: INotification): INotificationHandle;
+    private toStorageScope;
+    prompt(severity: Severity, message: string, choices: IPromptChoice[], options?: IPromptOptions): INotificationHandle;
+    status(message: NotificationMessage, options?: IStatusMessageOptions): IDisposable;
+}

package/vscode/src/vs/workbench/services/notification/common/notificationService.js

@@ -1,13 +1,16 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { localize } from 'vscode/vscode/vs/nls';
 import { isNotificationSource, NotificationsFilter, NoOpNotification, NeverShowAgainScope } from 'vscode/vscode/vs/platform/notification/common/notification';
 import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-import { NotificationsModel, ChoiceAction } from '@codingame/monaco-vscode-notifications-workbench-common/vscode/vs/workbench/common/notifications';
+import { NotificationsModel, NotificationChangeType, ChoiceAction } from '@codingame/monaco-vscode-494be54c-bd37-5b3c-af70-02f086e28768-common/vscode/vs/workbench/common/notifications';
 import { Disposable, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 import { Emitter, Event } from 'vscode/vscode/vs/base/common/event';
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { Action } from 'vscode/vscode/vs/base/common/actions';
+import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
-import Severity$1 from 'vscode/vscode/vs/base/common/severity';
+import Severity from 'vscode/vscode/vs/base/common/severity';
 
 var NotificationService_1;
 let NotificationService = class NotificationService extends Disposable {
@@ -15,17 +18,17 @@ let NotificationService = class NotificationService extends Disposable {
     constructor(storageService) {
         super();
         this.storageService = storageService;
-        this.model = this._register(( (new NotificationsModel())));
-        this._onDidAddNotification = this._register(( (new Emitter())));
+        this.model = this._register(( new NotificationsModel()));
+        this._onDidAddNotification = this._register(( new Emitter()));
         this.onDidAddNotification = this._onDidAddNotification.event;
-        this._onDidRemoveNotification = this._register(( (new Emitter())));
+        this._onDidRemoveNotification = this._register(( new Emitter()));
         this.onDidRemoveNotification = this._onDidRemoveNotification.event;
-        this._onDidChangeFilter = this._register(( (new Emitter())));
+        this._onDidChangeFilter = this._register(( new Emitter()));
         this.onDidChangeFilter = this._onDidChangeFilter.event;
-        this.globalFilterEnabled = this.storageService.getBoolean(NotificationService_1.GLOBAL_FILTER_SETTINGS_KEY, -1 , false);
+        this.globalFilterEnabled = this.storageService.getBoolean(NotificationService_1.GLOBAL_FILTER_SETTINGS_KEY, StorageScope.APPLICATION, false);
         this.mapSourceToFilter = (() => {
-            const map = ( (new Map()));
-            for (const sourceFilter of this.storageService.getObject(NotificationService_1.PER_SOURCE_FILTER_SETTINGS_KEY, -1 , [])) {
+            const map = ( new Map());
+            for (const sourceFilter of this.storageService.getObject(NotificationService_1.PER_SOURCE_FILTER_SETTINGS_KEY, StorageScope.APPLICATION, [])) {
                 map.set(sourceFilter.id, sourceFilter);
             }
             return map;
@@ -36,8 +39,8 @@ let NotificationService = class NotificationService extends Disposable {
     registerListeners() {
         this._register(this.model.onDidChangeNotification(e => {
             switch (e.kind) {
-                case 0 :
-                case 3 : {
+                case NotificationChangeType.ADD:
+                case NotificationChangeType.REMOVE: {
                     const source = typeof e.item.sourceId === 'string' && typeof e.item.source === 'string' ? { id: e.item.sourceId, label: e.item.source } : e.item.source;
                     const notification = {
                         message: e.item.message.original,
@@ -45,9 +48,9 @@ let NotificationService = class NotificationService extends Disposable {
                         source,
                         priority: e.item.priority
                     };
-                    if (e.kind === 0 ) {
+                    if (e.kind === NotificationChangeType.ADD) {
                         if (isNotificationSource(source)) {
-                            if (!( (this.mapSourceToFilter.has(source.id)))) {
+                            if (!( this.mapSourceToFilter.has(source.id))) {
                                 this.setFilter({ ...source, filter: NotificationsFilter.OFF });
                             }
                             else {
@@ -56,7 +59,7 @@ let NotificationService = class NotificationService extends Disposable {
                         }
                         this._onDidAddNotification.fire(notification);
                     }
-                    if (e.kind === 3 ) {
+                    if (e.kind === NotificationChangeType.REMOVE) {
                         this._onDidRemoveNotification.fire(notification);
                     }
                     break;
@@ -72,7 +75,7 @@ let NotificationService = class NotificationService extends Disposable {
                 return;
             }
             this.globalFilterEnabled = filter === NotificationsFilter.ERROR;
-            this.storageService.store(NotificationService_1.GLOBAL_FILTER_SETTINGS_KEY, this.globalFilterEnabled, -1 , 1 );
+            this.storageService.store(NotificationService_1.GLOBAL_FILTER_SETTINGS_KEY, this.globalFilterEnabled, StorageScope.APPLICATION, StorageTarget.MACHINE);
             this.updateFilters();
             this._onDidChangeFilter.fire();
         }
@@ -103,17 +106,15 @@ let NotificationService = class NotificationService extends Disposable {
         }
     }
     saveSourceFilters() {
-        this.storageService.store(NotificationService_1.PER_SOURCE_FILTER_SETTINGS_KEY, JSON.stringify([...( (this.mapSourceToFilter.values()))]), -1 , 1 );
+        this.storageService.store(NotificationService_1.PER_SOURCE_FILTER_SETTINGS_KEY, JSON.stringify([...( this.mapSourceToFilter.values())]), StorageScope.APPLICATION, StorageTarget.MACHINE);
     }
     getFilters() {
-        return [...( (this.mapSourceToFilter.values()))];
+        return [...( this.mapSourceToFilter.values())];
     }
     updateFilters() {
         this.model.setFilter({
             global: this.globalFilterEnabled ? NotificationsFilter.ERROR : NotificationsFilter.OFF,
-            sources: ( (new Map(
-                 ([...( (this.mapSourceToFilter.values()))].map(source => [source.id, source.filter]))
-            )))
+            sources: ( new Map(( [...( this.mapSourceToFilter.values())].map(source => [source.id, source.filter]))))
         });
     }
     removeFilter(sourceId) {
@@ -129,7 +130,7 @@ let NotificationService = class NotificationService extends Disposable {
             }
             return;
         }
-        this.model.addNotification({ severity: Severity$1.Info, message });
+        this.model.addNotification({ severity: Severity.Info, message });
     }
     warn(message) {
         if (Array.isArray(message)) {
@@ -138,7 +139,7 @@ let NotificationService = class NotificationService extends Disposable {
             }
             return;
         }
-        this.model.addNotification({ severity: Severity$1.Warning, message });
+        this.model.addNotification({ severity: Severity.Warning, message });
     }
     error(message) {
         if (Array.isArray(message)) {
@@ -147,22 +148,20 @@ let NotificationService = class NotificationService extends Disposable {
             }
             return;
         }
-        this.model.addNotification({ severity: Severity$1.Error, message });
+        this.model.addNotification({ severity: Severity.Error, message });
     }
     notify(notification) {
-        const toDispose = ( (new DisposableStore()));
+        const toDispose = ( new DisposableStore());
         if (notification.neverShowAgain) {
             const scope = this.toStorageScope(notification.neverShowAgain);
             const id = notification.neverShowAgain.id;
             if (this.storageService.getBoolean(id, scope)) {
-                return (
-                     (new NoOpNotification())
-                );
+                return ( new NoOpNotification());
             }
-            const neverShowAgainAction = toDispose.add(( (new Action('workbench.notification.neverShowAgain', ( localize(2641, "Don't Show Again")), undefined, true, async () => {
+            const neverShowAgainAction = toDispose.add(( new Action('workbench.notification.neverShowAgain', ( localize(11662, "Don't Show Again")), undefined, true, async () => {
                 handle.close();
-                this.storageService.store(id, true, scope, 0 );
-            }))));
+                this.storageService.store(id, true, scope, StorageTarget.USER);
+            })));
             const actions = {
                 primary: notification.actions?.primary || [],
                 secondary: notification.actions?.secondary || []
@@ -182,28 +181,26 @@ let NotificationService = class NotificationService extends Disposable {
     toStorageScope(options) {
         switch (options.scope) {
             case NeverShowAgainScope.APPLICATION:
-                return -1 ;
+                return StorageScope.APPLICATION;
             case NeverShowAgainScope.PROFILE:
-                return 0 ;
+                return StorageScope.PROFILE;
             case NeverShowAgainScope.WORKSPACE:
-                return 1 ;
+                return StorageScope.WORKSPACE;
             default:
-                return -1 ;
+                return StorageScope.APPLICATION;
         }
     }
     prompt(severity, message, choices, options) {
-        const toDispose = ( (new DisposableStore()));
+        const toDispose = ( new DisposableStore());
         if (options?.neverShowAgain) {
             const scope = this.toStorageScope(options.neverShowAgain);
             const id = options.neverShowAgain.id;
             if (this.storageService.getBoolean(id, scope)) {
-                return (
-                     (new NoOpNotification())
-                );
+                return ( new NoOpNotification());
             }
             const neverShowAgainChoice = {
-                label: ( localize(2641, "Don't Show Again")),
-                run: () => this.storageService.store(id, true, scope, 0 ),
+                label: ( localize(11662, "Don't Show Again")),
+                run: () => this.storageService.store(id, true, scope, StorageTarget.USER),
                 isSecondary: options.neverShowAgain.isSecondary
             };
             if (!options.neverShowAgain.isSecondary) {
@@ -217,7 +214,7 @@ let NotificationService = class NotificationService extends Disposable {
         const primaryActions = [];
         const secondaryActions = [];
         choices.forEach((choice, index) => {
-            const action = ( (new ChoiceAction(`workbench.dialog.choice.${index}`, choice)));
+            const action = ( new ChoiceAction(`workbench.dialog.choice.${index}`, choice));
             if (!choice.isSecondary) {
                 primaryActions.push(action);
             }
@@ -246,8 +243,8 @@ let NotificationService = class NotificationService extends Disposable {
         return this.model.showStatusMessage(message, options);
     }
 };
-NotificationService = NotificationService_1 = ( (__decorate([
-    ( (__param(0, IStorageService)))
-], NotificationService)));
+NotificationService = NotificationService_1 = ( __decorate([
+    ( __param(0, IStorageService))
+], NotificationService));
 
 export { NotificationService };

package/notifications.js

@@ -1,42 +0,0 @@
-import { NotificationsToasts } from '@codingame/monaco-vscode-notifications-workbench-common/vscode/vs/workbench/browser/parts/notifications/notificationsToasts';
-import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-import { NotificationService } from './vscode/src/vs/workbench/services/notification/common/notificationService.js';
-import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
-import { getClientArea } from 'vscode/vscode/vs/base/browser/dom';
-import { registerNotificationCommands } from '@codingame/monaco-vscode-notifications-workbench-common/vscode/vs/workbench/browser/parts/notifications/notificationsCommands';
-import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
-import { NotificationsCenter } from '@codingame/monaco-vscode-notifications-workbench-common/vscode/vs/workbench/browser/parts/notifications/notificationsCenter';
-import { NotificationsAlerts } from '@codingame/monaco-vscode-notifications-workbench-common/vscode/vs/workbench/browser/parts/notifications/notificationsAlerts';
-import { NotificationsTelemetry } from '@codingame/monaco-vscode-notifications-workbench-common/vscode/vs/workbench/browser/parts/notifications/notificationsTelemetry';
-import { ILayoutService } from 'vscode/vscode/vs/platform/layout/browser/layoutService.service';
-import { NotificationsStatus } from '@codingame/monaco-vscode-notifications-workbench-common/vscode/vs/workbench/browser/parts/notifications/notificationsStatus';
-import { onRenderWorkbench } from 'vscode/lifecycle';
-
-onRenderWorkbench(async (accessor) => {
-    const container = accessor.get(ILayoutService).mainContainer;
-    const model = accessor.get(INotificationService).model;
-    const instantiationService = accessor.get(IInstantiationService);
-    setTimeout(() => {
-        const notificationsCenter = instantiationService.createInstance(NotificationsCenter, container, model);
-        const notificationsToasts = instantiationService.createInstance(NotificationsToasts, container, model);
-        instantiationService.createInstance(NotificationsAlerts, model);
-        const notificationsStatus = instantiationService.createInstance(NotificationsStatus, model);
-        instantiationService.createInstance(NotificationsTelemetry);
-        notificationsCenter.onDidChangeVisibility(() => {
-            notificationsStatus.update(notificationsCenter.isVisible, notificationsToasts.isVisible);
-            notificationsToasts.update(notificationsCenter.isVisible);
-        });
-        notificationsToasts.onDidChangeVisibility(() => {
-            notificationsStatus.update(notificationsCenter.isVisible, notificationsToasts.isVisible);
-        });
-        registerNotificationCommands(notificationsCenter, notificationsToasts, model);
-        notificationsToasts.layout(getClientArea(container));
-    });
-});
-function getServiceOverride() {
-    return {
-        [( INotificationService.toString())]: new SyncDescriptor(NotificationService, [], true)
-    };
-}
-
-export { getServiceOverride as default };