@steedos/service-api 2.5.0-beta.1 → 2.5.0-beta.3

package/index.js

@@ -417,10 +417,6 @@ module.exports = {
 					schemaDirectives = _.cloneDeep(mixinOptions.schemaDirectives);
 				}
 
-				if (this.globalTypeDefs) {
-					typeDefs = typeDefs.concat(this.globalTypeDefs);
-				}
-
 				let queries = [];
 				let mutations = [];
 				let subscriptions = [];
@@ -430,6 +426,59 @@ module.exports = {
 				let enums = [];
 				let inputs = [];
 
+				if (this.globalGraphQLSettings) {
+					if (_.isObject(this.globalGraphQLSettings)) {
+						const globalDef = this.globalGraphQLSettings;
+						const thisServiceName = this.name;
+						// console.log('thisServiceName', thisServiceName)
+
+						if (globalDef.query) {
+							queries = queries.concat(globalDef.query);
+						}
+
+						if (globalDef.mutation) {
+							mutations = mutations.concat(globalDef.mutation);
+						}
+
+						if (globalDef.subscription) {
+							subscriptions = subscriptions.concat(globalDef.subscription);
+						}
+
+						if (globalDef.type) {
+							types = types.concat(globalDef.type);
+						}
+
+						if (globalDef.interface) {
+							interfaces = interfaces.concat(globalDef.interface);
+						}
+
+						if (globalDef.union) {
+							unions = unions.concat(globalDef.union);
+						}
+
+						if (globalDef.enum) {
+							enums = enums.concat(globalDef.enum);
+						}
+
+						if (globalDef.input) {
+							inputs = inputs.concat(globalDef.input);
+						}
+
+						if (globalDef.resolvers) {
+							resolvers = Object.entries(globalDef.resolvers).reduce(
+								(acc, [name, resolver]) => {
+									acc[name] = _.merge(
+										acc[name] || {},
+										this.createServiceResolvers(thisServiceName, resolver)
+									);
+									return acc;
+								},
+								resolvers
+							);
+						}
+					}
+				}
+
 				const processedServices = new Set();
 
 				services.forEach(service => {

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@steedos/service-api",
-  "version": "2.5.0-beta.1",
+  "version": "2.5.0-beta.3",
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
-    "@steedos/auth": "2.5.0-beta.1",
-    "@steedos/router": "2.5.0-beta.1",
-    "@steedos/service-object-graphql": "2.5.0-beta.1",
-    "@steedos/service-ui": "2.5.0-beta.1",
+    "@steedos/auth": "2.5.0-beta.3",
+    "@steedos/router": "2.5.0-beta.3",
+    "@steedos/service-object-graphql": "2.5.0-beta.3",
+    "@steedos/service-ui": "2.5.0-beta.3",
     "graphql": "^15.8.0",
     "graphql-iso-date": "^3.6.1",
     "graphql-type-json": "^0.3.2",
@@ -19,5 +19,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "5da093d78baa6f2d7011348060c30671354cc7f0"
+  "gitHead": "48546b91b2a44dd6f6673af7f5ab707faff6e07c"
 }