@orion-js/resolvers 4.0.0-next.8 → 4.0.0

package/dist/index.cjs

@@ -19,10 +19,6 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/index.ts
 var index_exports = {};
 __export(index_exports, {
-  addPermissionChecker: () => addPermissionChecker,
-  checkPermissions: () => checkPermissions_default,
-  cleanParams: () => cleanParams_default,
-  cleanReturns: () => cleanReturns_default,
   createModelResolver: () => createModelResolver,
   createResolver: () => createResolver,
   createResolverMiddleware: () => createResolverMiddleware,
@@ -39,83 +35,6 @@ function createResolverMiddleware(middleware) {
   return middleware;
 }
 
-// src/resolver/permisionsCheckers.ts
-var import_helpers = require("@orion-js/helpers");
-global.checkers = [];
-var addPermissionChecker = function(func) {
-  global.checkers.push(func);
-};
-var checkPermissions = async function(options) {
-  for (const checker of global.checkers) {
-    const errorMessage = await checker(options);
-    if (errorMessage) {
-      throw new import_helpers.PermissionsError(errorMessage);
-    }
-  }
-};
-
-// src/resolver/getExecute/checkPermissions.ts
-var import_helpers2 = require("@orion-js/helpers");
-async function checkPermissions_default(executeOptions, options) {
-  const { parent, params, viewer, info } = executeOptions;
-  if (viewer.app) return;
-  await checkPermissions({
-    resolver: options,
-    parent,
-    params,
-    viewer,
-    info
-  });
-  if (options.checkPermission) {
-    const execute = async () => {
-      if (parent) {
-        const checker2 = options.checkPermission;
-        return checker2(parent, params, viewer, info);
-      }
-      const checker = options.checkPermission;
-      return checker(params, viewer, info);
-    };
-    const error = await execute();
-    if (error) {
-      throw new import_helpers2.PermissionsError(error);
-    }
-  }
-}
-
-// src/resolver/cleanParams.ts
-var import_helpers3 = require("@orion-js/helpers");
-Symbol.metadata ?? (Symbol.metadata = Symbol("Symbol.metadata"));
-function cleanParams_default(rawParams) {
-  var _a;
-  if (!rawParams) return;
-  if ((_a = rawParams[Symbol.metadata]) == null ? void 0 : _a._getModel) {
-    rawParams = rawParams[Symbol.metadata]._getModel();
-  }
-  if (rawParams.__isModel) {
-    rawParams = rawParams.getSchema();
-  }
-  const params = (0, import_helpers3.clone)(rawParams);
-  Object.keys(params).forEach((key) => {
-    if (key.startsWith("__")) {
-      delete params[key];
-    }
-  });
-  return params;
-}
-
-// src/resolver/cleanReturns.ts
-function cleanReturns_default(rawReturns) {
-  var _a;
-  if (!rawReturns) return;
-  if ((_a = rawReturns[Symbol.metadata]) == null ? void 0 : _a._getModel) {
-    return rawReturns[Symbol.metadata]._getModel();
-  }
-  if (rawReturns.getModel) {
-    return rawReturns.getModel();
-  }
-  return rawReturns;
-}
-
 // src/resolver/getArgs.ts
 function getResolverArgs(...args) {
   if (args.length === 4) {
@@ -136,72 +55,11 @@ function getResolverArgs(...args) {
   throw new Error("A resolver must be called with 2 parameters only");
 }
 
-// src/resolver/getExecute/getSchema.ts
+// src/resolver/getExecute/index.ts
 var import_schema = require("@orion-js/schema");
-var import_helpers4 = require("@orion-js/helpers");
-function getType(type) {
-  if (Array.isArray(type)) {
-    return [getType(type[0])];
-  }
-  if ((0, import_schema.isSchemaLike)(type)) {
-    return (0, import_schema.getSchemaFromAnyOrionForm)(type);
-  }
-  return type;
-}
-function getSchema(resolverParams) {
-  const schema = {};
-  for (const key of Object.keys(resolverParams)) {
-    const field = (0, import_helpers4.clone)(resolverParams[key]);
-    if (!field) continue;
-    field.type = getType(field.type);
-    schema[key] = field;
-  }
-  return schema;
-}
-
-// src/resolver/getExecute/cleanAndValidate.ts
-var import_schema2 = require("@orion-js/schema");
-async function cleanAndValidate({
-  params,
-  callParams
-}) {
-  if (!callParams) callParams = {};
-  if (params) {
-    const options = {
-      filter: false,
-      removeEmptyStrings: false
-    };
-    const schema = getSchema(params);
-    const cleaned = await (0, import_schema2.clean)(schema, callParams, options);
-    await (0, import_schema2.validate)(schema, cleaned, options);
-    return cleaned;
-  }
-  return callParams;
-}
 
 // src/resolver/getExecute/getResultWithMiddlewares.ts
-var import_helpers6 = require("@orion-js/helpers");
-
-// src/resolver/getExecute/getCacheKey.ts
-var import_helpers5 = require("@orion-js/helpers");
-var getBaseKey = async (executeOptions) => {
-  const { parent, params, viewer, info, options } = executeOptions;
-  if (parent) {
-    const getKey2 = options.getCacheKey;
-    return await getKey2(parent, params, viewer, info);
-  }
-  const getKey = options.getCacheKey;
-  return await getKey(params, viewer, info);
-};
-async function getCacheKey_default(executeOptions) {
-  const { parent, params, options } = executeOptions;
-  if (options.getCacheKey) {
-    const baseKey = await getBaseKey(executeOptions);
-    return `${options.resolverId}_${baseKey}`;
-  }
-  const key = (0, import_helpers5.hashObject)({ parent, params, resolverId: options.resolverId });
-  return key;
-}
+var import_helpers = require("@orion-js/helpers");
 
 // src/resolver/getExecute/getResult.ts
 async function getResult_default(executeOptions) {
@@ -213,14 +71,6 @@ async function getResult_default(executeOptions) {
     }
     return await resultFunc(params, viewer, info);
   };
-  if (options.cache && options.cacheProvider) {
-    const key = await getCacheKey_default(executeOptions);
-    const result = await options.cacheProvider.get(key, {
-      fallback: executeResolver,
-      ttl: options.cache
-    });
-    return result.value;
-  }
   return await executeResolver();
 }
 
@@ -229,7 +79,7 @@ async function getResultWithMiddlewares(executeOptions) {
   const resolveMiddleware = createResolverMiddleware(async (executeOptions2) => {
     return await getResult_default(executeOptions2);
   });
-  const composedMiddlewares = (0, import_helpers6.composeMiddlewares)([
+  const composedMiddlewares = (0, import_helpers.composeMiddlewares)([
     ...executeOptions.options.middlewares || [],
     resolveMiddleware
   ]);
@@ -240,33 +90,29 @@ async function getResultWithMiddlewares(executeOptions) {
 function getExecute(options) {
   const execute = async (executeParams) => {
     const executeOptions = {
-      params: await cleanAndValidate({
-        params: options.params,
-        callParams: executeParams.params
-      }),
+      params: options.params ? await (0, import_schema.cleanAndValidate)(options.params, executeParams.params ?? {}) : executeParams.params ?? {},
       viewer: executeParams.viewer || {},
       info: executeParams.info || {},
       parent: executeParams.parent,
       options
     };
-    await checkPermissions_default(executeOptions, options);
     const result = await getResultWithMiddlewares(executeOptions);
+    if (options.returns) {
+      return await (0, import_schema.clean)(options.returns, result);
+    }
     return result;
   };
   return execute;
 }
 
 // src/resolver/index.ts
-var import_helpers7 = require("@orion-js/helpers");
-var import_cache = require("@orion-js/cache");
+var import_helpers2 = require("@orion-js/helpers");
+var import_schema2 = require("@orion-js/schema");
 function dynamicCreateResolver(options) {
-  options.params = cleanParams_default(options.params);
-  options.returns = cleanReturns_default(options.returns);
-  if (!options.cacheProvider) {
-    options.cacheProvider = import_cache.defaultCache;
-  }
+  options.params = (0, import_schema2.getSchemaFromAnyOrionForm)(options.params);
+  options.returns = (0, import_schema2.getSchemaFromAnyOrionForm)(options.returns);
   if (!options.resolverId) {
-    options.resolverId = (0, import_helpers7.generateId)();
+    options.resolverId = (0, import_helpers2.generateId)();
   }
   if (!options.middlewares) {
     options.middlewares = [];
@@ -310,10 +156,6 @@ function internal_appendResolversToItem(item, resolvers) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  addPermissionChecker,
-  checkPermissions,
-  cleanParams,
-  cleanReturns,
   createModelResolver,
   createResolver,
   createResolverMiddleware,

package/dist/index.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts","../src/createResolverMiddleware.ts","../src/resolver/permisionsCheckers.ts","../src/resolver/getExecute/checkPermissions.ts","../src/resolver/cleanParams.ts","../src/resolver/cleanReturns.ts","../src/resolver/getArgs.ts","../src/resolver/getExecute/getSchema.ts","../src/resolver/getExecute/cleanAndValidate.ts","../src/resolver/getExecute/getResultWithMiddlewares.ts","../src/resolver/getExecute/getCacheKey.ts","../src/resolver/getExecute/getResult.ts","../src/resolver/getExecute/index.ts","../src/resolver/index.ts","../src/schemaWithResolvers/index.ts"],"sourcesContent":["export * from './resolver/types'\nexport * from './createResolverMiddleware'\nimport checkPermissions from './resolver/getExecute/checkPermissions'\nimport {addPermissionChecker} from './resolver/permisionsCheckers'\nimport cleanParams from './resolver/cleanParams'\nimport cleanReturns from './resolver/cleanReturns'\nexport * from './resolver/getArgs'\nexport * from './resolver'\n\nexport {checkPermissions, addPermissionChecker, cleanParams, cleanReturns}\n\nexport * from './schemaWithResolvers'\n","import {ResolverMiddleware} from './resolver/types'\n\nexport function createResolverMiddleware(middleware: ResolverMiddleware) {\n  return middleware\n}\n","import {PermissionsError} from '@orion-js/helpers'\nimport {PermissionChecker, PermissionCheckerOptions} from './types'\n\ndeclare const global: {\n  checkers: PermissionChecker[]\n}\n\nglobal.checkers = []\n\nexport const addPermissionChecker = function (func: PermissionChecker) {\n  global.checkers.push(func)\n}\n\nexport const checkPermissions = async function (options: PermissionCheckerOptions) {\n  for (const checker of global.checkers) {\n    const errorMessage = await checker(options)\n    if (errorMessage) {\n      throw new PermissionsError(errorMessage)\n    }\n  }\n}\n","import {checkPermissions} from '../permisionsCheckers'\nimport {PermissionsError} from '@orion-js/helpers'\nimport {\n  ExecuteOptions,\n  GlobalCheckPermissions,\n  ModelCheckPermissions,\n  ResolverOptions,\n} from '../types'\n\nexport default async function (executeOptions: ExecuteOptions, options: ResolverOptions) {\n  const {parent, params, viewer, info} = executeOptions\n\n  if (viewer.app) return\n\n  await checkPermissions({\n    resolver: options,\n    parent,\n    params,\n    viewer,\n    info,\n  })\n\n  if (options.checkPermission) {\n    const execute = async () => {\n      if (parent) {\n        const checker = options.checkPermission as ModelCheckPermissions\n        return checker(parent, params, viewer, info)\n      }\n      const checker = options.checkPermission as GlobalCheckPermissions\n      return checker(params, viewer, info)\n    }\n\n    const error = await execute()\n    if (error) {\n      throw new PermissionsError(error)\n    }\n  }\n}\n","import {clone} from '@orion-js/helpers'\n\n// @ts-ignore polyfill for Symbol.metadata // https://www.typescriptlang.org/docs/handbook/release-notes/typescript-5-2.html#decorator-metadata\nSymbol.metadata ??= Symbol('Symbol.metadata')\n\nexport default function (rawParams: any) {\n  if (!rawParams) return\n\n  // for typed model\n  if (rawParams[Symbol.metadata]?._getModel) {\n    rawParams = rawParams[Symbol.metadata]._getModel()\n  }\n\n  if (rawParams.__isModel) {\n    rawParams = rawParams.getSchema()\n  }\n\n  const params = clone(rawParams)\n  Object.keys(params).forEach(key => {\n    if (key.startsWith('__')) {\n      delete params[key]\n    }\n  })\n\n  return params\n}\n","export default function (rawReturns: any) {\n  if (!rawReturns) return\n\n  // for typed model\n  if (rawReturns[Symbol.metadata]?._getModel) {\n    return rawReturns[Symbol.metadata]._getModel()\n  }\n\n  // for typed model\n  if (rawReturns.getModel) {\n    return rawReturns.getModel()\n  }\n\n  return rawReturns\n}\n","export function getResolverArgs(...args: any[]) {\n  if (args.length === 4) {\n    return {\n      parent: args[0],\n      params: args[1] || {},\n      viewer: args[2] || {},\n      info: args[3] || {},\n    }\n  }\n  if (args.length < 4) {\n    return {\n      params: args[0] || {},\n      viewer: args[1] || {},\n      info: args[2] || {},\n    }\n  }\n  throw new Error('A resolver must be called with 2 parameters only')\n}\n","import {getSchemaFromAnyOrionForm, isSchemaLike, Schema} from '@orion-js/schema'\nimport {clone} from '@orion-js/helpers'\n\nfunction getType(type: any) {\n  if (Array.isArray(type)) {\n    return [getType(type[0])]\n  }\n\n  if (isSchemaLike(type)) {\n    return getSchemaFromAnyOrionForm(type)\n  }\n\n  return type\n}\n\nexport default function getSchema(resolverParams: any) {\n  const schema: Schema = {}\n\n  for (const key of Object.keys(resolverParams)) {\n    const field = clone(resolverParams[key])\n    if (!field) continue\n\n    field.type = getType(field.type)\n\n    schema[key] = field\n  }\n\n  return schema\n}\n","import getSchema from './getSchema'\nimport {validate, clean} from '@orion-js/schema'\n\nexport default async function cleanAndValidate({\n  params,\n  callParams,\n}: {params: any; callParams: any}) {\n  if (!callParams) callParams = {}\n\n  if (params) {\n    const options = {\n      filter: false,\n      removeEmptyStrings: false,\n    }\n    const schema = getSchema(params)\n    const cleaned = await clean(schema, callParams, options)\n    await validate(schema, cleaned, options)\n    return cleaned\n  }\n\n  return callParams\n}\n","import {composeMiddlewares} from '@orion-js/helpers'\nimport {createResolverMiddleware} from '../../createResolverMiddleware'\nimport {ExecuteOptions} from '../types'\nimport getResult from './getResult'\n\nexport async function getResultWithMiddlewares(executeOptions: ExecuteOptions) {\n  const resolveMiddleware = createResolverMiddleware(async executeOptions => {\n    return await getResult(executeOptions)\n  })\n\n  const composedMiddlewares = composeMiddlewares([\n    ...(executeOptions.options.middlewares || []),\n    resolveMiddleware,\n  ])\n\n  return await composedMiddlewares(executeOptions)\n}\n","import {hashObject} from '@orion-js/helpers'\nimport {ExecuteOptions, ModelGetCacheKey, GlobalGetCacheKey} from '../types'\n\nconst getBaseKey = async (executeOptions: ExecuteOptions) => {\n  const {parent, params, viewer, info, options} = executeOptions\n  if (parent) {\n    const getKey = options.getCacheKey as ModelGetCacheKey\n    return await getKey(parent, params, viewer, info)\n  }\n  const getKey = options.getCacheKey as GlobalGetCacheKey\n  return await getKey(params, viewer, info)\n}\n\nexport default async function (executeOptions: ExecuteOptions): Promise<string> {\n  const {parent, params, options} = executeOptions\n  if (options.getCacheKey) {\n    const baseKey = await getBaseKey(executeOptions)\n    return `${options.resolverId}_${baseKey}`\n  }\n  const key = hashObject({parent, params, resolverId: options.resolverId})\n  return key\n}\n","import getCacheKey from './getCacheKey'\nimport {ExecuteOptions} from '../types'\n\nexport default async function (executeOptions: ExecuteOptions) {\n  const {parent, params, viewer, info, options} = executeOptions\n  const executeResolver = async (): Promise<any> => {\n    const resultFunc = options.resolve as (...args: any) => any\n    if (parent) {\n      return await resultFunc(parent, params, viewer, info)\n    }\n    return await resultFunc(params, viewer, info)\n  }\n\n  if (options.cache && options.cacheProvider) {\n    const key = await getCacheKey(executeOptions)\n    const result = await options.cacheProvider.get(key, {\n      fallback: executeResolver,\n      ttl: options.cache,\n    })\n    return result.value\n  }\n  return await executeResolver()\n}\n","import checkPermissions from './checkPermissions'\nimport cleanAndValidate from './cleanAndValidate'\nimport {ResolverOptions, Execute, ExecuteOptions} from '../types'\nimport {getResultWithMiddlewares} from './getResultWithMiddlewares'\n\nexport default function getExecute(options: ResolverOptions) {\n  const execute: Execute = async executeParams => {\n    const executeOptions: ExecuteOptions = {\n      params: await cleanAndValidate({\n        params: options.params,\n        callParams: executeParams.params,\n      }),\n      viewer: executeParams.viewer || {},\n      info: executeParams.info || {},\n      parent: executeParams.parent,\n      options: options,\n    }\n\n    await checkPermissions(executeOptions, options)\n\n    const result = await getResultWithMiddlewares(executeOptions)\n\n    return result\n  }\n\n  return execute\n}\n","import getExecute from './getExecute'\nimport cleanParams from './cleanParams'\nimport {generateId} from '@orion-js/helpers'\nimport {\n  GlobalResolverOptions,\n  GlobalResolverResolve,\n  ModelResolver,\n  ModelResolverOptions,\n  ModelResolverResolve,\n  Resolver,\n} from './types'\nimport {defaultCache} from '@orion-js/cache'\nimport cleanReturns from './cleanReturns'\nimport {getResolverArgs} from './getArgs'\nimport {SchemaFieldType} from '@orion-js/schema'\n\nfunction dynamicCreateResolver(options: any) {\n  options.params = cleanParams(options.params)\n  options.returns = cleanReturns(options.returns)\n\n  if (!options.cacheProvider) {\n    options.cacheProvider = defaultCache\n  }\n\n  if (!options.resolverId) {\n    options.resolverId = generateId()\n  }\n\n  if (!options.middlewares) {\n    options.middlewares = []\n  }\n\n  const execute = getExecute(options)\n\n  const resolve = async (...args: any[]) => {\n    const params: any = getResolverArgs(...args)\n    return await execute(params)\n  }\n\n  const resolver = {\n    ...options,\n    resolve,\n    execute,\n  }\n\n  return resolver\n}\n\nconst createResolver = <\n  TParams extends SchemaFieldType = SchemaFieldType,\n  TReturns extends SchemaFieldType = SchemaFieldType,\n  TViewer = any,\n  TInfo = any,\n>(\n  options: GlobalResolverOptions<TParams, TReturns, TViewer, TInfo>,\n): Resolver<GlobalResolverResolve<TParams, TReturns, TViewer, TInfo>> => {\n  return dynamicCreateResolver(options)\n}\n\nconst createModelResolver = <\n  TItem = any,\n  TParams extends SchemaFieldType = SchemaFieldType,\n  TReturns extends SchemaFieldType = SchemaFieldType,\n  TViewer = any,\n  TInfo = any,\n>(\n  options: ModelResolverOptions<TItem, TParams, TReturns, TViewer, TInfo>,\n): ModelResolver<ModelResolverResolve<TItem, TParams, TReturns, TViewer, TInfo>> => {\n  return dynamicCreateResolver(options)\n}\n\n/**\n * @deprecated Use createResolver and createModelResolver instead\n */\nconst resolver = createResolver\n\n/**\n * @deprecated Use createResolver and createModelResolver instead\n */\nconst modelResolver = createModelResolver\n\nexport {createResolver, createModelResolver, resolver, modelResolver}\n","import {Schema} from '@orion-js/schema'\nimport {ModelResolver, ModelResolverResolve} from '../resolver/types'\n\nexport interface SchemaWithResolversResolversMap<TSchema> {\n  [key: string]: ModelResolver<ModelResolverResolve<TSchema>>\n}\n\nexport interface SchemaWithResolversOptions<\n  TModelName extends string,\n  TSchema extends Schema,\n  TTypeResolvers extends SchemaWithResolversResolversMap<TSchema>,\n> {\n  name: TModelName\n  schema: TSchema\n  resolvers?: TTypeResolvers\n}\n\nexport function internal_schemaWithResolvers<\n  TModelName extends string,\n  TSchema extends Schema,\n  TTypeResolvers extends SchemaWithResolversResolversMap<TSchema>,\n>(options: SchemaWithResolversOptions<TModelName, TSchema, TTypeResolvers>) {\n  const {name, schema, resolvers} = options\n  return {\n    __modelName: name,\n    __resolvers: resolvers,\n    ...schema,\n  }\n}\n\n/**\n * This method is used to give backwards compatibility to models.initItem\n */\nexport function internal_appendResolversToItem<\n  TItem,\n  TSchema extends Schema,\n  TTypeResolvers extends SchemaWithResolversResolversMap<TSchema>,\n>(item: TItem, resolvers: TTypeResolvers) {\n  const newItem = {...item} as any\n\n  for (const resolverName in resolvers) {\n    newItem[resolverName] = (...args: any[]) => resolvers[resolverName].resolve(newItem, ...args)\n  }\n\n  return newItem as TItem & {\n    [key in keyof TTypeResolvers]: RemoveFirstArg<TTypeResolvers[key]>\n  }\n}\n\ntype RemoveFirstArg<T> = T extends (x: any, ...args: infer P) => infer R ? (...args: P) => R : never\n"],"mappings":"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","names":["import_helpers","checker","import_helpers","import_helpers","import_schema","import_helpers","import_helpers","getKey","executeOptions","import_helpers","resolver"]}
+{"version":3,"sources":["../src/index.ts","../src/createResolverMiddleware.ts","../src/resolver/getArgs.ts","../src/resolver/getExecute/index.ts","../src/resolver/getExecute/getResultWithMiddlewares.ts","../src/resolver/getExecute/getResult.ts","../src/resolver/index.ts","../src/schemaWithResolvers/index.ts"],"sourcesContent":["export * from './resolver/types'\nexport * from './createResolverMiddleware'\nexport * from './resolver/getArgs'\nexport * from './resolver'\nexport * from './schemaWithResolvers'\n","import {ResolverMiddleware} from './resolver/types'\n\nexport function createResolverMiddleware(middleware: ResolverMiddleware) {\n  return middleware\n}\n","export function getResolverArgs(...args: any[]) {\n  if (args.length === 4) {\n    return {\n      parent: args[0],\n      params: args[1] || {},\n      viewer: args[2] || {},\n      info: args[3] || {},\n    }\n  }\n  if (args.length < 4) {\n    return {\n      params: args[0] || {},\n      viewer: args[1] || {},\n      info: args[2] || {},\n    }\n  }\n  throw new Error('A resolver must be called with 2 parameters only')\n}\n","import {clean, cleanAndValidate} from '@orion-js/schema'\nimport {ResolverOptions, Execute, ExecuteOptions} from '../types'\nimport {getResultWithMiddlewares} from './getResultWithMiddlewares'\n\nexport default function getExecute(options: ResolverOptions) {\n  const execute: Execute = async executeParams => {\n    const executeOptions: ExecuteOptions = {\n      params: options.params\n        ? await cleanAndValidate(options.params, executeParams.params ?? {})\n        : (executeParams.params ?? {}),\n      viewer: executeParams.viewer || {},\n      info: executeParams.info || {},\n      parent: executeParams.parent,\n      options: options,\n    }\n\n    const result = await getResultWithMiddlewares(executeOptions)\n\n    if (options.returns) {\n      return await clean(options.returns, result)\n    }\n\n    return result\n  }\n\n  return execute\n}\n","import {composeMiddlewares} from '@orion-js/helpers'\nimport {createResolverMiddleware} from '../../createResolverMiddleware'\nimport {ExecuteOptions} from '../types'\nimport getResult from './getResult'\n\nexport async function getResultWithMiddlewares(executeOptions: ExecuteOptions) {\n  const resolveMiddleware = createResolverMiddleware(async executeOptions => {\n    return await getResult(executeOptions)\n  })\n\n  const composedMiddlewares = composeMiddlewares([\n    ...(executeOptions.options.middlewares || []),\n    resolveMiddleware,\n  ])\n\n  return await composedMiddlewares(executeOptions)\n}\n","import {ExecuteOptions} from '../types'\n\nexport default async function (executeOptions: ExecuteOptions) {\n  const {parent, params, viewer, info, options} = executeOptions\n  const executeResolver = async (): Promise<any> => {\n    const resultFunc = options.resolve as (...args: any) => any\n    if (parent) {\n      return await resultFunc(parent, params, viewer, info)\n    }\n    return await resultFunc(params, viewer, info)\n  }\n\n  return await executeResolver()\n}\n","import getExecute from './getExecute'\nimport {generateId} from '@orion-js/helpers'\nimport {GlobalResolverOptions, ModelResolver, ModelResolverOptions, GlobalResolver} from './types'\nimport {getResolverArgs} from './getArgs'\nimport {getSchemaFromAnyOrionForm, SchemaFieldType} from '@orion-js/schema'\n\nfunction dynamicCreateResolver(options: any) {\n  options.params = getSchemaFromAnyOrionForm(options.params)\n  options.returns = getSchemaFromAnyOrionForm(options.returns)\n\n  if (!options.resolverId) {\n    options.resolverId = generateId()\n  }\n\n  if (!options.middlewares) {\n    options.middlewares = []\n  }\n\n  const execute = getExecute(options)\n\n  const resolve = async (...args: any[]) => {\n    const params: any = getResolverArgs(...args)\n    return await execute(params)\n  }\n\n  const resolver = {\n    ...options,\n    resolve,\n    execute,\n  }\n\n  return resolver\n}\n\nconst createResolver = <\n  TParams extends SchemaFieldType = any,\n  TReturns extends SchemaFieldType = any,\n  TViewer = any,\n  TInfo = any,\n>(\n  options: GlobalResolverOptions<TParams, TReturns, TViewer, TInfo>,\n): GlobalResolver<TParams, TReturns, TViewer, TInfo> => {\n  return dynamicCreateResolver(options)\n}\n\nconst createModelResolver = <\n  TItem = any,\n  TParams extends SchemaFieldType = any,\n  TReturns extends SchemaFieldType = any,\n  TViewer = any,\n  TInfo = any,\n>(\n  options: ModelResolverOptions<TItem, TParams, TReturns, TViewer, TInfo>,\n): ModelResolver<TItem, TParams, TReturns, TViewer, TInfo> => {\n  return dynamicCreateResolver(options)\n}\n\n/**\n * @deprecated Use createResolver and createModelResolver instead\n */\nconst resolver = createResolver\n\n/**\n * @deprecated Use createResolver and createModelResolver instead\n */\nconst modelResolver = createModelResolver\n\nexport {createResolver, createModelResolver, resolver, modelResolver}\n","import {Schema} from '@orion-js/schema'\nimport {ModelResolver, ModelResolverResolve} from '../resolver/types'\n\nexport interface SchemaWithResolversResolversMap<TSchema> {\n  [key: string]: ModelResolver<ModelResolverResolve<TSchema>>\n}\n\nexport interface SchemaWithResolversOptions<\n  TModelName extends string,\n  TSchema extends Schema,\n  TTypeResolvers extends SchemaWithResolversResolversMap<TSchema>,\n> {\n  name: TModelName\n  schema: TSchema\n  resolvers?: TTypeResolvers\n}\n\nexport function internal_schemaWithResolvers<\n  TModelName extends string,\n  TSchema extends Schema,\n  TTypeResolvers extends SchemaWithResolversResolversMap<TSchema>,\n>(options: SchemaWithResolversOptions<TModelName, TSchema, TTypeResolvers>) {\n  const {name, schema, resolvers} = options\n  return {\n    __modelName: name,\n    __resolvers: resolvers,\n    ...schema,\n  }\n}\n\n/**\n * This method is used to give backwards compatibility to models.initItem\n */\nexport function internal_appendResolversToItem<\n  TItem,\n  TSchema extends Schema,\n  TTypeResolvers extends SchemaWithResolversResolversMap<TSchema>,\n>(item: TItem, resolvers: TTypeResolvers) {\n  const newItem = {...item} as any\n\n  for (const resolverName in resolvers) {\n    newItem[resolverName] = (...args: any[]) => resolvers[resolverName].resolve(newItem, ...args)\n  }\n\n  return newItem as TItem & {\n    [key in keyof TTypeResolvers]: RemoveFirstArg<TTypeResolvers[key]>\n  }\n}\n\ntype RemoveFirstArg<T> = T extends (x: any, ...args: infer P) => infer R ? (...args: P) => R : never\n"],"mappings":"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","names":["executeOptions","import_helpers","import_schema","resolver"]}

package/dist/index.d.cts

@@ -1,8 +1,7 @@
-import { OrionCache } from '@orion-js/cache';
-import { Blackbox, InferSchemaType, SchemaFieldType, Schema } from '@orion-js/schema';
+import { InferSchemaType, SchemaFieldType, Blackbox, Schema } from '@orion-js/schema';
 
 type GlobalResolverResolve<TParams = any, TReturns = any, TViewer = any, TInfo = any> = (params?: InferSchemaType<TParams>, viewer?: TViewer, info?: TInfo) => Promise<InferSchemaType<TReturns>>;
-type ModelResolverResolve<TItem = any, TParams = any, TReturns = any, TViewer = any, TInfo = any> = (item?: TItem, params?: InferSchemaType<TParams>, viewer?: TViewer, info?: TInfo) => Promise<InferSchemaType<TReturns>>;
+type ModelResolverResolve<TItem = any, TParams extends SchemaFieldType = any, TReturns extends SchemaFieldType = any, TViewer = any, TInfo = any> = (item?: TItem, params?: InferSchemaType<TParams>, viewer?: TViewer, info?: TInfo) => Promise<InferSchemaType<TReturns>>;
 type GlobalCheckPermissions = (params: any, viewer: any, info?: any) => Promise<string>;
 type ModelCheckPermissions = (parent: any, params: any, viewer: any, info?: any) => Promise<string>;
 type GlobalGetCacheKey = (params: any, viewer: any, info: any) => Promise<any>;
@@ -24,33 +23,31 @@ interface ExecuteParams<Resolve = Function, IsModel = undefined> {
     info?: any;
 }
 type Execute<Resolve = Function, IsModel = undefined> = (executeOptions: ExecuteParams<Resolve, IsModel>) => ReturnType<Resolve>;
-interface SharedResolverOptions<TParams = any, TReturns = any> {
+interface SharedResolverOptions<TParams extends SchemaFieldType = any, TReturns extends SchemaFieldType = any> {
     resolverId?: string;
     params?: TParams;
     returns?: TReturns;
     mutation?: boolean;
     private?: boolean;
-    checkPermission?: GlobalCheckPermissions | ModelCheckPermissions;
-    getCacheKey?: GlobalGetCacheKey | ModelGetCacheKey;
-    cache?: number;
-    cacheProvider?: OrionCache;
-    permissionsOptions?: any;
     middlewares?: ResolverMiddleware[];
 }
-type GlobalResolverOptions<TParams = any, TReturns = any, TViewer = any, TInfo = any> = SharedResolverOptions<TParams, TReturns> & {
+type GlobalResolverOptions<TParams extends SchemaFieldType = any, TReturns extends SchemaFieldType = any, TViewer = any, TInfo = any> = SharedResolverOptions<TParams, TReturns> & {
     resolve: GlobalResolverResolve<TParams, TReturns, TViewer, TInfo>;
 };
-type ModelResolverOptions<TItem = any, TParams = any, TReturns = any, TViewer = any, TInfo = any> = SharedResolverOptions<TParams, TReturns> & {
+type ModelResolverOptions<TItem = any, TParams extends SchemaFieldType = any, TReturns extends SchemaFieldType = any, TViewer = any, TInfo = any> = SharedResolverOptions<TParams, TReturns> & {
     resolve: ModelResolverResolve<TItem, TParams, TReturns, TViewer, TInfo>;
 };
-type ResolverOptions<TParams = any, TReturns = any, TViewer = any, TInfo = any, TItem = any> = GlobalResolverOptions<TParams, TReturns, TViewer, TInfo> | ModelResolverOptions<TItem, TParams, TReturns, TViewer, TInfo>;
+type ResolverOptions<TParams extends SchemaFieldType = any, TReturns extends SchemaFieldType = any, TViewer = any, TInfo = any, TItem = any> = GlobalResolverOptions<TParams, TReturns, TViewer, TInfo> | ModelResolverOptions<TItem, TParams, TReturns, TViewer, TInfo>;
 type OmitFirstArg<F> = F extends (x: any, ...args: infer P) => infer R ? (...args: P) => R : never;
-interface Resolver<Resolve = Function, IsModel = undefined> extends SharedResolverOptions {
-    execute: Execute<Resolve, IsModel>;
-    resolve: Resolve;
-    modelResolve: IsModel extends undefined ? undefined : OmitFirstArg<Resolve>;
-}
-type ModelResolver<Resolve = Function> = Resolver<Resolve, true>;
+type GlobalResolver<TParams extends SchemaFieldType = any, TReturns extends SchemaFieldType = any, TViewer = any, TInfo = any> = SharedResolverOptions & {
+    execute: Execute<GlobalResolverResolve<TParams, TReturns, TViewer, TInfo>, false>;
+    resolve: GlobalResolverResolve<TParams, TReturns, TViewer, TInfo>;
+};
+type ModelResolver<TItem = any, TParams extends SchemaFieldType = any, TReturns extends SchemaFieldType = any, TViewer = any, TInfo = any> = SharedResolverOptions & {
+    execute: Execute<ModelResolverResolve<TItem, TParams, TReturns, TViewer, TInfo>, true>;
+    resolve: ModelResolverResolve<TItem, TParams, TReturns, TViewer, TInfo>;
+    modelResolve: OmitFirstArg<ModelResolverResolve<TItem, TParams, TReturns, TViewer, TInfo>>;
+};
 interface PermissionCheckerOptions {
     resolver: GlobalResolverOptions | ModelResolverOptions;
     parent: any;
@@ -63,14 +60,6 @@ type ResolverMiddleware = (executeOptions: ExecuteOptions, next: () => Promise<a
 
 declare function createResolverMiddleware(middleware: ResolverMiddleware): ResolverMiddleware;
 
-declare function export_default$2(executeOptions: ExecuteOptions, options: ResolverOptions): Promise<void>;
-
-declare const addPermissionChecker: (func: PermissionChecker) => void;
-
-declare function export_default$1(rawParams: any): any;
-
-declare function export_default(rawReturns: any): any;
-
 declare function getResolverArgs(...args: any[]): {
     parent: any;
     params: any;
@@ -83,16 +72,16 @@ declare function getResolverArgs(...args: any[]): {
     parent?: undefined;
 };
 
-declare const createResolver: <TParams extends SchemaFieldType = SchemaFieldType, TReturns extends SchemaFieldType = SchemaFieldType, TViewer = any, TInfo = any>(options: GlobalResolverOptions<TParams, TReturns, TViewer, TInfo>) => Resolver<GlobalResolverResolve<TParams, TReturns, TViewer, TInfo>>;
-declare const createModelResolver: <TItem = any, TParams extends SchemaFieldType = SchemaFieldType, TReturns extends SchemaFieldType = SchemaFieldType, TViewer = any, TInfo = any>(options: ModelResolverOptions<TItem, TParams, TReturns, TViewer, TInfo>) => ModelResolver<ModelResolverResolve<TItem, TParams, TReturns, TViewer, TInfo>>;
+declare const createResolver: <TParams extends SchemaFieldType = any, TReturns extends SchemaFieldType = any, TViewer = any, TInfo = any>(options: GlobalResolverOptions<TParams, TReturns, TViewer, TInfo>) => GlobalResolver<TParams, TReturns, TViewer, TInfo>;
+declare const createModelResolver: <TItem = any, TParams extends SchemaFieldType = any, TReturns extends SchemaFieldType = any, TViewer = any, TInfo = any>(options: ModelResolverOptions<TItem, TParams, TReturns, TViewer, TInfo>) => ModelResolver<TItem, TParams, TReturns, TViewer, TInfo>;
 /**
  * @deprecated Use createResolver and createModelResolver instead
  */
-declare const resolver: <TParams extends SchemaFieldType = SchemaFieldType, TReturns extends SchemaFieldType = SchemaFieldType, TViewer = any, TInfo = any>(options: GlobalResolverOptions<TParams, TReturns, TViewer, TInfo>) => Resolver<GlobalResolverResolve<TParams, TReturns, TViewer, TInfo>>;
+declare const resolver: <TParams extends SchemaFieldType = any, TReturns extends SchemaFieldType = any, TViewer = any, TInfo = any>(options: GlobalResolverOptions<TParams, TReturns, TViewer, TInfo>) => GlobalResolver<TParams, TReturns, TViewer, TInfo>;
 /**
  * @deprecated Use createResolver and createModelResolver instead
  */
-declare const modelResolver: <TItem = any, TParams extends SchemaFieldType = SchemaFieldType, TReturns extends SchemaFieldType = SchemaFieldType, TViewer = any, TInfo = any>(options: ModelResolverOptions<TItem, TParams, TReturns, TViewer, TInfo>) => ModelResolver<ModelResolverResolve<TItem, TParams, TReturns, TViewer, TInfo>>;
+declare const modelResolver: <TItem = any, TParams extends SchemaFieldType = any, TReturns extends SchemaFieldType = any, TViewer = any, TInfo = any>(options: ModelResolverOptions<TItem, TParams, TReturns, TViewer, TInfo>) => ModelResolver<TItem, TParams, TReturns, TViewer, TInfo>;
 
 interface SchemaWithResolversResolversMap<TSchema> {
     [key: string]: ModelResolver<ModelResolverResolve<TSchema>>;
@@ -112,4 +101,4 @@ declare function internal_schemaWithResolvers<TModelName extends string, TSchema
 declare function internal_appendResolversToItem<TItem, TSchema extends Schema, TTypeResolvers extends SchemaWithResolversResolversMap<TSchema>>(item: TItem, resolvers: TTypeResolvers): TItem & { [key in keyof TTypeResolvers]: RemoveFirstArg<TTypeResolvers[key]>; };
 type RemoveFirstArg<T> = T extends (x: any, ...args: infer P) => infer R ? (...args: P) => R : never;
 
-export { type Execute, type ExecuteOptions, type ExecuteParams, type GlobalCheckPermissions, type GlobalGetCacheKey, type GlobalResolverOptions, type GlobalResolverResolve, type ModelCheckPermissions, type ModelGetCacheKey, type ModelResolver, type ModelResolverOptions, type ModelResolverResolve, type PermissionChecker, type PermissionCheckerOptions, type Resolver, type ResolverMiddleware, type ResolverOptions, type SchemaWithResolversOptions, type SchemaWithResolversResolversMap, type SharedResolverOptions, addPermissionChecker, export_default$2 as checkPermissions, export_default$1 as cleanParams, export_default as cleanReturns, createModelResolver, createResolver, createResolverMiddleware, getResolverArgs, internal_appendResolversToItem, internal_schemaWithResolvers, modelResolver, resolver };
+export { type Execute, type ExecuteOptions, type ExecuteParams, type GlobalCheckPermissions, type GlobalGetCacheKey, type GlobalResolver, type GlobalResolverOptions, type GlobalResolverResolve, type ModelCheckPermissions, type ModelGetCacheKey, type ModelResolver, type ModelResolverOptions, type ModelResolverResolve, type PermissionChecker, type PermissionCheckerOptions, type ResolverMiddleware, type ResolverOptions, type SchemaWithResolversOptions, type SchemaWithResolversResolversMap, type SharedResolverOptions, createModelResolver, createResolver, createResolverMiddleware, getResolverArgs, internal_appendResolversToItem, internal_schemaWithResolvers, modelResolver, resolver };

package/dist/index.d.ts

@@ -1,8 +1,7 @@
-import { OrionCache } from '@orion-js/cache';
-import { Blackbox, InferSchemaType, SchemaFieldType, Schema } from '@orion-js/schema';
+import { InferSchemaType, SchemaFieldType, Blackbox, Schema } from '@orion-js/schema';
 
 type GlobalResolverResolve<TParams = any, TReturns = any, TViewer = any, TInfo = any> = (params?: InferSchemaType<TParams>, viewer?: TViewer, info?: TInfo) => Promise<InferSchemaType<TReturns>>;
-type ModelResolverResolve<TItem = any, TParams = any, TReturns = any, TViewer = any, TInfo = any> = (item?: TItem, params?: InferSchemaType<TParams>, viewer?: TViewer, info?: TInfo) => Promise<InferSchemaType<TReturns>>;
+type ModelResolverResolve<TItem = any, TParams extends SchemaFieldType = any, TReturns extends SchemaFieldType = any, TViewer = any, TInfo = any> = (item?: TItem, params?: InferSchemaType<TParams>, viewer?: TViewer, info?: TInfo) => Promise<InferSchemaType<TReturns>>;
 type GlobalCheckPermissions = (params: any, viewer: any, info?: any) => Promise<string>;
 type ModelCheckPermissions = (parent: any, params: any, viewer: any, info?: any) => Promise<string>;
 type GlobalGetCacheKey = (params: any, viewer: any, info: any) => Promise<any>;
@@ -24,33 +23,31 @@ interface ExecuteParams<Resolve = Function, IsModel = undefined> {
     info?: any;
 }
 type Execute<Resolve = Function, IsModel = undefined> = (executeOptions: ExecuteParams<Resolve, IsModel>) => ReturnType<Resolve>;
-interface SharedResolverOptions<TParams = any, TReturns = any> {
+interface SharedResolverOptions<TParams extends SchemaFieldType = any, TReturns extends SchemaFieldType = any> {
     resolverId?: string;
     params?: TParams;
     returns?: TReturns;
     mutation?: boolean;
     private?: boolean;
-    checkPermission?: GlobalCheckPermissions | ModelCheckPermissions;
-    getCacheKey?: GlobalGetCacheKey | ModelGetCacheKey;
-    cache?: number;
-    cacheProvider?: OrionCache;
-    permissionsOptions?: any;
     middlewares?: ResolverMiddleware[];
 }
-type GlobalResolverOptions<TParams = any, TReturns = any, TViewer = any, TInfo = any> = SharedResolverOptions<TParams, TReturns> & {
+type GlobalResolverOptions<TParams extends SchemaFieldType = any, TReturns extends SchemaFieldType = any, TViewer = any, TInfo = any> = SharedResolverOptions<TParams, TReturns> & {
     resolve: GlobalResolverResolve<TParams, TReturns, TViewer, TInfo>;
 };
-type ModelResolverOptions<TItem = any, TParams = any, TReturns = any, TViewer = any, TInfo = any> = SharedResolverOptions<TParams, TReturns> & {
+type ModelResolverOptions<TItem = any, TParams extends SchemaFieldType = any, TReturns extends SchemaFieldType = any, TViewer = any, TInfo = any> = SharedResolverOptions<TParams, TReturns> & {
     resolve: ModelResolverResolve<TItem, TParams, TReturns, TViewer, TInfo>;
 };
-type ResolverOptions<TParams = any, TReturns = any, TViewer = any, TInfo = any, TItem = any> = GlobalResolverOptions<TParams, TReturns, TViewer, TInfo> | ModelResolverOptions<TItem, TParams, TReturns, TViewer, TInfo>;
+type ResolverOptions<TParams extends SchemaFieldType = any, TReturns extends SchemaFieldType = any, TViewer = any, TInfo = any, TItem = any> = GlobalResolverOptions<TParams, TReturns, TViewer, TInfo> | ModelResolverOptions<TItem, TParams, TReturns, TViewer, TInfo>;
 type OmitFirstArg<F> = F extends (x: any, ...args: infer P) => infer R ? (...args: P) => R : never;
-interface Resolver<Resolve = Function, IsModel = undefined> extends SharedResolverOptions {
-    execute: Execute<Resolve, IsModel>;
-    resolve: Resolve;
-    modelResolve: IsModel extends undefined ? undefined : OmitFirstArg<Resolve>;
-}
-type ModelResolver<Resolve = Function> = Resolver<Resolve, true>;
+type GlobalResolver<TParams extends SchemaFieldType = any, TReturns extends SchemaFieldType = any, TViewer = any, TInfo = any> = SharedResolverOptions & {
+    execute: Execute<GlobalResolverResolve<TParams, TReturns, TViewer, TInfo>, false>;
+    resolve: GlobalResolverResolve<TParams, TReturns, TViewer, TInfo>;
+};
+type ModelResolver<TItem = any, TParams extends SchemaFieldType = any, TReturns extends SchemaFieldType = any, TViewer = any, TInfo = any> = SharedResolverOptions & {
+    execute: Execute<ModelResolverResolve<TItem, TParams, TReturns, TViewer, TInfo>, true>;
+    resolve: ModelResolverResolve<TItem, TParams, TReturns, TViewer, TInfo>;
+    modelResolve: OmitFirstArg<ModelResolverResolve<TItem, TParams, TReturns, TViewer, TInfo>>;
+};
 interface PermissionCheckerOptions {
     resolver: GlobalResolverOptions | ModelResolverOptions;
     parent: any;
@@ -63,14 +60,6 @@ type ResolverMiddleware = (executeOptions: ExecuteOptions, next: () => Promise<a
 
 declare function createResolverMiddleware(middleware: ResolverMiddleware): ResolverMiddleware;
 
-declare function export_default$2(executeOptions: ExecuteOptions, options: ResolverOptions): Promise<void>;
-
-declare const addPermissionChecker: (func: PermissionChecker) => void;
-
-declare function export_default$1(rawParams: any): any;
-
-declare function export_default(rawReturns: any): any;
-
 declare function getResolverArgs(...args: any[]): {
     parent: any;
     params: any;
@@ -83,16 +72,16 @@ declare function getResolverArgs(...args: any[]): {
     parent?: undefined;
 };
 
-declare const createResolver: <TParams extends SchemaFieldType = SchemaFieldType, TReturns extends SchemaFieldType = SchemaFieldType, TViewer = any, TInfo = any>(options: GlobalResolverOptions<TParams, TReturns, TViewer, TInfo>) => Resolver<GlobalResolverResolve<TParams, TReturns, TViewer, TInfo>>;
-declare const createModelResolver: <TItem = any, TParams extends SchemaFieldType = SchemaFieldType, TReturns extends SchemaFieldType = SchemaFieldType, TViewer = any, TInfo = any>(options: ModelResolverOptions<TItem, TParams, TReturns, TViewer, TInfo>) => ModelResolver<ModelResolverResolve<TItem, TParams, TReturns, TViewer, TInfo>>;
+declare const createResolver: <TParams extends SchemaFieldType = any, TReturns extends SchemaFieldType = any, TViewer = any, TInfo = any>(options: GlobalResolverOptions<TParams, TReturns, TViewer, TInfo>) => GlobalResolver<TParams, TReturns, TViewer, TInfo>;
+declare const createModelResolver: <TItem = any, TParams extends SchemaFieldType = any, TReturns extends SchemaFieldType = any, TViewer = any, TInfo = any>(options: ModelResolverOptions<TItem, TParams, TReturns, TViewer, TInfo>) => ModelResolver<TItem, TParams, TReturns, TViewer, TInfo>;
 /**
  * @deprecated Use createResolver and createModelResolver instead
  */
-declare const resolver: <TParams extends SchemaFieldType = SchemaFieldType, TReturns extends SchemaFieldType = SchemaFieldType, TViewer = any, TInfo = any>(options: GlobalResolverOptions<TParams, TReturns, TViewer, TInfo>) => Resolver<GlobalResolverResolve<TParams, TReturns, TViewer, TInfo>>;
+declare const resolver: <TParams extends SchemaFieldType = any, TReturns extends SchemaFieldType = any, TViewer = any, TInfo = any>(options: GlobalResolverOptions<TParams, TReturns, TViewer, TInfo>) => GlobalResolver<TParams, TReturns, TViewer, TInfo>;
 /**
  * @deprecated Use createResolver and createModelResolver instead
  */
-declare const modelResolver: <TItem = any, TParams extends SchemaFieldType = SchemaFieldType, TReturns extends SchemaFieldType = SchemaFieldType, TViewer = any, TInfo = any>(options: ModelResolverOptions<TItem, TParams, TReturns, TViewer, TInfo>) => ModelResolver<ModelResolverResolve<TItem, TParams, TReturns, TViewer, TInfo>>;
+declare const modelResolver: <TItem = any, TParams extends SchemaFieldType = any, TReturns extends SchemaFieldType = any, TViewer = any, TInfo = any>(options: ModelResolverOptions<TItem, TParams, TReturns, TViewer, TInfo>) => ModelResolver<TItem, TParams, TReturns, TViewer, TInfo>;
 
 interface SchemaWithResolversResolversMap<TSchema> {
     [key: string]: ModelResolver<ModelResolverResolve<TSchema>>;
@@ -112,4 +101,4 @@ declare function internal_schemaWithResolvers<TModelName extends string, TSchema
 declare function internal_appendResolversToItem<TItem, TSchema extends Schema, TTypeResolvers extends SchemaWithResolversResolversMap<TSchema>>(item: TItem, resolvers: TTypeResolvers): TItem & { [key in keyof TTypeResolvers]: RemoveFirstArg<TTypeResolvers[key]>; };
 type RemoveFirstArg<T> = T extends (x: any, ...args: infer P) => infer R ? (...args: P) => R : never;
 
-export { type Execute, type ExecuteOptions, type ExecuteParams, type GlobalCheckPermissions, type GlobalGetCacheKey, type GlobalResolverOptions, type GlobalResolverResolve, type ModelCheckPermissions, type ModelGetCacheKey, type ModelResolver, type ModelResolverOptions, type ModelResolverResolve, type PermissionChecker, type PermissionCheckerOptions, type Resolver, type ResolverMiddleware, type ResolverOptions, type SchemaWithResolversOptions, type SchemaWithResolversResolversMap, type SharedResolverOptions, addPermissionChecker, export_default$2 as checkPermissions, export_default$1 as cleanParams, export_default as cleanReturns, createModelResolver, createResolver, createResolverMiddleware, getResolverArgs, internal_appendResolversToItem, internal_schemaWithResolvers, modelResolver, resolver };
+export { type Execute, type ExecuteOptions, type ExecuteParams, type GlobalCheckPermissions, type GlobalGetCacheKey, type GlobalResolver, type GlobalResolverOptions, type GlobalResolverResolve, type ModelCheckPermissions, type ModelGetCacheKey, type ModelResolver, type ModelResolverOptions, type ModelResolverResolve, type PermissionChecker, type PermissionCheckerOptions, type ResolverMiddleware, type ResolverOptions, type SchemaWithResolversOptions, type SchemaWithResolversResolversMap, type SharedResolverOptions, createModelResolver, createResolver, createResolverMiddleware, getResolverArgs, internal_appendResolversToItem, internal_schemaWithResolvers, modelResolver, resolver };

package/dist/index.js

@@ -3,83 +3,6 @@ function createResolverMiddleware(middleware) {
   return middleware;
 }
 
-// src/resolver/permisionsCheckers.ts
-import { PermissionsError } from "@orion-js/helpers";
-global.checkers = [];
-var addPermissionChecker = function(func) {
-  global.checkers.push(func);
-};
-var checkPermissions = async function(options) {
-  for (const checker of global.checkers) {
-    const errorMessage = await checker(options);
-    if (errorMessage) {
-      throw new PermissionsError(errorMessage);
-    }
-  }
-};
-
-// src/resolver/getExecute/checkPermissions.ts
-import { PermissionsError as PermissionsError2 } from "@orion-js/helpers";
-async function checkPermissions_default(executeOptions, options) {
-  const { parent, params, viewer, info } = executeOptions;
-  if (viewer.app) return;
-  await checkPermissions({
-    resolver: options,
-    parent,
-    params,
-    viewer,
-    info
-  });
-  if (options.checkPermission) {
-    const execute = async () => {
-      if (parent) {
-        const checker2 = options.checkPermission;
-        return checker2(parent, params, viewer, info);
-      }
-      const checker = options.checkPermission;
-      return checker(params, viewer, info);
-    };
-    const error = await execute();
-    if (error) {
-      throw new PermissionsError2(error);
-    }
-  }
-}
-
-// src/resolver/cleanParams.ts
-import { clone } from "@orion-js/helpers";
-Symbol.metadata ?? (Symbol.metadata = Symbol("Symbol.metadata"));
-function cleanParams_default(rawParams) {
-  var _a;
-  if (!rawParams) return;
-  if ((_a = rawParams[Symbol.metadata]) == null ? void 0 : _a._getModel) {
-    rawParams = rawParams[Symbol.metadata]._getModel();
-  }
-  if (rawParams.__isModel) {
-    rawParams = rawParams.getSchema();
-  }
-  const params = clone(rawParams);
-  Object.keys(params).forEach((key) => {
-    if (key.startsWith("__")) {
-      delete params[key];
-    }
-  });
-  return params;
-}
-
-// src/resolver/cleanReturns.ts
-function cleanReturns_default(rawReturns) {
-  var _a;
-  if (!rawReturns) return;
-  if ((_a = rawReturns[Symbol.metadata]) == null ? void 0 : _a._getModel) {
-    return rawReturns[Symbol.metadata]._getModel();
-  }
-  if (rawReturns.getModel) {
-    return rawReturns.getModel();
-  }
-  return rawReturns;
-}
-
 // src/resolver/getArgs.ts
 function getResolverArgs(...args) {
   if (args.length === 4) {
@@ -100,73 +23,12 @@ function getResolverArgs(...args) {
   throw new Error("A resolver must be called with 2 parameters only");
 }
 
-// src/resolver/getExecute/getSchema.ts
-import { getSchemaFromAnyOrionForm, isSchemaLike } from "@orion-js/schema";
-import { clone as clone2 } from "@orion-js/helpers";
-function getType(type) {
-  if (Array.isArray(type)) {
-    return [getType(type[0])];
-  }
-  if (isSchemaLike(type)) {
-    return getSchemaFromAnyOrionForm(type);
-  }
-  return type;
-}
-function getSchema(resolverParams) {
-  const schema = {};
-  for (const key of Object.keys(resolverParams)) {
-    const field = clone2(resolverParams[key]);
-    if (!field) continue;
-    field.type = getType(field.type);
-    schema[key] = field;
-  }
-  return schema;
-}
-
-// src/resolver/getExecute/cleanAndValidate.ts
-import { validate, clean } from "@orion-js/schema";
-async function cleanAndValidate({
-  params,
-  callParams
-}) {
-  if (!callParams) callParams = {};
-  if (params) {
-    const options = {
-      filter: false,
-      removeEmptyStrings: false
-    };
-    const schema = getSchema(params);
-    const cleaned = await clean(schema, callParams, options);
-    await validate(schema, cleaned, options);
-    return cleaned;
-  }
-  return callParams;
-}
+// src/resolver/getExecute/index.ts
+import { clean, cleanAndValidate } from "@orion-js/schema";
 
 // src/resolver/getExecute/getResultWithMiddlewares.ts
 import { composeMiddlewares } from "@orion-js/helpers";
 
-// src/resolver/getExecute/getCacheKey.ts
-import { hashObject } from "@orion-js/helpers";
-var getBaseKey = async (executeOptions) => {
-  const { parent, params, viewer, info, options } = executeOptions;
-  if (parent) {
-    const getKey2 = options.getCacheKey;
-    return await getKey2(parent, params, viewer, info);
-  }
-  const getKey = options.getCacheKey;
-  return await getKey(params, viewer, info);
-};
-async function getCacheKey_default(executeOptions) {
-  const { parent, params, options } = executeOptions;
-  if (options.getCacheKey) {
-    const baseKey = await getBaseKey(executeOptions);
-    return `${options.resolverId}_${baseKey}`;
-  }
-  const key = hashObject({ parent, params, resolverId: options.resolverId });
-  return key;
-}
-
 // src/resolver/getExecute/getResult.ts
 async function getResult_default(executeOptions) {
   const { parent, params, viewer, info, options } = executeOptions;
@@ -177,14 +39,6 @@ async function getResult_default(executeOptions) {
     }
     return await resultFunc(params, viewer, info);
   };
-  if (options.cache && options.cacheProvider) {
-    const key = await getCacheKey_default(executeOptions);
-    const result = await options.cacheProvider.get(key, {
-      fallback: executeResolver,
-      ttl: options.cache
-    });
-    return result.value;
-  }
   return await executeResolver();
 }
 
@@ -204,17 +58,16 @@ async function getResultWithMiddlewares(executeOptions) {
 function getExecute(options) {
   const execute = async (executeParams) => {
     const executeOptions = {
-      params: await cleanAndValidate({
-        params: options.params,
-        callParams: executeParams.params
-      }),
+      params: options.params ? await cleanAndValidate(options.params, executeParams.params ?? {}) : executeParams.params ?? {},
       viewer: executeParams.viewer || {},
       info: executeParams.info || {},
       parent: executeParams.parent,
       options
     };
-    await checkPermissions_default(executeOptions, options);
     const result = await getResultWithMiddlewares(executeOptions);
+    if (options.returns) {
+      return await clean(options.returns, result);
+    }
     return result;
   };
   return execute;
@@ -222,13 +75,10 @@ function getExecute(options) {
 
 // src/resolver/index.ts
 import { generateId } from "@orion-js/helpers";
-import { defaultCache } from "@orion-js/cache";
+import { getSchemaFromAnyOrionForm } from "@orion-js/schema";
 function dynamicCreateResolver(options) {
-  options.params = cleanParams_default(options.params);
-  options.returns = cleanReturns_default(options.returns);
-  if (!options.cacheProvider) {
-    options.cacheProvider = defaultCache;
-  }
+  options.params = getSchemaFromAnyOrionForm(options.params);
+  options.returns = getSchemaFromAnyOrionForm(options.returns);
   if (!options.resolverId) {
     options.resolverId = generateId();
   }
@@ -273,10 +123,6 @@ function internal_appendResolversToItem(item, resolvers) {
   return newItem;
 }
 export {
-  addPermissionChecker,
-  checkPermissions_default as checkPermissions,
-  cleanParams_default as cleanParams,
-  cleanReturns_default as cleanReturns,
   createModelResolver,
   createResolver,
   createResolverMiddleware,

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/createResolverMiddleware.ts","../src/resolver/permisionsCheckers.ts","../src/resolver/getExecute/checkPermissions.ts","../src/resolver/cleanParams.ts","../src/resolver/cleanReturns.ts","../src/resolver/getArgs.ts","../src/resolver/getExecute/getSchema.ts","../src/resolver/getExecute/cleanAndValidate.ts","../src/resolver/getExecute/getResultWithMiddlewares.ts","../src/resolver/getExecute/getCacheKey.ts","../src/resolver/getExecute/getResult.ts","../src/resolver/getExecute/index.ts","../src/resolver/index.ts","../src/schemaWithResolvers/index.ts"],"sourcesContent":["import {ResolverMiddleware} from './resolver/types'\n\nexport function createResolverMiddleware(middleware: ResolverMiddleware) {\n  return middleware\n}\n","import {PermissionsError} from '@orion-js/helpers'\nimport {PermissionChecker, PermissionCheckerOptions} from './types'\n\ndeclare const global: {\n  checkers: PermissionChecker[]\n}\n\nglobal.checkers = []\n\nexport const addPermissionChecker = function (func: PermissionChecker) {\n  global.checkers.push(func)\n}\n\nexport const checkPermissions = async function (options: PermissionCheckerOptions) {\n  for (const checker of global.checkers) {\n    const errorMessage = await checker(options)\n    if (errorMessage) {\n      throw new PermissionsError(errorMessage)\n    }\n  }\n}\n","import {checkPermissions} from '../permisionsCheckers'\nimport {PermissionsError} from '@orion-js/helpers'\nimport {\n  ExecuteOptions,\n  GlobalCheckPermissions,\n  ModelCheckPermissions,\n  ResolverOptions,\n} from '../types'\n\nexport default async function (executeOptions: ExecuteOptions, options: ResolverOptions) {\n  const {parent, params, viewer, info} = executeOptions\n\n  if (viewer.app) return\n\n  await checkPermissions({\n    resolver: options,\n    parent,\n    params,\n    viewer,\n    info,\n  })\n\n  if (options.checkPermission) {\n    const execute = async () => {\n      if (parent) {\n        const checker = options.checkPermission as ModelCheckPermissions\n        return checker(parent, params, viewer, info)\n      }\n      const checker = options.checkPermission as GlobalCheckPermissions\n      return checker(params, viewer, info)\n    }\n\n    const error = await execute()\n    if (error) {\n      throw new PermissionsError(error)\n    }\n  }\n}\n","import {clone} from '@orion-js/helpers'\n\n// @ts-ignore polyfill for Symbol.metadata // https://www.typescriptlang.org/docs/handbook/release-notes/typescript-5-2.html#decorator-metadata\nSymbol.metadata ??= Symbol('Symbol.metadata')\n\nexport default function (rawParams: any) {\n  if (!rawParams) return\n\n  // for typed model\n  if (rawParams[Symbol.metadata]?._getModel) {\n    rawParams = rawParams[Symbol.metadata]._getModel()\n  }\n\n  if (rawParams.__isModel) {\n    rawParams = rawParams.getSchema()\n  }\n\n  const params = clone(rawParams)\n  Object.keys(params).forEach(key => {\n    if (key.startsWith('__')) {\n      delete params[key]\n    }\n  })\n\n  return params\n}\n","export default function (rawReturns: any) {\n  if (!rawReturns) return\n\n  // for typed model\n  if (rawReturns[Symbol.metadata]?._getModel) {\n    return rawReturns[Symbol.metadata]._getModel()\n  }\n\n  // for typed model\n  if (rawReturns.getModel) {\n    return rawReturns.getModel()\n  }\n\n  return rawReturns\n}\n","export function getResolverArgs(...args: any[]) {\n  if (args.length === 4) {\n    return {\n      parent: args[0],\n      params: args[1] || {},\n      viewer: args[2] || {},\n      info: args[3] || {},\n    }\n  }\n  if (args.length < 4) {\n    return {\n      params: args[0] || {},\n      viewer: args[1] || {},\n      info: args[2] || {},\n    }\n  }\n  throw new Error('A resolver must be called with 2 parameters only')\n}\n","import {getSchemaFromAnyOrionForm, isSchemaLike, Schema} from '@orion-js/schema'\nimport {clone} from '@orion-js/helpers'\n\nfunction getType(type: any) {\n  if (Array.isArray(type)) {\n    return [getType(type[0])]\n  }\n\n  if (isSchemaLike(type)) {\n    return getSchemaFromAnyOrionForm(type)\n  }\n\n  return type\n}\n\nexport default function getSchema(resolverParams: any) {\n  const schema: Schema = {}\n\n  for (const key of Object.keys(resolverParams)) {\n    const field = clone(resolverParams[key])\n    if (!field) continue\n\n    field.type = getType(field.type)\n\n    schema[key] = field\n  }\n\n  return schema\n}\n","import getSchema from './getSchema'\nimport {validate, clean} from '@orion-js/schema'\n\nexport default async function cleanAndValidate({\n  params,\n  callParams,\n}: {params: any; callParams: any}) {\n  if (!callParams) callParams = {}\n\n  if (params) {\n    const options = {\n      filter: false,\n      removeEmptyStrings: false,\n    }\n    const schema = getSchema(params)\n    const cleaned = await clean(schema, callParams, options)\n    await validate(schema, cleaned, options)\n    return cleaned\n  }\n\n  return callParams\n}\n","import {composeMiddlewares} from '@orion-js/helpers'\nimport {createResolverMiddleware} from '../../createResolverMiddleware'\nimport {ExecuteOptions} from '../types'\nimport getResult from './getResult'\n\nexport async function getResultWithMiddlewares(executeOptions: ExecuteOptions) {\n  const resolveMiddleware = createResolverMiddleware(async executeOptions => {\n    return await getResult(executeOptions)\n  })\n\n  const composedMiddlewares = composeMiddlewares([\n    ...(executeOptions.options.middlewares || []),\n    resolveMiddleware,\n  ])\n\n  return await composedMiddlewares(executeOptions)\n}\n","import {hashObject} from '@orion-js/helpers'\nimport {ExecuteOptions, ModelGetCacheKey, GlobalGetCacheKey} from '../types'\n\nconst getBaseKey = async (executeOptions: ExecuteOptions) => {\n  const {parent, params, viewer, info, options} = executeOptions\n  if (parent) {\n    const getKey = options.getCacheKey as ModelGetCacheKey\n    return await getKey(parent, params, viewer, info)\n  }\n  const getKey = options.getCacheKey as GlobalGetCacheKey\n  return await getKey(params, viewer, info)\n}\n\nexport default async function (executeOptions: ExecuteOptions): Promise<string> {\n  const {parent, params, options} = executeOptions\n  if (options.getCacheKey) {\n    const baseKey = await getBaseKey(executeOptions)\n    return `${options.resolverId}_${baseKey}`\n  }\n  const key = hashObject({parent, params, resolverId: options.resolverId})\n  return key\n}\n","import getCacheKey from './getCacheKey'\nimport {ExecuteOptions} from '../types'\n\nexport default async function (executeOptions: ExecuteOptions) {\n  const {parent, params, viewer, info, options} = executeOptions\n  const executeResolver = async (): Promise<any> => {\n    const resultFunc = options.resolve as (...args: any) => any\n    if (parent) {\n      return await resultFunc(parent, params, viewer, info)\n    }\n    return await resultFunc(params, viewer, info)\n  }\n\n  if (options.cache && options.cacheProvider) {\n    const key = await getCacheKey(executeOptions)\n    const result = await options.cacheProvider.get(key, {\n      fallback: executeResolver,\n      ttl: options.cache,\n    })\n    return result.value\n  }\n  return await executeResolver()\n}\n","import checkPermissions from './checkPermissions'\nimport cleanAndValidate from './cleanAndValidate'\nimport {ResolverOptions, Execute, ExecuteOptions} from '../types'\nimport {getResultWithMiddlewares} from './getResultWithMiddlewares'\n\nexport default function getExecute(options: ResolverOptions) {\n  const execute: Execute = async executeParams => {\n    const executeOptions: ExecuteOptions = {\n      params: await cleanAndValidate({\n        params: options.params,\n        callParams: executeParams.params,\n      }),\n      viewer: executeParams.viewer || {},\n      info: executeParams.info || {},\n      parent: executeParams.parent,\n      options: options,\n    }\n\n    await checkPermissions(executeOptions, options)\n\n    const result = await getResultWithMiddlewares(executeOptions)\n\n    return result\n  }\n\n  return execute\n}\n","import getExecute from './getExecute'\nimport cleanParams from './cleanParams'\nimport {generateId} from '@orion-js/helpers'\nimport {\n  GlobalResolverOptions,\n  GlobalResolverResolve,\n  ModelResolver,\n  ModelResolverOptions,\n  ModelResolverResolve,\n  Resolver,\n} from './types'\nimport {defaultCache} from '@orion-js/cache'\nimport cleanReturns from './cleanReturns'\nimport {getResolverArgs} from './getArgs'\nimport {SchemaFieldType} from '@orion-js/schema'\n\nfunction dynamicCreateResolver(options: any) {\n  options.params = cleanParams(options.params)\n  options.returns = cleanReturns(options.returns)\n\n  if (!options.cacheProvider) {\n    options.cacheProvider = defaultCache\n  }\n\n  if (!options.resolverId) {\n    options.resolverId = generateId()\n  }\n\n  if (!options.middlewares) {\n    options.middlewares = []\n  }\n\n  const execute = getExecute(options)\n\n  const resolve = async (...args: any[]) => {\n    const params: any = getResolverArgs(...args)\n    return await execute(params)\n  }\n\n  const resolver = {\n    ...options,\n    resolve,\n    execute,\n  }\n\n  return resolver\n}\n\nconst createResolver = <\n  TParams extends SchemaFieldType = SchemaFieldType,\n  TReturns extends SchemaFieldType = SchemaFieldType,\n  TViewer = any,\n  TInfo = any,\n>(\n  options: GlobalResolverOptions<TParams, TReturns, TViewer, TInfo>,\n): Resolver<GlobalResolverResolve<TParams, TReturns, TViewer, TInfo>> => {\n  return dynamicCreateResolver(options)\n}\n\nconst createModelResolver = <\n  TItem = any,\n  TParams extends SchemaFieldType = SchemaFieldType,\n  TReturns extends SchemaFieldType = SchemaFieldType,\n  TViewer = any,\n  TInfo = any,\n>(\n  options: ModelResolverOptions<TItem, TParams, TReturns, TViewer, TInfo>,\n): ModelResolver<ModelResolverResolve<TItem, TParams, TReturns, TViewer, TInfo>> => {\n  return dynamicCreateResolver(options)\n}\n\n/**\n * @deprecated Use createResolver and createModelResolver instead\n */\nconst resolver = createResolver\n\n/**\n * @deprecated Use createResolver and createModelResolver instead\n */\nconst modelResolver = createModelResolver\n\nexport {createResolver, createModelResolver, resolver, modelResolver}\n","import {Schema} from '@orion-js/schema'\nimport {ModelResolver, ModelResolverResolve} from '../resolver/types'\n\nexport interface SchemaWithResolversResolversMap<TSchema> {\n  [key: string]: ModelResolver<ModelResolverResolve<TSchema>>\n}\n\nexport interface SchemaWithResolversOptions<\n  TModelName extends string,\n  TSchema extends Schema,\n  TTypeResolvers extends SchemaWithResolversResolversMap<TSchema>,\n> {\n  name: TModelName\n  schema: TSchema\n  resolvers?: TTypeResolvers\n}\n\nexport function internal_schemaWithResolvers<\n  TModelName extends string,\n  TSchema extends Schema,\n  TTypeResolvers extends SchemaWithResolversResolversMap<TSchema>,\n>(options: SchemaWithResolversOptions<TModelName, TSchema, TTypeResolvers>) {\n  const {name, schema, resolvers} = options\n  return {\n    __modelName: name,\n    __resolvers: resolvers,\n    ...schema,\n  }\n}\n\n/**\n * This method is used to give backwards compatibility to models.initItem\n */\nexport function internal_appendResolversToItem<\n  TItem,\n  TSchema extends Schema,\n  TTypeResolvers extends SchemaWithResolversResolversMap<TSchema>,\n>(item: TItem, resolvers: TTypeResolvers) {\n  const newItem = {...item} as any\n\n  for (const resolverName in resolvers) {\n    newItem[resolverName] = (...args: any[]) => resolvers[resolverName].resolve(newItem, ...args)\n  }\n\n  return newItem as TItem & {\n    [key in keyof TTypeResolvers]: RemoveFirstArg<TTypeResolvers[key]>\n  }\n}\n\ntype RemoveFirstArg<T> = T extends (x: any, ...args: infer P) => infer R ? (...args: P) => R : never\n"],"mappings":"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","names":["PermissionsError","checker","clone","getKey","executeOptions","resolver"]}
+{"version":3,"sources":["../src/createResolverMiddleware.ts","../src/resolver/getArgs.ts","../src/resolver/getExecute/index.ts","../src/resolver/getExecute/getResultWithMiddlewares.ts","../src/resolver/getExecute/getResult.ts","../src/resolver/index.ts","../src/schemaWithResolvers/index.ts"],"sourcesContent":["import {ResolverMiddleware} from './resolver/types'\n\nexport function createResolverMiddleware(middleware: ResolverMiddleware) {\n  return middleware\n}\n","export function getResolverArgs(...args: any[]) {\n  if (args.length === 4) {\n    return {\n      parent: args[0],\n      params: args[1] || {},\n      viewer: args[2] || {},\n      info: args[3] || {},\n    }\n  }\n  if (args.length < 4) {\n    return {\n      params: args[0] || {},\n      viewer: args[1] || {},\n      info: args[2] || {},\n    }\n  }\n  throw new Error('A resolver must be called with 2 parameters only')\n}\n","import {clean, cleanAndValidate} from '@orion-js/schema'\nimport {ResolverOptions, Execute, ExecuteOptions} from '../types'\nimport {getResultWithMiddlewares} from './getResultWithMiddlewares'\n\nexport default function getExecute(options: ResolverOptions) {\n  const execute: Execute = async executeParams => {\n    const executeOptions: ExecuteOptions = {\n      params: options.params\n        ? await cleanAndValidate(options.params, executeParams.params ?? {})\n        : (executeParams.params ?? {}),\n      viewer: executeParams.viewer || {},\n      info: executeParams.info || {},\n      parent: executeParams.parent,\n      options: options,\n    }\n\n    const result = await getResultWithMiddlewares(executeOptions)\n\n    if (options.returns) {\n      return await clean(options.returns, result)\n    }\n\n    return result\n  }\n\n  return execute\n}\n","import {composeMiddlewares} from '@orion-js/helpers'\nimport {createResolverMiddleware} from '../../createResolverMiddleware'\nimport {ExecuteOptions} from '../types'\nimport getResult from './getResult'\n\nexport async function getResultWithMiddlewares(executeOptions: ExecuteOptions) {\n  const resolveMiddleware = createResolverMiddleware(async executeOptions => {\n    return await getResult(executeOptions)\n  })\n\n  const composedMiddlewares = composeMiddlewares([\n    ...(executeOptions.options.middlewares || []),\n    resolveMiddleware,\n  ])\n\n  return await composedMiddlewares(executeOptions)\n}\n","import {ExecuteOptions} from '../types'\n\nexport default async function (executeOptions: ExecuteOptions) {\n  const {parent, params, viewer, info, options} = executeOptions\n  const executeResolver = async (): Promise<any> => {\n    const resultFunc = options.resolve as (...args: any) => any\n    if (parent) {\n      return await resultFunc(parent, params, viewer, info)\n    }\n    return await resultFunc(params, viewer, info)\n  }\n\n  return await executeResolver()\n}\n","import getExecute from './getExecute'\nimport {generateId} from '@orion-js/helpers'\nimport {GlobalResolverOptions, ModelResolver, ModelResolverOptions, GlobalResolver} from './types'\nimport {getResolverArgs} from './getArgs'\nimport {getSchemaFromAnyOrionForm, SchemaFieldType} from '@orion-js/schema'\n\nfunction dynamicCreateResolver(options: any) {\n  options.params = getSchemaFromAnyOrionForm(options.params)\n  options.returns = getSchemaFromAnyOrionForm(options.returns)\n\n  if (!options.resolverId) {\n    options.resolverId = generateId()\n  }\n\n  if (!options.middlewares) {\n    options.middlewares = []\n  }\n\n  const execute = getExecute(options)\n\n  const resolve = async (...args: any[]) => {\n    const params: any = getResolverArgs(...args)\n    return await execute(params)\n  }\n\n  const resolver = {\n    ...options,\n    resolve,\n    execute,\n  }\n\n  return resolver\n}\n\nconst createResolver = <\n  TParams extends SchemaFieldType = any,\n  TReturns extends SchemaFieldType = any,\n  TViewer = any,\n  TInfo = any,\n>(\n  options: GlobalResolverOptions<TParams, TReturns, TViewer, TInfo>,\n): GlobalResolver<TParams, TReturns, TViewer, TInfo> => {\n  return dynamicCreateResolver(options)\n}\n\nconst createModelResolver = <\n  TItem = any,\n  TParams extends SchemaFieldType = any,\n  TReturns extends SchemaFieldType = any,\n  TViewer = any,\n  TInfo = any,\n>(\n  options: ModelResolverOptions<TItem, TParams, TReturns, TViewer, TInfo>,\n): ModelResolver<TItem, TParams, TReturns, TViewer, TInfo> => {\n  return dynamicCreateResolver(options)\n}\n\n/**\n * @deprecated Use createResolver and createModelResolver instead\n */\nconst resolver = createResolver\n\n/**\n * @deprecated Use createResolver and createModelResolver instead\n */\nconst modelResolver = createModelResolver\n\nexport {createResolver, createModelResolver, resolver, modelResolver}\n","import {Schema} from '@orion-js/schema'\nimport {ModelResolver, ModelResolverResolve} from '../resolver/types'\n\nexport interface SchemaWithResolversResolversMap<TSchema> {\n  [key: string]: ModelResolver<ModelResolverResolve<TSchema>>\n}\n\nexport interface SchemaWithResolversOptions<\n  TModelName extends string,\n  TSchema extends Schema,\n  TTypeResolvers extends SchemaWithResolversResolversMap<TSchema>,\n> {\n  name: TModelName\n  schema: TSchema\n  resolvers?: TTypeResolvers\n}\n\nexport function internal_schemaWithResolvers<\n  TModelName extends string,\n  TSchema extends Schema,\n  TTypeResolvers extends SchemaWithResolversResolversMap<TSchema>,\n>(options: SchemaWithResolversOptions<TModelName, TSchema, TTypeResolvers>) {\n  const {name, schema, resolvers} = options\n  return {\n    __modelName: name,\n    __resolvers: resolvers,\n    ...schema,\n  }\n}\n\n/**\n * This method is used to give backwards compatibility to models.initItem\n */\nexport function internal_appendResolversToItem<\n  TItem,\n  TSchema extends Schema,\n  TTypeResolvers extends SchemaWithResolversResolversMap<TSchema>,\n>(item: TItem, resolvers: TTypeResolvers) {\n  const newItem = {...item} as any\n\n  for (const resolverName in resolvers) {\n    newItem[resolverName] = (...args: any[]) => resolvers[resolverName].resolve(newItem, ...args)\n  }\n\n  return newItem as TItem & {\n    [key in keyof TTypeResolvers]: RemoveFirstArg<TTypeResolvers[key]>\n  }\n}\n\ntype RemoveFirstArg<T> = T extends (x: any, ...args: infer P) => infer R ? (...args: P) => R : never\n"],"mappings":"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","names":["executeOptions","resolver"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orion-js/resolvers",
-  "version": "4.0.0-next.8",
+  "version": "4.0.0",
   "main": "./dist/index.cjs",
   "types": "./dist/index.d.ts",
   "files": [
@@ -9,9 +9,8 @@
   "author": "nicolaslopezj",
   "license": "MIT",
   "dependencies": {
-    "@orion-js/cache": "4.0.0-next.8",
-    "@orion-js/helpers": "4.0.0-next.8",
-    "@orion-js/schema": "4.0.0-next.7"
+    "@orion-js/helpers": "4.0.0",
+    "@orion-js/schema": "4.0.0"
   },
   "devDependencies": {
     "@types/node": "^18.0.0",