@smartive/graphql-magic 8.1.1 → 8.1.3

package/CHANGELOG.md

@@ -1,6 +1,6 @@
-## [8.1.1](https://github.com/smartive/graphql-magic/compare/v8.1.0...v8.1.1) (2023-09-06)
+## [8.1.3](https://github.com/smartive/graphql-magic/compare/v8.1.2...v8.1.3) (2023-09-06)
 
 
 ### Bug Fixes
 
-* Remove gqm code from dist ([#57](https://github.com/smartive/graphql-magic/issues/57)) ([e4d28db](https://github.com/smartive/graphql-magic/commit/e4d28dbd43cbcad835befa7de6fc509e9923d7d1))
+* Merge resolvers ([#59](https://github.com/smartive/graphql-magic/issues/59)) ([6d0f0c1](https://github.com/smartive/graphql-magic/commit/6d0f0c1228eff0da992435b7aa6e7cf00d0c283f))

package/dist/bin/{index.cjs → gqm.cjs}

@@ -22,7 +22,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 
-// src/bin/gqm/index.ts
+// src/bin/gqm/gqm.ts
 var import_commander = require("commander");
 var import_dotenv = require("dotenv");
 var import_knex = __toESM(require("knex"), 1);
@@ -31,6 +31,7 @@ var import_simple_git = require("simple-git");
 // src/api/execute.ts
 var import_schema = require("@graphql-tools/schema");
 var import_graphql = require("graphql");
+var import_lodash = require("lodash");
 
 // src/client/mutations.ts
 var import_upperCase = __toESM(require("lodash/upperCase"), 1);
@@ -1736,7 +1737,7 @@ var parseModels = async () => {
   return rawModels;
 };
 
-// src/bin/gqm/index.ts
+// src/bin/gqm/gqm.ts
 (0, import_dotenv.config)({
   path: ".env"
 });

package/dist/cjs/index.cjs

@@ -128,7 +128,7 @@ __export(src_exports, {
   isVisibleRelation: () => isVisibleRelation,
   it: () => it,
   list: () => list,
-  merge: () => merge,
+  merge: () => merge2,
   mutationResolver: () => mutationResolver,
   name: () => name,
   namedType: () => namedType,
@@ -158,6 +158,7 @@ module.exports = __toCommonJS(src_exports);
 // src/api/execute.ts
 var import_schema = require("@graphql-tools/schema");
 var import_graphql = require("graphql");
+var import_lodash = require("lodash");
 var execute = async ({
   additionalResolvers,
   body,
@@ -167,10 +168,7 @@ var execute = async ({
   const generatedResolvers = getResolvers(ctx.models);
   const schema = (0, import_schema.makeExecutableSchema)({
     typeDefs: document2,
-    resolvers: {
-      ...generatedResolvers,
-      ...additionalResolvers
-    }
+    resolvers: (0, import_lodash.merge)(generatedResolvers, additionalResolvers)
   });
   const contextValue = {
     document: document2,
@@ -255,7 +253,7 @@ var import_get = __toESM(require("lodash/get"), 1);
 var import_kebabCase = __toESM(require("lodash/kebabCase"), 1);
 var import_startCase = __toESM(require("lodash/startCase"), 1);
 var isNotFalsy = (v) => typeof v !== "undefined" && v !== null && v !== false;
-var merge = (objects) => (objects || []).filter(isNotFalsy).reduce((i, acc) => ({ ...acc, ...i }), {});
+var merge2 = (objects) => (objects || []).filter(isNotFalsy).reduce((i, acc) => ({ ...acc, ...i }), {});
 var typeToField = (type) => type.substr(0, 1).toLowerCase() + type.substr(1);
 var getModelPlural = (model) => model.plural || (0, import_inflection.pluralize)(model.name);
 var getModelPluralField = (model) => typeToField(getModelPlural(model));
@@ -2345,7 +2343,7 @@ var isEndOfDay = (field) => isPrimitive(field) && field.type === "DateTime" && f
 
 // src/resolvers/resolvers.ts
 var getResolvers = (models) => ({
-  Query: merge([
+  Query: merge2([
     {
       me: queryResolver
     },
@@ -2356,7 +2354,7 @@ var getResolvers = (models) => ({
       [getModelPluralField(model)]: queryResolver
     }))
   ]),
-  Mutation: merge([
+  Mutation: merge2([
     ...models.filter(({ creatable }) => creatable).map((model) => ({
       [`create${model.name}`]: mutationResolver
     })),

package/dist/esm/api/execute.js

@@ -1,15 +1,13 @@
 import { makeExecutableSchema } from '@graphql-tools/schema';
 import { Source, execute as graphqlExecute, parse } from 'graphql';
+import { merge } from 'lodash';
 import { generate, get, getResolvers } from '..';
 export const execute = async ({ additionalResolvers, body, ...ctx }) => {
     const document = generate(ctx.rawModels);
     const generatedResolvers = getResolvers(ctx.models);
     const schema = makeExecutableSchema({
         typeDefs: document,
-        resolvers: {
-            ...generatedResolvers,
-            ...additionalResolvers,
-        },
+        resolvers: merge(generatedResolvers, additionalResolvers),
     });
     const contextValue = {
         document,

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,MAAM,SAAS,CAAC;AACvF,OAAO,EAAW,QAAQ,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,IAAI,CAAC;AAE1D,MAAM,CAAC,MAAM,OAAO,GAAG,KAAK,EAAE,EAC5B,mBAAmB,EACnB,IAAI,EACJ,GAAG,GAAG,EAIqB,EAAE,EAAE;IAC/B,MAAM,QAAQ,GAAG,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAEzC,MAAM,kBAAkB,GAAG,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAEpD,MAAM,MAAM,GAAG,oBAAoB,CAAC;QAClC,QAAQ,EAAE,QAAQ;QAClB,SAAS,EAAE;YACT,GAAG,kBAAkB;YACrB,GAAG,mBAAmB;SACvB;KACF,CAAC,CAAC;IAEH,MAAM,YAAY,GAAY;QAC5B,QAAQ;QACR,GAAG,GAAG;KACP,CAAC;IAEF,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC;QAClC,MAAM;QACN,QAAQ,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,iBAAiB,CAAC,CAAC;QAC1D,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;YACzB,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,MAAM,SAAS,CAAC;AACvF,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAC/B,OAAO,EAAW,QAAQ,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,IAAI,CAAC;AAE1D,MAAM,CAAC,MAAM,OAAO,GAAG,KAAK,EAAE,EAC5B,mBAAmB,EACnB,IAAI,EACJ,GAAG,GAAG,EAIqB,EAAE,EAAE;IAC/B,MAAM,QAAQ,GAAG,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAEzC,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,YAAY,GAAY;QAC5B,QAAQ;QACR,GAAG,GAAG;KACP,CAAC;IAEF,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC;QAClC,MAAM;QACN,QAAQ,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,iBAAiB,CAAC,CAAC;QAC1D,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;YACzB,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": "8.1.1",
+  "version": "8.1.3",
   "description": "",
   "source": "src/index.ts",
   "type": "module",
@@ -28,7 +28,7 @@
     "build": "npm run build:esm && npm run build:cjs && npm run build:bin",
     "build:esm": "tsc",
     "build:cjs": "esbuild src/index.ts --bundle --platform=node --outdir=dist/cjs --out-extension:.js=.cjs --format=cjs --packages=external",
-    "build:bin": "esbuild src/bin/gqm/index.ts --bundle --platform=node --outdir=dist/bin --out-extension:.js=.cjs --format=cjs --packages=external"
+    "build:bin": "esbuild src/bin/gqm/gqm.ts --bundle --platform=node --outdir=dist/bin --out-extension:.js=.cjs --format=cjs --packages=external"
   },
   "bin": {
     "gqm": "dist/bin/gqm.cjs"

package/src/api/execute.ts

@@ -1,6 +1,7 @@
 import { makeExecutableSchema } from '@graphql-tools/schema';
 import { IResolvers } from '@graphql-tools/utils';
 import { GraphQLResolveInfo, Source, execute as graphqlExecute, parse } from 'graphql';
+import { merge } from 'lodash';
 import { Context, generate, get, getResolvers } from '..';
 
 export const execute = async ({
@@ -17,10 +18,7 @@ export const execute = async ({
 
   const schema = makeExecutableSchema({
     typeDefs: document,
-    resolvers: {
-      ...generatedResolvers,
-      ...additionalResolvers,
-    },
+    resolvers: merge(generatedResolvers, additionalResolvers),
   });
 
   const contextValue: Context = {

package/src/bin/gqm/{index.ts → gqm.ts}

@@ -12,12 +12,12 @@ import {
   getMigrationDate,
   printSchemaFromModels,
 } from '../..';
-import { generateGraphqlApiTypes, generateGraphqlClientTypes } from '../gqm/codegen';
-import { KNEXFILE_PATH, parseKnexfile } from '../gqm/parse-knexfile';
-import { parseModels } from '../gqm/parse-models';
-import { readLine } from '../gqm/readline';
-import { ensureFileExists, getSetting, getSettings, writeToFile } from '../gqm/settings';
-import { KNEXFILE } from '../gqm/templates';
+import { generateGraphqlApiTypes, generateGraphqlClientTypes } from './codegen';
+import { KNEXFILE_PATH, parseKnexfile } from './parse-knexfile';
+import { parseModels } from './parse-models';
+import { readLine } from './readline';
+import { ensureFileExists, getSetting, getSettings, writeToFile } from './settings';
+import { KNEXFILE } from './templates';
 
 config({
   path: '.env',