@hydranium/glsp-server 1.0.0-next.148 → 1.0.0-next.155

package/lib/launcher/glsp-server-overrides.d.ts

@@ -21,9 +21,10 @@ import { ContainerModule } from 'inversify';
  * **An adopter's server is kept when it extends {@link HydraniumGlspServer}.**
  * Any other `GLSPServer` the adopter's `ServerModule` binds, upstream's default
  * included, is replaced when the container first creates it, so a server that
- * extends upstream's directly is discarded. The replacement happens on
- * activation because `rebind` would replace an adopter's subclass as well; the
- * discarded server is constructed once and never used.
+ * extends upstream's directly is discarded, with a warning naming its class.
+ * The replacement happens on activation because `rebind` would replace an
+ * adopter's subclass as well; the discarded server is constructed once and
+ * never used.
  *
  * Keeping this out of the adopter's hands is the point: an adopter passes their
  * own `ServerModule` in, so anything they must add themselves is a fix the

package/lib/launcher/glsp-server-overrides.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"glsp-server-overrides.d.ts","sourceRoot":"","sources":["../../src/launcher/glsp-server-overrides.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAGlF,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAG5C;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,wBAAgB,yBAAyB,IAAI,eAAe,CAO3D"}
+{"version":3,"file":"glsp-server-overrides.d.ts","sourceRoot":"","sources":["../../src/launcher/glsp-server-overrides.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAGlF,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAG5C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,wBAAgB,yBAAyB,IAAI,eAAe,CAkB3D"}

package/lib/launcher/glsp-server-overrides.js

@@ -6,7 +6,7 @@
  *
  * SPDX-License-Identifier: MIT
  ********************************************************************************/
-import { GLSPServer } from '@eclipse-glsp/server';
+import { DefaultGLSPServer, GLSPServer, LoggerFactory } from '@eclipse-glsp/server';
 import { ContainerModule } from 'inversify';
 import { HydraniumGlspServer } from './hydranium-glsp-server.js';
 /**
@@ -23,9 +23,10 @@ import { HydraniumGlspServer } from './hydranium-glsp-server.js';
  * **An adopter's server is kept when it extends {@link HydraniumGlspServer}.**
  * Any other `GLSPServer` the adopter's `ServerModule` binds, upstream's default
  * included, is replaced when the container first creates it, so a server that
- * extends upstream's directly is discarded. The replacement happens on
- * activation because `rebind` would replace an adopter's subclass as well; the
- * discarded server is constructed once and never used.
+ * extends upstream's directly is discarded, with a warning naming its class.
+ * The replacement happens on activation because `rebind` would replace an
+ * adopter's subclass as well; the discarded server is constructed once and
+ * never used.
  *
  * Keeping this out of the adopter's hands is the point: an adopter passes their
  * own `ServerModule` in, so anything they must add themselves is a fix the
@@ -41,7 +42,18 @@ import { HydraniumGlspServer } from './hydranium-glsp-server.js';
 export function createGlspServerOverrides() {
     return new ContainerModule((bind, _unbind, _isBound, _rebind, _unbindAsync, onActivation) => {
         bind(HydraniumGlspServer).toSelf().inSingletonScope();
-        onActivation(GLSPServer, (context, server) => server instanceof HydraniumGlspServer ? server : context.container.get(HydraniumGlspServer));
+        onActivation(GLSPServer, (context, server) => {
+            if (server instanceof HydraniumGlspServer) {
+                return server;
+            }
+            if (server.constructor !== DefaultGLSPServer) {
+                context.container
+                    .get(LoggerFactory)('HydraniumGlspServer')
+                    .warn(`Replacing the bound GLSP server ${server.constructor.name} with HydraniumGlspServer; ` +
+                    'extend HydraniumGlspServer to keep its behaviour.');
+            }
+            return context.container.get(HydraniumGlspServer);
+        });
     });
 }
 //# sourceMappingURL=glsp-server-overrides.js.map

package/lib/launcher/glsp-server-overrides.js.map

@@ -1 +1 @@
-{"version":3,"file":"glsp-server-overrides.js","sourceRoot":"","sources":["../../src/launcher/glsp-server-overrides.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAC5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAEjE;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,MAAM,UAAU,yBAAyB;IACtC,OAAO,IAAI,eAAe,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,EAAE;QACzF,IAAI,CAAC,mBAAmB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;QACtD,YAAY,CAAa,UAAU,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,CACtD,MAAM,YAAY,mBAAmB,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAC7F,CAAC;IACL,CAAC,CAAC,CAAC;AACN,CAAC"}
+{"version":3,"file":"glsp-server-overrides.js","sourceRoot":"","sources":["../../src/launcher/glsp-server-overrides.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,EAAE,iBAAiB,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACpF,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAC5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAEjE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,MAAM,UAAU,yBAAyB;IACtC,OAAO,IAAI,eAAe,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,EAAE;QACzF,IAAI,CAAC,mBAAmB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;QACtD,YAAY,CAAa,UAAU,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACtD,IAAI,MAAM,YAAY,mBAAmB,EAAE,CAAC;gBACzC,OAAO,MAAM,CAAC;YACjB,CAAC;YACD,IAAI,MAAM,CAAC,WAAW,KAAK,iBAAiB,EAAE,CAAC;gBAC5C,OAAO,CAAC,SAAS;qBACb,GAAG,CAAgB,aAAa,CAAC,CAAC,qBAAqB,CAAC;qBACxD,IAAI,CACF,mCAAmC,MAAM,CAAC,WAAW,CAAC,IAAI,6BAA6B;oBACpF,mDAAmD,CACxD,CAAC;YACR,CAAC;YACD,OAAO,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;QACrD,CAAC,CAAC,CAAC;IACN,CAAC,CAAC,CAAC;AACN,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hydranium/glsp-server",
-  "version": "1.0.0-next.148",
+  "version": "1.0.0-next.155",
   "description": "GLSP protocol head for the hydranium framework. Peer of @hydranium/core/lsp and @hydranium/data-server; built on @hydranium/core.",
   "keywords": [
     "hydranium",
@@ -87,9 +87,9 @@
   "devDependencies": {
     "@eclipse-glsp/protocol": "2.7.0",
     "@eclipse-glsp/server": "2.7.0",
-    "@hydranium/core": "1.0.0-next.148",
-    "@hydranium/langium": "1.0.0-next.148",
-    "@hydranium/protocol": "1.0.0-next.148",
+    "@hydranium/core": "1.0.0-next.155",
+    "@hydranium/langium": "1.0.0-next.155",
+    "@hydranium/protocol": "1.0.0-next.155",
     "inversify": "6.2.2",
     "reflect-metadata": "0.2.2",
     "rimraf": "^5.0.0",
@@ -100,9 +100,9 @@
   "peerDependencies": {
     "@eclipse-glsp/protocol": "^2.6.0",
     "@eclipse-glsp/server": "^2.6.0",
-    "@hydranium/core": "1.0.0-next.148",
-    "@hydranium/langium": "1.0.0-next.148",
-    "@hydranium/protocol": "1.0.0-next.148",
+    "@hydranium/core": "1.0.0-next.155",
+    "@hydranium/langium": "1.0.0-next.155",
+    "@hydranium/protocol": "1.0.0-next.155",
     "inversify": "^6.0.0",
     "reflect-metadata": "^0.2.2",
     "vscode-jsonrpc": "9.0.1",

package/src/launcher/glsp-server-overrides.ts

@@ -7,7 +7,7 @@
  * SPDX-License-Identifier: MIT
  ********************************************************************************/
 
-import { GLSPServer } from '@eclipse-glsp/server';
+import { DefaultGLSPServer, GLSPServer, LoggerFactory } from '@eclipse-glsp/server';
 import { ContainerModule } from 'inversify';
 import { HydraniumGlspServer } from './hydranium-glsp-server.js';
 
@@ -25,9 +25,10 @@ import { HydraniumGlspServer } from './hydranium-glsp-server.js';
  * **An adopter's server is kept when it extends {@link HydraniumGlspServer}.**
  * Any other `GLSPServer` the adopter's `ServerModule` binds, upstream's default
  * included, is replaced when the container first creates it, so a server that
- * extends upstream's directly is discarded. The replacement happens on
- * activation because `rebind` would replace an adopter's subclass as well; the
- * discarded server is constructed once and never used.
+ * extends upstream's directly is discarded, with a warning naming its class.
+ * The replacement happens on activation because `rebind` would replace an
+ * adopter's subclass as well; the discarded server is constructed once and
+ * never used.
  *
  * Keeping this out of the adopter's hands is the point: an adopter passes their
  * own `ServerModule` in, so anything they must add themselves is a fix the
@@ -43,8 +44,19 @@ import { HydraniumGlspServer } from './hydranium-glsp-server.js';
 export function createGlspServerOverrides(): ContainerModule {
    return new ContainerModule((bind, _unbind, _isBound, _rebind, _unbindAsync, onActivation) => {
       bind(HydraniumGlspServer).toSelf().inSingletonScope();
-      onActivation<GLSPServer>(GLSPServer, (context, server) =>
-         server instanceof HydraniumGlspServer ? server : context.container.get(HydraniumGlspServer)
-      );
+      onActivation<GLSPServer>(GLSPServer, (context, server) => {
+         if (server instanceof HydraniumGlspServer) {
+            return server;
+         }
+         if (server.constructor !== DefaultGLSPServer) {
+            context.container
+               .get<LoggerFactory>(LoggerFactory)('HydraniumGlspServer')
+               .warn(
+                  `Replacing the bound GLSP server ${server.constructor.name} with HydraniumGlspServer; ` +
+                     'extend HydraniumGlspServer to keep its behaviour.'
+               );
+         }
+         return context.container.get(HydraniumGlspServer);
+      });
    });
 }