@platformatic/sql-graphql 2.0.0-alpha.2 → 2.0.0-alpha.21

package/eslint.config.js

@@ -0,0 +1,3 @@
+'use strict'
+
+module.exports = require('neostandard')({ ts: true })

package/index.d.ts

@@ -47,4 +47,3 @@ export module errors {
   export const UnsupportedKindError: (kind: string) => FastifyError
   export const ErrorPrintingGraphQLSchema: () => FastifyError
 }
-

package/index.js

@@ -28,7 +28,7 @@ async function mapperToGraphql (app, opts) {
     resolvers,
     loaders,
     federationReplacements,
-    federationMetadata: opts.federationMetadata
+    federationMetadata: opts.federationMetadata,
   }
   const metaMap = new Map()
 
@@ -36,7 +36,7 @@ async function mapperToGraphql (app, opts) {
     // no schema
     queryTopFields.hello = { type: graphql.GraphQLString }
     resolvers.Query = {
-      hello: () => 'Hello Platformatic!'
+      hello: () => 'Hello Platformatic!',
     }
   } else {
     const entitiesNames = Object.values(mapper.entities)
@@ -96,13 +96,13 @@ async function mapperToGraphql (app, opts) {
 
   const query = new graphql.GraphQLObjectType({
     name: 'Query',
-    fields: queryTopFields
+    fields: queryTopFields,
   })
 
   const mutation = Object.keys(mutationTopFields).length > 0
     ? new graphql.GraphQLObjectType({
       name: 'Mutation',
-      fields: mutationTopFields
+      fields: mutationTopFields,
     })
     : null
 
@@ -130,7 +130,7 @@ async function mapperToGraphql (app, opts) {
 
     if (entitiesList.length > 0) {
       opts.subscription = {
-        emitter: app.platformatic.mq
+        emitter: app.platformatic.mq,
       }
       // TODO support ignoring some of those
       subscription = setupSubscriptions(app, metaMap, resolvers, ignoreList)
@@ -184,7 +184,7 @@ async function mapperToGraphql (app, opts) {
     ...opts,
     schema: sdl,
     loaders,
-    resolvers
+    resolvers,
   })
 
   if (app.openTelemetry) {

package/lib/entity-to-type.js

@@ -5,7 +5,7 @@ const camelcase = require('camelcase')
 const { findNearestString } = require('@platformatic/utils')
 const {
   sqlTypeToGraphQL,
-  fromSelectionSet
+  fromSelectionSet,
 } = require('./utils')
 const errors = require('./errors')
 
@@ -13,13 +13,13 @@ const ascDesc = new graphql.GraphQLEnumType({
   name: 'OrderByDirection',
   values: {
     ASC: { value: 'ASC' },
-    DESC: { value: 'DESC' }
-  }
+    DESC: { value: 'DESC' },
+  },
 })
 
 const limitType = new graphql.GraphQLScalarType({
   name: 'LimitInt',
-  description: 'Limit will be applied by default if not passed. If the provided value exceeds the maximum allowed value a validation error will be thrown'
+  description: 'Limit will be applied by default if not passed. If the provided value exceeds the maximum allowed value a validation error will be thrown',
 })
 
 function constructGraph (app, entity, opts, ignore) {
@@ -35,7 +35,7 @@ function constructGraph (app, entity, opts, ignore) {
     resolvers,
     federationReplacements,
     federationMetadata,
-    loaders
+    loaders,
   } = opts
 
   const entityFieldsNames = Object.values(entity.fields)
@@ -104,7 +104,7 @@ function constructGraph (app, entity, opts, ignore) {
 
   const type = new graphql.GraphQLObjectType({
     name: entityName,
-    fields
+    fields,
   })
 
   resolvers.Query = resolvers.Query || {}
@@ -131,7 +131,7 @@ function constructGraph (app, entity, opts, ignore) {
         lte: { type: fields[field].type },
         like: { type: fields[field].type },
         in: { type: new graphql.GraphQLList(fields[field].type) },
-        nin: { type: new graphql.GraphQLList(fields[field].type) }
+        nin: { type: new graphql.GraphQLList(fields[field].type) },
       }
     } else {
       graphqlFields = {
@@ -139,14 +139,14 @@ function constructGraph (app, entity, opts, ignore) {
         all: { type: fields[field].type.ofType },
         contains: { type: new graphql.GraphQLList(fields[field].type) },
         contained: { type: new graphql.GraphQLList(fields[field].type) },
-        overlaps: { type: new graphql.GraphQLList(fields[field].type) }
+        overlaps: { type: new graphql.GraphQLList(fields[field].type) },
       }
     }
     acc[field] = {
       type: new graphql.GraphQLInputObjectType({
         name: `${entityName}WhereArguments${field}`,
-        fields: graphqlFields
-      })
+        fields: graphqlFields,
+      }),
     }
     return acc
   }, {})
@@ -159,11 +159,11 @@ function constructGraph (app, entity, opts, ignore) {
         type: new graphql.GraphQLList(new graphql.GraphQLInputObjectType({
           name: `${entityName}WhereArgumentsOr`,
           fields: {
-            ...whereFields
-          }
-        }))
-      }
-    }
+            ...whereFields,
+          },
+        })),
+      },
+    },
   })
 
   queryTopFields[getBy] = {
@@ -172,8 +172,8 @@ function constructGraph (app, entity, opts, ignore) {
       ...(primaryKeys.reduce((acc, primaryKey) => {
         acc[primaryKey] = { type: new graphql.GraphQLNonNull(fields[primaryKey].type) }
         return acc
-      }, {}))
-    }
+      }, {})),
+    },
   }
   loaders.Query[getBy] = {
     loader (queries, ctx) {
@@ -188,8 +188,8 @@ function constructGraph (app, entity, opts, ignore) {
       return loadMany(keys, queries, ctx)
     },
     opts: {
-      cache: false
-    }
+      cache: false,
+    },
   }
 
   const orderByFields = new graphql.GraphQLEnumType({
@@ -198,11 +198,11 @@ function constructGraph (app, entity, opts, ignore) {
       /* istanbul ignore else */
       if (!fields[field].isArray) {
         acc[field] = {
-          value: field
+          value: field,
         }
       }
       return acc
-    }, {})
+    }, {}),
   })
   queryTopFields[plural] = {
     type: new graphql.GraphQLList(type),
@@ -214,12 +214,12 @@ function constructGraph (app, entity, opts, ignore) {
           name: `${entityName}OrderByArguments`,
           fields: {
             field: { type: orderByFields },
-            direction: { type: new graphql.GraphQLNonNull(ascDesc) }
-          }
-        }))
+            direction: { type: new graphql.GraphQLNonNull(ascDesc) },
+          },
+        })),
       },
-      where: { type: whereArgType }
-    }
+      where: { type: whereArgType },
+    },
   }
 
   resolvers.Query[plural] = (_, query, ctx, info) => {
@@ -239,7 +239,7 @@ function constructGraph (app, entity, opts, ignore) {
         acc[field] = meta
       }
       return acc
-    }, {})
+    }, {}),
   })
 
   const count = camelcase(['count', plural])
@@ -247,15 +247,15 @@ function constructGraph (app, entity, opts, ignore) {
   const countType = new graphql.GraphQLObjectType({
     name: `${plural}Count`,
     fields: {
-      total: { type: graphql.GraphQLInt }
-    }
+      total: { type: graphql.GraphQLInt },
+    },
   })
 
   queryTopFields[count] = {
     type: countType,
     args: {
-      where: { type: whereArgType }
-    }
+      where: { type: whereArgType },
+    },
   }
 
   resolvers.Query[count] = async (_, query, ctx, info) => {
@@ -272,8 +272,8 @@ function constructGraph (app, entity, opts, ignore) {
   mutationTopFields[save] = {
     type,
     args: {
-      input: { type: new graphql.GraphQLNonNull(inputType) }
-    }
+      input: { type: new graphql.GraphQLNonNull(inputType) },
+    },
   }
 
   resolvers.Mutation[save] = async (_, { input }, ctx, info) => {
@@ -286,8 +286,8 @@ function constructGraph (app, entity, opts, ignore) {
   mutationTopFields[insert] = {
     type: new graphql.GraphQLList(type),
     args: {
-      inputs: { type: new graphql.GraphQLNonNull(new graphql.GraphQLList(inputType)) }
-    }
+      inputs: { type: new graphql.GraphQLNonNull(new graphql.GraphQLList(inputType)) },
+    },
   }
 
   resolvers.Mutation[insert] = (_, { inputs }, ctx, info) => {
@@ -299,8 +299,8 @@ function constructGraph (app, entity, opts, ignore) {
   mutationTopFields[deleteKey] = {
     type: new graphql.GraphQLList(type),
     args: {
-      where: { type: whereArgType }
-    }
+      where: { type: whereArgType },
+    },
   }
 
   resolvers.Mutation[deleteKey] = (_, args, ctx, info) => {
@@ -310,7 +310,7 @@ function constructGraph (app, entity, opts, ignore) {
 
   federationReplacements.push({
     find: new RegExp(`type ${entityName}`),
-    replace: `type ${entityName} @key(fields: "${primaryKeys}")`
+    replace: `type ${entityName} @key(fields: "${primaryKeys}")`,
   })
 
   if (federationMetadata) {
@@ -328,8 +328,8 @@ function constructGraph (app, entity, opts, ignore) {
         return loadMany(keys, queries, ctx)
       },
       opts: {
-        cache: false
-      }
+        cache: false,
+      },
     }
   }
 
@@ -339,7 +339,7 @@ function constructGraph (app, entity, opts, ignore) {
     loadMany,
     getFields,
     relationalFields,
-    fields
+    fields,
   }
 
   async function loadMany (keys, queries, ctx) {
@@ -357,7 +357,7 @@ function constructGraph (app, entity, opts, ignore) {
           acc[key].in.push(value)
         } else {
           acc[key] = {
-            in: [value]
+            in: [value],
           }
         }
         return acc
@@ -369,7 +369,7 @@ function constructGraph (app, entity, opts, ignore) {
       where,
       fields,
       limit,
-      ctx
+      ctx,
     })
 
     const matchedRaws = []

package/lib/errors.js

@@ -7,5 +7,5 @@ const ERROR_PREFIX = 'PLT_SQL_GRAPHQL'
 module.exports = {
   UnableToGenerateGraphQLEnumTypeError: createError(`${ERROR_PREFIX}_UNABLE_GENERATE_GRAPHQL_ENUM_TYPE`, 'Unable to generate GraphQLEnumType'),
   UnsupportedKindError: createError(`${ERROR_PREFIX}_UNSUPPORTED_KIND`, 'Unsupported kind: %s'),
-  ErrorPrintingGraphQLSchema: createError(`${ERROR_PREFIX}_ERROR_PRINTING_GRAPHQL_SCHEMA`, 'Error printing the GraphQL schema')
+  ErrorPrintingGraphQLSchema: createError(`${ERROR_PREFIX}_ERROR_PRINTING_GRAPHQL_SCHEMA`, 'Error printing the GraphQL schema'),
 }

package/lib/relationship.js

@@ -4,7 +4,7 @@
 
 const camelcase = require('camelcase')
 const {
-  fromSelectionSet
+  fromSelectionSet,
 } = require('./utils')
 const assert = require('assert')
 
@@ -49,8 +49,8 @@ module.exports = function establishRelations (app, relations, resolvers, loaders
             return foreign.loadMany(keys, queries, ctx)
           },
           opts: {
-            cache: false
-          }
+            cache: false,
+          },
         }
       }
     }

package/lib/subscriptions.js

@@ -21,7 +21,7 @@ function setupSubscriptions (app, metaMap, resolvers, ignores) {
     const { type } = meta
     const saved = `${field.singularName}Saved`
     fields[saved] = {
-      type
+      type,
     }
     resolvers.Subscription[saved] = {
       subscribe: async function * (_, query, ctx, info) {
@@ -54,7 +54,7 @@ function setupSubscriptions (app, metaMap, resolvers, ignores) {
             log.warn({ err, entity: field.singularName }, 'graphql subscription error')
           }
         }
-      }
+      },
     }
 
     const deleted = `${field.singularName}Deleted`
@@ -63,10 +63,10 @@ function setupSubscriptions (app, metaMap, resolvers, ignores) {
         name: `${field.name}Deleted`,
         fields: {
           [primaryKey]: {
-            type: meta.fields[primaryKey].type
-          }
-        }
-      })
+            type: meta.fields[primaryKey].type,
+          },
+        },
+      }),
     }
     resolvers.Subscription[deleted] = {
       subscribe: async (_, query, ctx, info) => {
@@ -75,12 +75,12 @@ function setupSubscriptions (app, metaMap, resolvers, ignores) {
         const res = await pubsub.subscribe(topic)
         ctx.reply.request.log.trace({ topic }, 'subscribed')
         return wrap(res, deleted)
-      }
+      },
     }
   }
   const subscription = new graphql.GraphQLObjectType({
     name: 'Subscription',
-    fields
+    fields,
   })
 
   return subscription

package/lib/telemetry.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const telemetryWrapper = (app, fn, operationType, operationName) => async (...args) => {
-  const { startInternalSpan, endInternalSpan } = app.openTelemetry
+  const { startSpan, endSpan } = app.openTelemetry
   const context = args[2]
   const request = context?.reply?.request
   const document = JSON.stringify(request?.body)
@@ -10,19 +10,19 @@ const telemetryWrapper = (app, fn, operationType, operationName) => async (...ar
   const telemetryAttributes = {
     'graphql.document': document,
     'graphql.operation.name': operationName,
-    'graphql.operation.type': operationType
+    'graphql.operation.type': operationType,
   }
   const spanName = `${operationType} ${operationName}`
   const ctx = request.span?.context
 
-  const span = startInternalSpan(spanName, ctx, telemetryAttributes)
+  const span = startSpan(spanName, ctx, telemetryAttributes)
   try {
     const result = await fn(...args)
-    endInternalSpan(span)
+    endSpan(span)
     return result
   // We ignore this because in sqlite it's HARD to have a resolver exception without a schema validation exception first.
   } catch (err) /* istanbul ignore next */ {
-    endInternalSpan(span, err)
+    endSpan(span, err)
     throw err
   }
 }

package/lib/utils.js

@@ -85,5 +85,5 @@ function fromSelectionSet (selectionSet, fields = new Set()) {
 module.exports = {
   sqlTypeToGraphQL,
   fromSelectionSet,
-  typeSym: Symbol('graphlType')
+  typeSym: Symbol('graphlType'),
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/sql-graphql",
-  "version": "2.0.0-alpha.2",
+  "version": "2.0.0-alpha.21",
   "description": "Map SQL dbs to GraphQL",
   "main": "index.js",
   "types": "index.d.ts",
@@ -17,41 +17,43 @@
   "devDependencies": {
     "@matteo.collina/snap": "^0.3.0",
     "@matteo.collina/tspl": "^0.1.1",
-    "@mercuriusjs/gateway": "^3.0.0",
-    "borp": "^0.16.0",
-    "fastify": "^4.26.2",
-    "snazzy": "^9.0.0",
-    "standard": "^17.1.0",
+    "@mercuriusjs/gateway": "^4.0.1",
+    "borp": "^0.17.0",
+    "eslint": "9",
+    "fastify": "^5.0.0",
+    "fastify-tsconfig": "^2.0.0",
+    "neostandard": "^0.11.1",
     "tsd": "^0.31.0",
+    "typescript": "^5.5.4",
     "why-is-node-running": "^2.2.2",
     "ws": "^8.16.0",
-    "@platformatic/sql-mapper": "2.0.0-alpha.2",
-    "@platformatic/telemetry": "2.0.0-alpha.2",
-    "@platformatic/sql-events": "2.0.0-alpha.2"
+    "@platformatic/sql-mapper": "2.0.0-alpha.21",
+    "@platformatic/sql-events": "2.0.0-alpha.21",
+    "@platformatic/telemetry": "2.0.0-alpha.21"
   },
   "dependencies": {
     "@fastify/error": "^3.4.1",
-    "@mercuriusjs/federation": "^3.0.0",
+    "@mercuriusjs/federation": "^4.0.0",
     "camelcase": "^6.3.0",
-    "fastify-plugin": "^4.5.1",
+    "fastify-plugin": "^5.0.0",
     "graphql": "^16.8.1",
     "graphql-scalars": "^1.22.5",
     "graphql-type-json": "^0.3.2",
     "inflected": "^2.1.0",
-    "mercurius": "^14.0.0",
-    "@platformatic/utils": "2.0.0-alpha.2"
+    "mercurius": "^15.0.0",
+    "@platformatic/utils": "2.0.0-alpha.21"
   },
   "tsd": {
     "directory": "test/types"
   },
   "scripts": {
-    "lint": "standard | snazzy",
+    "lint": "eslint",
     "test": "npm run lint && npm run test:typescript && npm run test:postgresql && npm run test:mariadb && npm run test:mysql && npm run test:mysql8 && npm run test:sqlite",
-    "test:postgresql": "DB=postgresql borp --concurrency=1 test/*.test.js",
-    "test:mariadb": "DB=mariadb borp --concurrency=1 test/*.test.js",
-    "test:mysql": "DB=mysql borp --concurrency=1 test/*.test.js",
-    "test:mysql8": "DB=mysql8 borp --concurrency=1 test/*.test.js",
-    "test:sqlite": "DB=sqlite borp --concurrency=1 test/*.test.js",
+    "test:postgresql": "DB=postgresql borp --timeout=180000 --concurrency=1 test/*.test.js",
+    "test:mariadb": "DB=mariadb borp --timeout=180000 --concurrency=1 test/*.test.js",
+    "test:mysql": "DB=mysql borp --timeout=180000 --concurrency=1 test/*.test.js",
+    "test:mysql8": "DB=mysql8 borp --timeout=180000 --concurrency=1 test/*.test.js",
+    "test:sqlite": "DB=sqlite borp --timeout=180000 --concurrency=1 test/*.test.js",
     "test:typescript": "tsd"
   }
 }