@orion-js/graphql 3.3.24 → 3.3.25

package/lib/buildSchema/getSubscriptions/index.js

@@ -10,10 +10,10 @@ async function default_1(options) {
     const fields = {};
     for (const key of Object.keys(subscriptions)) {
         const subscription = subscriptions[key];
-        subscription.key = key;
+        subscription.name = subscription.name || key;
         const type = await (0, getType_1.default)(subscription.returns, options);
         const args = await (0, getArgs_1.default)(subscription.params);
-        fields[key] = {
+        fields[subscription.name] = {
             type,
             args,
             async subscribe(root, params, viewer) {

package/lib/index.d.ts

@@ -9,3 +9,4 @@ import * as GraphQL from 'graphql';
 export { GraphQL, startGraphQL, startGraphiQL, resolversSchemas, ResolverParams, serializeSchema, subscription, getBasicResultQuery };
 export * from './types';
 export * from './service';
+export * from './websockerViewer';

package/lib/index.js

@@ -44,3 +44,4 @@ const GraphQL = __importStar(require("graphql"));
 exports.GraphQL = GraphQL;
 __exportStar(require("./types"), exports);
 __exportStar(require("./service"), exports);
+__exportStar(require("./websockerViewer"), exports);

package/lib/service/subscription.js

@@ -14,7 +14,10 @@ function Subscriptions() {
 exports.Subscriptions = Subscriptions;
 function Subscription(options) {
     return function (object, propertyName, index) {
-        const sub = (0, __1.subscription)(options);
+        const sub = (0, __1.subscription)({
+            name: propertyName,
+            ...options
+        });
         object.subscriptions = object.subscriptions || {};
         object.subscriptions[propertyName] = sub;
         services_1.Container.registerHandler({

package/lib/service/subscription.test.js

@@ -49,6 +49,7 @@ describe('Subscriptions classes', () => {
         expect(subscriptions.onUserCreated).toBeDefined();
         const instance = (0, services_1.getInstance)(ExampleSubscriptionsService);
         expect(instance.onUserCreated.publish).toBeDefined();
+        expect(instance.onUserCreated.name).toBe('onUserCreated');
         // await instance.onUserCreated.publish({name: 'test'}, {name: 'test'})
     });
 });

package/lib/subscription/index.js

@@ -8,19 +8,19 @@ const getChannelName_1 = __importDefault(require("./getChannelName"));
 const resolvers_1 = require("@orion-js/resolvers");
 const createSubscription = function (options) {
     const subscription = {
-        key: 'notInitialized'
+        name: options.name
     };
     // the publish function
     subscription.publish = async (params, data) => {
         const pubsub = (0, pubsub_1.getPubsub)();
-        const channelName = (0, getChannelName_1.default)(subscription.key, params);
-        await pubsub.publish(channelName, { [subscription.key]: data });
+        const channelName = (0, getChannelName_1.default)(subscription.name, params);
+        await pubsub.publish(channelName, { [subscription.name]: data });
     };
     subscription.subscribe = async (params, viewer) => {
         const pubsub = (0, pubsub_1.getPubsub)();
         try {
             await (0, resolvers_1.checkPermissions)({ params, viewer }, options);
-            const channelName = (0, getChannelName_1.default)(subscription.key, params);
+            const channelName = (0, getChannelName_1.default)(subscription.name, params);
             return pubsub.asyncIterator(channelName);
         }
         catch (error) {

package/lib/types/subscription.d.ts

@@ -1,6 +1,6 @@
 import { ResolverOptions } from '@orion-js/resolvers';
 export interface OrionSubscription<TParams = any, ReturnType = any> {
-    key: string;
+    name: string;
     params: object;
     subscribe: (callParams: object, viewer: object) => {};
     returns: ReturnType;
@@ -11,4 +11,5 @@ export interface OrionSubscriptionsMap {
     [key: string]: OrionSubscription;
 }
 export interface OrionSubscriptionOptions extends Omit<ResolverOptions, 'resolve'> {
+    name?: string;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orion-js/graphql",
-  "version": "3.3.24",
+  "version": "3.3.25",
   "main": "lib/index.js",
   "author": "nicolaslopezj",
   "license": "MIT",
@@ -14,12 +14,12 @@
   },
   "dependencies": {
     "@orion-js/helpers": "^3.3.20",
-    "@orion-js/http": "^3.3.20",
-    "@orion-js/models": "^3.3.20",
-    "@orion-js/resolvers": "^3.3.20",
+    "@orion-js/http": "^3.3.25",
+    "@orion-js/models": "^3.3.25",
+    "@orion-js/resolvers": "^3.3.25",
     "@orion-js/schema": "^3.3.20",
     "@orion-js/services": "^3.3.20",
-    "@orion-js/typed-model": "^3.3.21",
+    "@orion-js/typed-model": "^3.3.25",
     "apollo-server-core": "3.5.0",
     "graphql-iso-date": "^3.6.1",
     "graphql-subscriptions": "^2.0.0",
@@ -45,5 +45,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "feaf1c65091873a8a59d674a681c37bb9607b35b"
+  "gitHead": "ed68403cef114f593dd16535db8993560f4f1849"
 }