@contello/sdk-client 8.21.2 → 8.22.1

package/dist/index.cjs

@@ -26,6 +26,7 @@ module.exports = __toCommonJS(index_exports);
 
 // src/client.ts
 var import_graphql_ws = require("graphql-ws");
+var import_rxjs2 = require("rxjs");
 
 // src/pool.ts
 var ConnectionPool = class {
@@ -106,15 +107,15 @@ var createSdk = (client, middlewares, getSdk) => {
       query,
       variables: vars || {}
     };
-    const executeWithMiddlewares = (middlewares2, index) => {
-      if (index >= middlewares2.length) {
+    const executeWithMiddlewares = (mws, index) => {
+      if (index >= mws.length) {
         return executeRequest();
       }
-      const middleware = middlewares2[index];
+      const middleware = mws[index];
       if (middleware?.onRequest) {
-        return middleware.onRequest(request, () => executeWithMiddlewares(middlewares2, index + 1));
+        return middleware.onRequest(request, () => executeWithMiddlewares(mws, index + 1));
       }
-      return executeWithMiddlewares(middlewares2, index + 1);
+      return executeWithMiddlewares(mws, index + 1);
     };
     const res = executeWithMiddlewares(middlewares, 0);
     return kind !== "subscription" ? (0, import_rxjs.firstValueFrom)(res) : res;
@@ -176,6 +177,15 @@ var ContelloSdkClient = class {
   async disconnect() {
     await this._pool.disconnect();
   }
+  subscribe(query, variables) {
+    const wsClient = this._pool.get();
+    return new import_rxjs2.Observable((obs) => wsClient.subscribe({ query, variables }, obs)).pipe(
+      (0, import_rxjs2.map)((r) => r.data)
+    );
+  }
+  execute(query, variables) {
+    return (0, import_rxjs2.firstValueFrom)(this.subscribe(query, variables));
+  }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/index.d.cts

@@ -45,6 +45,8 @@ declare class ContelloSdkClient<T> {
     get sdk(): T;
     connect(): Promise<void>;
     disconnect(): Promise<void>;
+    subscribe<TData>(query: string, variables?: Record<string, unknown> | undefined): Observable<TData>;
+    execute<TData>(query: string, variables?: Record<string, unknown> | undefined): Promise<TData>;
 }
 
 export { ContelloSdkClient, type ContelloSdkClientMiddleware, type ContelloSdkClientParams };

package/dist/index.d.ts

@@ -45,6 +45,8 @@ declare class ContelloSdkClient<T> {
     get sdk(): T;
     connect(): Promise<void>;
     disconnect(): Promise<void>;
+    subscribe<TData>(query: string, variables?: Record<string, unknown> | undefined): Observable<TData>;
+    execute<TData>(query: string, variables?: Record<string, unknown> | undefined): Promise<TData>;
 }
 
 export { ContelloSdkClient, type ContelloSdkClientMiddleware, type ContelloSdkClientParams };

package/dist/index.js

@@ -1,5 +1,6 @@
 // src/client.ts
 import { createClient } from "graphql-ws";
+import { Observable as Observable2, firstValueFrom as firstValueFrom2, map } from "rxjs";
 
 // src/pool.ts
 var ConnectionPool = class {
@@ -80,15 +81,15 @@ var createSdk = (client, middlewares, getSdk) => {
       query,
       variables: vars || {}
     };
-    const executeWithMiddlewares = (middlewares2, index) => {
-      if (index >= middlewares2.length) {
+    const executeWithMiddlewares = (mws, index) => {
+      if (index >= mws.length) {
         return executeRequest();
       }
-      const middleware = middlewares2[index];
+      const middleware = mws[index];
       if (middleware?.onRequest) {
-        return middleware.onRequest(request, () => executeWithMiddlewares(middlewares2, index + 1));
+        return middleware.onRequest(request, () => executeWithMiddlewares(mws, index + 1));
       }
-      return executeWithMiddlewares(middlewares2, index + 1);
+      return executeWithMiddlewares(mws, index + 1);
     };
     const res = executeWithMiddlewares(middlewares, 0);
     return kind !== "subscription" ? firstValueFrom(res) : res;
@@ -150,6 +151,15 @@ var ContelloSdkClient = class {
   async disconnect() {
     await this._pool.disconnect();
   }
+  subscribe(query, variables) {
+    const wsClient = this._pool.get();
+    return new Observable2((obs) => wsClient.subscribe({ query, variables }, obs)).pipe(
+      map((r) => r.data)
+    );
+  }
+  execute(query, variables) {
+    return firstValueFrom2(this.subscribe(query, variables));
+  }
 };
 export {
   ContelloSdkClient

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contello/sdk-client",
-  "version": "8.21.2",
+  "version": "8.22.1",
   "description": "GraphQL SDK client for Contello CMS with WebSocket transport and connection pooling",
   "type": "module",
   "license": "MIT",
@@ -17,14 +17,14 @@
     "typecheck": "tsc --noEmit"
   },
   "peerDependencies": {
-    "rxjs": ">=5.0.0",
+    "rxjs": "^7.0.0",
     "graphql": ">=16.0.0",
     "graphql-ws": ">=5.0.0"
   },
   "devDependencies": {
     "rxjs": "^7.8.2",
-    "graphql": "^16.11.0",
-    "graphql-ws": "^6.0.6"
+    "graphql": "^16.13.1",
+    "graphql-ws": "^6.0.7"
   },
   "files": [
     "dist"