@orion-js/resolvers 3.6.5 → 3.7.2

package/lib/resolver/getExecute/getCacheKey.d.ts

@@ -1,2 +1,2 @@
-import { ResolverOptions, ExecuteOptions } from '../types';
-export default function (options: ResolverOptions, executeOptions: ExecuteOptions): Promise<string>;
+import { ExecuteOptions } from '../types';
+export default function (executeOptions: ExecuteOptions): Promise<string>;

package/lib/resolver/getExecute/getCacheKey.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const helpers_1 = require("@orion-js/helpers");
-const getBaseKey = async (options, executeOptions) => {
-    const { parent, params, viewer } = executeOptions;
+const getBaseKey = async (executeOptions) => {
+    const { parent, params, viewer, options } = executeOptions;
     if (parent) {
         const getKey = options.getCacheKey;
         return await getKey(parent, params, viewer);
@@ -12,10 +12,10 @@ const getBaseKey = async (options, executeOptions) => {
         return await getKey(params, viewer);
     }
 };
-async function default_1(options, executeOptions) {
-    const { parent, params, viewer } = executeOptions;
+async function default_1(executeOptions) {
+    const { parent, params, viewer, options } = executeOptions;
     if (options.getCacheKey) {
-        const baseKey = await getBaseKey(options, executeOptions);
+        const baseKey = await getBaseKey(executeOptions);
         return options.resolverId + '_' + baseKey;
     }
     else {

package/lib/resolver/getExecute/getResult.d.ts

@@ -1,2 +1,2 @@
-import { ResolverOptions, ExecuteOptions } from '../types';
-export default function (options: ResolverOptions, executeOptions: ExecuteOptions): Promise<any>;
+import { ExecuteOptions } from '../types';
+export default function (executeOptions: ExecuteOptions): Promise<any>;

package/lib/resolver/getExecute/getResult.js

@@ -4,8 +4,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const getCacheKey_1 = __importDefault(require("./getCacheKey"));
-async function default_1(options, executeOptions) {
-    const { parent, params, viewer } = executeOptions;
+async function default_1(executeOptions) {
+    const { parent, params, viewer, options } = executeOptions;
     const executeResolver = async () => {
         const resultFunc = options.resolve;
         if (parent) {
@@ -16,7 +16,7 @@ async function default_1(options, executeOptions) {
         }
     };
     if (options.cache && options.cacheProvider) {
-        const key = await (0, getCacheKey_1.default)(options, executeOptions);
+        const key = await (0, getCacheKey_1.default)(executeOptions);
         const result = await options.cacheProvider.get(key, {
             fallback: executeResolver,
             ttl: options.cache

package/lib/resolver/getExecute/getResult.test.js

@@ -12,7 +12,7 @@ it('should execute the function', async () => {
         return num * 2;
     };
     const params = { num: 321 };
-    const result = await (0, getResult_1.default)({ resolve }, { params, viewer: {} });
+    const result = await (0, getResult_1.default)({ options: { resolve }, params, viewer: {} });
     expect(result).toBe(321 * 2);
 });
 it('should use the cache if passed', async () => {
@@ -23,19 +23,19 @@ it('should use the cache if passed', async () => {
     };
     const cache = 10;
     const resolverId = '1234';
-    const emptyCall = { params: {}, viewer: {} };
     const resolver = {
         resolve,
         cacheProvider,
         cache,
         resolverId
     };
-    const result1 = await (0, getResult_1.default)(resolver, emptyCall);
+    const emptyCall = { options: resolver, params: {}, viewer: {} };
+    const result1 = await (0, getResult_1.default)(emptyCall);
     expect(result1).toBe(2);
-    const result2 = await (0, getResult_1.default)(resolver, emptyCall);
+    const result2 = await (0, getResult_1.default)(emptyCall);
     expect(result2).toBe(2);
     await (0, helpers_1.sleep)(15);
-    const result3 = await (0, getResult_1.default)(resolver, emptyCall);
+    const result3 = await (0, getResult_1.default)(emptyCall);
     expect(result3).toBe(3);
 });
 it('should use the custom cache Provider', async () => {
@@ -52,6 +52,6 @@ it('should use the custom cache Provider', async () => {
     const cache = 10;
     const resolverId = '1234';
     const resolver = { resolve, cacheProvider: provider, cache, resolverId };
-    const result = await (0, getResult_1.default)(resolver, { params: {}, viewer: {} });
+    const result = await (0, getResult_1.default)({ options: resolver, params: {}, viewer: {} });
     expect(result).toBe('fromcache');
 });

package/lib/resolver/getExecute/getResultWithMiddlewares.d.ts

@@ -1,2 +1,2 @@
-import { ExecuteOptions, ResolverOptions } from '../types';
-export declare function getResultWithMiddlewares(options: ResolverOptions, executeOptions: ExecuteOptions): Promise<any>;
+import { ExecuteOptions } from '../types';
+export declare function getResultWithMiddlewares(executeOptions: ExecuteOptions): Promise<any>;

package/lib/resolver/getExecute/getResultWithMiddlewares.js

@@ -7,12 +7,12 @@ exports.getResultWithMiddlewares = void 0;
 const helpers_1 = require("@orion-js/helpers");
 const createResolverMiddleware_1 = require("../../createResolverMiddleware");
 const getResult_1 = __importDefault(require("./getResult"));
-async function getResultWithMiddlewares(options, executeOptions) {
+async function getResultWithMiddlewares(executeOptions) {
     const resolveMiddleware = (0, createResolverMiddleware_1.createResolverMiddleware)(async (executeOptions, next) => {
-        return await (0, getResult_1.default)(options, executeOptions);
+        return await (0, getResult_1.default)(executeOptions);
     });
     const composedMiddlewares = (0, helpers_1.composeMiddlewares)([
-        ...(options.middlewares || []),
+        ...(executeOptions.options.middlewares || []),
         resolveMiddleware
     ]);
     return await composedMiddlewares(executeOptions);

package/lib/resolver/getExecute/index.js

@@ -15,10 +15,11 @@ function getExecute(options) {
                 callParams: executeParams.params
             }),
             viewer: executeParams.viewer || {},
-            parent: executeParams.parent
+            parent: executeParams.parent,
+            options: options
         };
         await (0, checkPermissions_1.default)(executeOptions, options);
-        const result = await (0, getResultWithMiddlewares_1.getResultWithMiddlewares)(options, executeOptions);
+        const result = await (0, getResultWithMiddlewares_1.getResultWithMiddlewares)(executeOptions);
         return (0, initResult_1.default)(options, result);
     };
     return execute;

package/lib/resolver/types.d.ts

@@ -10,6 +10,7 @@ export interface ExecuteOptions {
     params: Blackbox;
     viewer: any;
     parent?: any;
+    options: ResolverOptions;
 }
 declare type Parameters<T> = T extends (...args: infer P) => any ? P : never;
 declare type ReturnType<T> = T extends (...args: any) => infer R ? R : any;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orion-js/resolvers",
-  "version": "3.6.5",
+  "version": "3.7.2",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "files": [
@@ -17,9 +17,9 @@
     "upgrade-interactive": "yarn upgrade-interactive"
   },
   "dependencies": {
-    "@orion-js/cache": "^3.6.4",
-    "@orion-js/helpers": "^3.6.4",
-    "@orion-js/schema": "^3.6.5"
+    "@orion-js/cache": "^3.7.2",
+    "@orion-js/helpers": "^3.7.2",
+    "@orion-js/schema": "^3.7.2"
   },
   "devDependencies": {
     "@shelf/jest-mongodb": "^2.1.0",
@@ -33,5 +33,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "1aa2e98c9e6cd7e82b19c335910d751ec2d2b03e"
+  "gitHead": "78fd47c75e4a7a280850e7f779b08a326bac34c6"
 }