version and scalars

adapters/apollo-server/index.ts

@@ -10,7 +10,7 @@ import { GraphQLSchema } from 'graphql';
 type SchemaMapperInitial = Required<Parameters<typeof mapSchema>>[1];
 export type SchemaMapper = (schema: GraphQLSchema, getDirective: typeof getDirectiveFn) => SchemaMapperInitial;
 export const apolloServerAdapter = AxolotlAdapter<[any, any, any, any], SchemaMapper>()((
-  { resolvers, directives },
+  { resolvers, directives, scalars },
   options?: {
     schema?: {
       file?: { path: string } | { content: string };
@@ -43,7 +43,10 @@ export const apolloServerAdapter = AxolotlAdapter<[any, any, any, any], SchemaMa
 
   let apolloSchema = makeExecutableSchema({
     typeDefs: schema,
-    resolvers: apolloResolvers,
+    resolvers: {
+      ...apolloResolvers,
+      ...scalars,
+    },
   });
 
   if (directives) {

adapters/apollo-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aexol/axolotl-apollo-server",
-  "version": "0.4.5",
+  "version": "0.5.0",
   "private": false,
   "main": "./lib/index.js",
   "author": "Aexol, Artur Czemiel",
@@ -14,7 +14,7 @@
     "lib"
   ],
   "dependencies": {
-    "@aexol/axolotl-core": "^0.4.5",
+    "@aexol/axolotl-core": "^0.5.0",
     "@apollo/server": "^4.9.4",
     "@graphql-tools/schema": "^9.0.19",
     "@graphql-tools/utils": "^9.2.1"

adapters/graphql-yoga/index.ts

@@ -13,7 +13,7 @@ export type SchemaMapper = (
 ) => SchemaMapperInitial;
 
 export const graphqlYogaAdapter = AxolotlAdapter<[any, any, YogaInitialContext], SchemaMapper>()((
-  { resolvers, directives },
+  { resolvers, directives, scalars },
   options?: {
     yoga?: Parameters<typeof createYoga>[0];
     schema?: {
@@ -48,7 +48,10 @@ export const graphqlYogaAdapter = AxolotlAdapter<[any, any, YogaInitialContext],
   let yogaSchema = createSchema({
     ...options?.schema?.options,
     typeDefs: schema,
-    resolvers: yogaResolvers,
+    resolvers: {
+      ...yogaResolvers,
+      ...scalars,
+    },
   });
 
   if (directives) {

adapters/graphql-yoga/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aexol/axolotl-graphql-yoga",
-  "version": "0.4.5",
+  "version": "0.5.0",
   "private": false,
   "main": "./lib/index.js",
   "author": "Aexol, Artur Czemiel",
@@ -14,7 +14,7 @@
     "lib"
   ],
   "dependencies": {
-    "@aexol/axolotl-core": "^0.4.5",
+    "@aexol/axolotl-core": "^0.5.0",
     "@graphql-tools/utils": "^10.3.2",
     "graphql-yoga": "^4.0.5"
   },

docs/pages/scalars.mdx

@@ -0,0 +1,3 @@
+# Custom scalars
+
+Custom scalar resolvers work like any other resolvers

examples/beerpub-apollo-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "beerpub-apollo-server",
-  "version": "0.4.5",
+  "version": "0.5.0",
   "description": "Automatically generated by graphql-editor-cli",
   "main": "lib/index.js",
   "type": "module",
@@ -17,15 +17,15 @@
   "author": "GraphQL Editor Centaur Generator",
   "license": "ISC",
   "dependencies": {
-    "@aexol/axolotl-apollo-server": "^0.4.5",
-    "@aexol/axolotl-core": "^0.4.5",
+    "@aexol/axolotl-apollo-server": "^0.5.0",
+    "@aexol/axolotl-core": "^0.5.0",
     "@apollo/server": "^4.9.4",
     "graphql": "^16.8.1",
     "node-fetch": "^3.2.10",
     "ws": "^8.12.0"
   },
   "devDependencies": {
-    "@aexol/axolotl": "^0.4.5",
+    "@aexol/axolotl": "^0.5.0",
     "@types/node": "^18.7.18",
     "@typescript-eslint/eslint-plugin": "^6.16.0",
     "@typescript-eslint/parser": "^6.16.0",

examples/beerpub-apollo-server/src/axolotl.ts

@@ -2,5 +2,5 @@ import { Models } from "@/src/models.js";
 import { Axolotl } from "@aexol/axolotl-core";
 import { apolloServerAdapter } from "@aexol/axolotl-apollo-server";
 
-export const { applyMiddleware, createResolvers, adapter } = Axolotl(apolloServerAdapter)<Models,{}>();
+export const { applyMiddleware, createResolvers, adapter } = Axolotl(apolloServerAdapter)<Models>();
 

examples/beerpub-yoga-federated/package.json

@@ -1,6 +1,6 @@
 {
   "name": "beerpub-yoga-federated",
-  "version": "0.5.5",
+  "version": "0.6.0",
   "description": "Automatically generated by graphql-editor-cli",
   "main": "lib/index.js",
   "type": "module",
@@ -20,15 +20,15 @@
   "author": "GraphQL Editor Centaur Generator",
   "license": "ISC",
   "dependencies": {
-    "@aexol/axolotl-core": "^0.4.5",
-    "@aexol/axolotl-graphql-yoga": "^0.4.5",
+    "@aexol/axolotl-core": "^0.5.0",
+    "@aexol/axolotl-graphql-yoga": "^0.5.0",
     "graphql": "^16.8.1",
     "graphql-yoga": "^4.0.5",
     "node-fetch": "^3.2.10",
     "ws": "^8.12.0"
   },
   "devDependencies": {
-    "@aexol/axolotl": "^0.4.5",
+    "@aexol/axolotl": "^0.5.0",
     "@types/node": "^18.7.18",
     "@typescript-eslint/eslint-plugin": "^7.12.0",
     "@typescript-eslint/parser": "^7.12.0",

examples/beerpub-yoga-federated/src/axolotl.ts

@@ -2,7 +2,4 @@ import { Models } from '@/src/models.js';
 import { Axolotl } from '@aexol/axolotl-core';
 import { graphqlYogaAdapter } from '@aexol/axolotl-graphql-yoga';
 
-export const { applyMiddleware, createResolvers, createDirectives, adapter } = Axolotl(graphqlYogaAdapter)<
-  Models,
-  unknown
->();
+export const { applyMiddleware, createResolvers, createDirectives, adapter } = Axolotl(graphqlYogaAdapter)<Models>();