@smartive/graphql-magic 21.0.3 → 21.1.0-next.2

package/CHANGELOG.md

@@ -1,7 +1,3 @@
-## <small>21.0.3 (2025-10-18)</small>
+## 21.1.0-next.2 (2025-10-20)
 
-* fix(deps): update docusaurus monorepo to v3.9.2 (#366) ([79ed673](https://github.com/smartive/graphql-magic/commit/79ed673)), closes [#366](https://github.com/smartive/graphql-magic/issues/366)
-* chore(deps): update dependency esbuild to v0.25.11 (#365) ([9bb3f20](https://github.com/smartive/graphql-magic/commit/9bb3f20)), closes [#365](https://github.com/smartive/graphql-magic/issues/365)
-* chore(deps): update dependency eslint to v9.37.0 (#362) ([7d93321](https://github.com/smartive/graphql-magic/commit/7d93321)), closes [#362](https://github.com/smartive/graphql-magic/issues/362)
-* chore(deps): update dependency ts-jest to v29.4.5 (#363) ([78bed26](https://github.com/smartive/graphql-magic/commit/78bed26)), closes [#363](https://github.com/smartive/graphql-magic/issues/363)
-* chore(deps): update dependency typescript to v5.9.3 (#361) ([92ccf69](https://github.com/smartive/graphql-magic/commit/92ccf69)), closes [#361](https://github.com/smartive/graphql-magic/issues/361)
+* fix: Graphql objects handing ([548965d](https://github.com/smartive/graphql-magic/commit/548965d))

package/dist/bin/gqm.cjs

@@ -31,6 +31,8 @@ var import_simple_git = require("simple-git");
 // src/api/execute.ts
 var import_schema = require("@graphql-tools/schema");
 var import_graphql2 = require("graphql");
+var import_isFunction = __toESM(require("lodash/isFunction"), 1);
+var import_mapValues = __toESM(require("lodash/mapValues"), 1);
 var import_merge = __toESM(require("lodash/merge"), 1);
 
 // src/errors.ts

package/dist/cjs/index.cjs

@@ -193,6 +193,8 @@ module.exports = __toCommonJS(index_exports);
 // src/api/execute.ts
 var import_schema = require("@graphql-tools/schema");
 var import_graphql2 = require("graphql");
+var import_isFunction = __toESM(require("lodash/isFunction"), 1);
+var import_mapValues = __toESM(require("lodash/mapValues"), 1);
 var import_merge = __toESM(require("lodash/merge"), 1);
 
 // src/errors.ts
@@ -238,13 +240,20 @@ var execute = async ({
   additionalResolvers,
   body,
   introspection = false,
+  resolverWrapper,
   ...ctx
 }) => {
   const document2 = generate(ctx.models);
-  const generatedResolvers = getResolvers(ctx.models);
+  let resolvers = (0, import_merge.default)(getResolvers(ctx.models), additionalResolvers);
+  if (resolverWrapper) {
+    resolvers = (0, import_mapValues.default)(
+      resolvers,
+      (type) => Object.getPrototypeOf(type) === Object.prototype ? (0, import_mapValues.default)(type, (resolver) => (0, import_isFunction.default)(resolver) ? resolverWrapper(resolver) : resolver) : type
+    );
+  }
   const schema = (0, import_schema.makeExecutableSchema)({
     typeDefs: document2,
-    resolvers: (0, import_merge.default)(generatedResolvers, additionalResolvers)
+    resolvers
   });
   const parsedDocument = (0, import_graphql2.parse)(new import_graphql2.Source(body.query, "GraphQL request"));
   const validationErrors = (0, import_graphql2.validate)(

package/dist/esm/api/execute.d.ts

@@ -1,7 +1,8 @@
-import { IResolvers } from '@graphql-tools/utils';
+import { IFieldResolver, IResolvers } from '@graphql-tools/utils';
 import { Context } from '..';
-export declare const execute: ({ additionalResolvers, body, introspection, ...ctx }: {
+export declare const execute: ({ additionalResolvers, body, introspection, resolverWrapper, ...ctx }: {
     additionalResolvers?: IResolvers<any, any>;
     introspection?: boolean;
     body: any;
+    resolverWrapper?: (resolver: IFieldResolver<unknown, unknown, unknown, unknown>) => IFieldResolver<unknown, unknown, unknown, unknown>;
 } & Omit<Context, "document">) => Promise<import("graphql").ExecutionResult<import("graphql/jsutils/ObjMap").ObjMap<unknown>, import("graphql/jsutils/ObjMap").ObjMap<unknown>>>;

package/dist/esm/api/execute.js

@@ -1,14 +1,21 @@
 import { makeExecutableSchema } from '@graphql-tools/schema';
 import { Source, execute as graphqlExecute, parse, specifiedRules, validate } from 'graphql';
+import isFunction from 'lodash/isFunction';
+import mapValues from 'lodash/mapValues';
 import merge from 'lodash/merge';
 import { generate, get, getResolvers } from '..';
 import { noIntrospection } from '../utils/rules';
-export const execute = async ({ additionalResolvers, body, introspection = false, ...ctx }) => {
+export const execute = async ({ additionalResolvers, body, introspection = false, resolverWrapper, ...ctx }) => {
     const document = generate(ctx.models);
-    const generatedResolvers = getResolvers(ctx.models);
+    let resolvers = merge(getResolvers(ctx.models), additionalResolvers);
+    if (resolverWrapper) {
+        resolvers = mapValues(resolvers, (type) => Object.getPrototypeOf(type) === Object.prototype
+            ? mapValues(type, (resolver) => (isFunction(resolver) ? resolverWrapper(resolver) : resolver))
+            : type);
+    }
     const schema = makeExecutableSchema({
         typeDefs: document,
-        resolvers: merge(generatedResolvers, additionalResolvers),
+        resolvers,
     });
     const parsedDocument = parse(new Source(body.query, 'GraphQL request'));
     const validationErrors = validate(schema, parsedDocument, introspection ? specifiedRules : [...specifiedRules, noIntrospection]);

package/dist/esm/api/execute.js.map

@@ -1 +1 @@
-{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../src/api/execute.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAE7D,OAAO,EAAsB,MAAM,EAAE,OAAO,IAAI,cAAc,EAAE,KAAK,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACjH,OAAO,KAAK,MAAM,cAAc,CAAC;AACjC,OAAO,EAAW,QAAQ,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,IAAI,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEjD,MAAM,CAAC,MAAM,OAAO,GAAG,KAAK,EAAE,EAC5B,mBAAmB,EACnB,IAAI,EACJ,aAAa,GAAG,KAAK,EACrB,GAAG,GAAG,EAKqB,EAAE,EAAE;IAC/B,MAAM,QAAQ,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAEtC,MAAM,kBAAkB,GAAG,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAEpD,MAAM,MAAM,GAAG,oBAAoB,CAAC;QAClC,QAAQ,EAAE,QAAQ;QAClB,SAAS,EAAE,KAAK,CAAC,kBAAkB,EAAE,mBAAmB,CAAC;KAC1D,CAAC,CAAC;IAEH,MAAM,cAAc,GAAG,KAAK,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,iBAAiB,CAAC,CAAC,CAAC;IAExE,MAAM,gBAAgB,GAAG,QAAQ,CAC/B,MAAM,EACN,cAAc,EACd,aAAa,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,GAAG,cAAc,EAAE,eAAe,CAAC,CACtE,CAAC;IAEF,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAChC,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,CAAC;IACtC,CAAC;IAED,MAAM,YAAY,GAAY;QAC5B,QAAQ;QACR,GAAG,GAAG;KACP,CAAC;IAEF,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC;QAClC,MAAM;QACN,QAAQ,EAAE,cAAc;QACxB,YAAY;QACZ,cAAc,EAAE,IAAI,CAAC,SAAS;QAC9B,aAAa,EAAE,IAAI,CAAC,aAAa;QACjC,aAAa,EAAE,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,IAAwB,EAAE,EAAE;YAC/D,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;YACrC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;YAEzB,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACvD,CAAC;KACF,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC"}
+{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../src/api/execute.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAE7D,OAAO,EAAsB,MAAM,EAAE,OAAO,IAAI,cAAc,EAAE,KAAK,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACjH,OAAO,UAAU,MAAM,mBAAmB,CAAC;AAC3C,OAAO,SAAS,MAAM,kBAAkB,CAAC;AACzC,OAAO,KAAK,MAAM,cAAc,CAAC;AACjC,OAAO,EAAW,QAAQ,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,IAAI,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEjD,MAAM,CAAC,MAAM,OAAO,GAAG,KAAK,EAAE,EAC5B,mBAAmB,EACnB,IAAI,EACJ,aAAa,GAAG,KAAK,EACrB,eAAe,EACf,GAAG,GAAG,EAQqB,EAAE,EAAE;IAC/B,MAAM,QAAQ,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACtC,IAAI,SAAS,GAAG,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,mBAAmB,CAAC,CAAC;IACrE,IAAI,eAAe,EAAE,CAAC;QACpB,SAAS,GAAG,SAAS,CAAC,SAAS,EAAE,CAAC,IAAI,EAAE,EAAE,CACxC,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,MAAM,CAAC,SAAS;YAC9C,CAAC,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;YAC9F,CAAC,CAAC,IAAI,CACT,CAAC;IACJ,CAAC;IAED,MAAM,MAAM,GAAG,oBAAoB,CAAC;QAClC,QAAQ,EAAE,QAAQ;QAClB,SAAS;KACV,CAAC,CAAC;IAEH,MAAM,cAAc,GAAG,KAAK,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,iBAAiB,CAAC,CAAC,CAAC;IAExE,MAAM,gBAAgB,GAAG,QAAQ,CAC/B,MAAM,EACN,cAAc,EACd,aAAa,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,GAAG,cAAc,EAAE,eAAe,CAAC,CACtE,CAAC;IAEF,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAChC,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,CAAC;IACtC,CAAC;IAED,MAAM,YAAY,GAAY;QAC5B,QAAQ;QACR,GAAG,GAAG;KACP,CAAC;IAEF,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC;QAClC,MAAM;QACN,QAAQ,EAAE,cAAc;QACxB,YAAY;QACZ,cAAc,EAAE,IAAI,CAAC,SAAS;QAC9B,aAAa,EAAE,IAAI,CAAC,aAAa;QACjC,aAAa,EAAE,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,IAAwB,EAAE,EAAE;YAC/D,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;YACrC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;YAEzB,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACvD,CAAC;KACF,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smartive/graphql-magic",
-  "version": "21.0.3",
+  "version": "21.1.0-next.2",
   "description": "",
   "source": "src/index.ts",
   "type": "module",
@@ -75,7 +75,7 @@
     "create-ts-index": "1.14.0",
     "del-cli": "6.0.0",
     "esbuild": "0.25.11",
-    "eslint": "9.37.0",
+    "eslint": "9.38.0",
     "jest": "29.7.0",
     "mock-knex": "0.4.13",
     "prettier": "3.6.2",

package/src/api/execute.ts

@@ -1,6 +1,8 @@
 import { makeExecutableSchema } from '@graphql-tools/schema';
-import { IResolvers } from '@graphql-tools/utils';
+import { IFieldResolver, IResolvers } from '@graphql-tools/utils';
 import { GraphQLResolveInfo, Source, execute as graphqlExecute, parse, specifiedRules, validate } from 'graphql';
+import isFunction from 'lodash/isFunction';
+import mapValues from 'lodash/mapValues';
 import merge from 'lodash/merge';
 import { Context, generate, get, getResolvers } from '..';
 import { noIntrospection } from '../utils/rules';
@@ -9,19 +11,29 @@ export const execute = async ({
   additionalResolvers,
   body,
   introspection = false,
+  resolverWrapper,
   ...ctx
 }: {
   additionalResolvers?: IResolvers<any, any>;
   introspection?: boolean;
   body: any;
+  resolverWrapper?: (
+    resolver: IFieldResolver<unknown, unknown, unknown, unknown>,
+  ) => IFieldResolver<unknown, unknown, unknown, unknown>;
 } & Omit<Context, 'document'>) => {
   const document = generate(ctx.models);
-
-  const generatedResolvers = getResolvers(ctx.models);
+  let resolvers = merge(getResolvers(ctx.models), additionalResolvers);
+  if (resolverWrapper) {
+    resolvers = mapValues(resolvers, (type) =>
+      Object.getPrototypeOf(type) === Object.prototype
+        ? mapValues(type, (resolver) => (isFunction(resolver) ? resolverWrapper(resolver) : resolver))
+        : type,
+    );
+  }
 
   const schema = makeExecutableSchema({
     typeDefs: document,
-    resolvers: merge(generatedResolvers, additionalResolvers),
+    resolvers,
   });
 
   const parsedDocument = parse(new Source(body.query, 'GraphQL request'));