Merge pull request #3303 from SeedCompany/graphql/yoga

Author: CarsonF

.github/workflows/api-schema.yml

@@ -50,6 +50,13 @@ jobs:
           name: head-gql-schema
           path: head
 
+      - name: Check with Hive
+        run: |
+          curl -sSL https://graphql-hive.com/install.sh | sh
+          hive schema:check head/schema.graphql \
+            --registry.accessToken '${{ secrets.HIVE_TOKEN }}' \
+            --github
+
       - name: Show diff in PR comment
         uses: agu-z/gql-diff-action@v2
         with:

.yarn/patches/@whatwg-node-fetch-npm-0.9.22-a60314fb39.patch

@@ -0,0 +1,10 @@
+diff --git a/dist/index.d.ts b/dist/index.d.ts
+index d16ddf2f4e30e75c5b04044af34e8286b2e8b0a5..9f56feb61efa75a40c815fd56f11642719d41737 100644
+--- a/dist/index.d.ts
++++ b/dist/index.d.ts
+@@ -1,5 +1,3 @@
+-/// <reference lib="dom" />
+-/// <reference lib="dom.iterable" />
+ /// <reference types="urlpattern-polyfill" />
+ 
+ declare type _URLPattern = typeof URLPattern

package.json

@@ -31,9 +31,6 @@
     "type-check": "tsc -p tsconfig.check.json"
   },
   "dependencies": {
-    "@apollo/server": "^4.9.5",
-    "@apollo/subgraph": "^2.5.6",
-    "@as-integrations/fastify": "^2.1.1",
     "@aws-sdk/client-s3": "^3.440.0",
     "@aws-sdk/s3-request-presigner": "^3.440.0",
     "@faker-js/faker": "^8.2.0",
@@ -42,8 +39,11 @@
     "@fastify/cors": "^9.0.1",
     "@ffprobe-installer/ffprobe": "^2.1.2",
     "@golevelup/nestjs-discovery": "^4.0.0",
+    "@graphql-hive/yoga": "^0.38.2",
+    "@graphql-tools/utils": "^10.5.4",
+    "@graphql-yoga/nestjs": "^3.7.0",
+    "@graphql-yoga/plugin-apq": "^3.7.0",
     "@leeoniya/ufuzzy": "^1.0.11",
-    "@nestjs/apollo": "^12.0.9",
     "@nestjs/common": "^10.2.7",
     "@nestjs/core": "^10.2.7",
     "@nestjs/graphql": "^12.0.9",
@@ -76,10 +76,10 @@
     "file-type": "^18.6.0",
     "glob": "^10.3.10",
     "got": "^14.3.0",
-    "graphql": "^16.8.1",
+    "graphql": "^16.9.0",
     "graphql-parse-resolve-info": "^4.14.0",
     "graphql-scalars": "^1.22.4",
-    "graphql-upload": "^16.0.2",
+    "graphql-yoga": "^5.7.0",
     "human-format": "^1.2.0",
     "image-size": "^1.0.2",
     "indent-string": "^5.0.0",
@@ -106,6 +106,7 @@
     "sanitize-filename": "^1.6.3",
     "title-case": "^4.3.1",
     "ts-essentials": "^9.4.1",
+    "urlpattern-polyfill": "^10.0.0",
     "uuid": "^10.0.0",
     "winston": "^3.11.0",
     "xlsx": "https://cdn.sheetjs.com/xlsx-0.20.0/xlsx-0.20.0.tgz",
@@ -114,19 +115,19 @@
   },
   "devDependencies": {
     "@edgedb/generate": "github:CarsonF/edgedb-js#workspace=@edgedb/generate&head=temp-host",
+    "@graphql-hive/cli": "^0.44.2",
     "@nestjs/cli": "^10.2.1",
     "@nestjs/schematics": "^10.0.3",
     "@nestjs/testing": "^10.2.7",
     "@seedcompany/eslint-plugin": "^3.4.1",
     "@tsconfig/strictest": "^2.0.2",
     "@types/common-tags": "^1.8.3",
     "@types/ffprobe": "^1.1.7",
-    "@types/graphql-upload": "^16.0.4",
     "@types/jest": "^29.5.7",
     "@types/jsonwebtoken": "^9.0.4",
     "@types/lodash": "^4.14.200",
     "@types/luxon": "^3.4.2",
-    "@types/node": "^20.12.5",
+    "@types/node": "^22.7.8",
     "@types/prismjs": "^1.26.2",
     "@types/react": "^18.2.33",
     "@types/stack-trace": "^0.0.32",
@@ -154,20 +155,14 @@
     "cypher-query-builder/neo4j-driver": "^5.9.0",
     "neo4j-driver-bolt-connection@npm:5.20.0": "patch:neo4j-driver-bolt-connection@npm%3A5.20.0#~/.yarn/patches/neo4j-driver-bolt-connection-npm-5.20.0-1f7809f435.patch",
     "neo4j-driver-core@npm:5.20.0": "patch:neo4j-driver-core@npm%3A5.20.0#~/.yarn/patches/neo4j-driver-core-npm-5.20.0-99216f6938.patch",
-    "@apollo/server-plugin-landing-page-graphql-playground": "npm:empty-npm-package@*",
-    "@apollo/server/express": "npm:empty-npm-package@*",
     "@nestjs/cli/fork-ts-checker-webpack-plugin": "npm:empty-npm-package@*",
     "@nestjs/cli/webpack": "npm:empty-npm-package@*",
     "@nestjs/cli/typescript": "^5.1.6",
-    "@types/express": "npm:@types/stack-trace@*",
-    "@types/express-serve-static-core": "npm:@types/stack-trace@*",
-    "@types/koa": "npm:@types/stack-trace@*",
+    "@nestjs/graphql/graphql-ws": "^5",
+    "@whatwg-node/fetch": "patch:@whatwg-node/fetch@npm%3A0.9.22#~/.yarn/patches/@whatwg-node-fetch-npm-0.9.22-a60314fb39.patch",
     "subscriptions-transport-ws": "npm:empty-npm-package@*"
   },
   "dependenciesMeta": {
-    "@apollo/protobufjs": {
-      "built": false
-    },
     "@nestjs/core": {
       "built": false
     },

src/common/file-upload.scalar.ts

@@ -0,0 +1,20 @@
+import { GraphQLError, GraphQLScalarType } from 'graphql';
+
+export const FileUploadScalar = new GraphQLScalarType({
+  name: 'Upload',
+  description: 'The `Upload` scalar type represents a file upload.',
+  parseValue(value) {
+    if (value instanceof File) {
+      return value;
+    }
+    throw new GraphQLError('Upload value invalid.');
+  },
+  parseLiteral(node) {
+    throw new GraphQLError('Upload literal unsupported.', { nodes: node });
+  },
+  serialize() {
+    throw new GraphQLError('Upload serialization unsupported.');
+  },
+});
+
+export type FileUpload = File;

src/common/index.ts

@@ -15,6 +15,7 @@ export * from './db-unique.decorator';
 export * from './disabled.decorator';
 export * from './mutation-placeholder.output';
 export * from './exceptions';
+export * from './file-upload.scalar';
 export * from './field-selection';
 export * from './fields.pipe';
 export * from './filter-field';

src/common/scalars.ts

@@ -1,7 +1,7 @@
 import { Type } from '@nestjs/common';
 import { CustomScalar } from '@nestjs/graphql';
 import { GraphQLScalarType } from 'graphql';
-import UploadScalar from 'graphql-upload/GraphQLUpload.mjs';
+import { FileUploadScalar } from './file-upload.scalar';
 import { DateScalar, DateTimeScalar } from './luxon.graphql';
 import { InlineMarkdownScalar, MarkdownScalar } from './markdown.scalar';
 import { RichTextScalar } from './rich-text.scalar';
@@ -14,7 +14,7 @@ export const getRegisteredScalars = (): Scalar[] => [
   DateScalar,
   DateTimeScalar,
   RichTextScalar,
-  UploadScalar,
+  FileUploadScalar,
   UrlScalar,
   MarkdownScalar,
   InlineMarkdownScalar,

src/components/authentication/current-user.provider.ts

@@ -1,4 +1,3 @@
-import { Plugin } from '@nestjs/apollo';
 import {
   CallHandler,
   ExecutionContext,
@@ -13,7 +12,6 @@ import { EdgeDB, OptionsFn } from '~/core/edgedb';
 import { HttpMiddleware } from '~/core/http';
 
 @Injectable()
-@Plugin()
 export class EdgeDBCurrentUserProvider
   implements HttpMiddleware, NestInterceptor
 {

src/components/file/dto/upload.dto.ts

@@ -1,8 +1,6 @@
 import { Field, InputType, ObjectType } from '@nestjs/graphql';
 import { stripIndent } from 'common-tags';
-import UploadScalar from 'graphql-upload/GraphQLUpload.mjs';
-import type { FileUpload } from 'graphql-upload/Upload.mjs';
-import { ID, IdField } from '~/common';
+import { FileUpload, FileUploadScalar, ID, IdField } from '~/common';
 import { MediaUserMetadata } from '../media/media.dto';
 
 @ObjectType()
@@ -31,15 +29,15 @@ export abstract class CreateDefinedFileVersionInput {
   })
   readonly uploadId?: ID;
 
-  @Field(() => UploadScalar, {
+  @Field(() => FileUploadScalar, {
     description: stripIndent`
       A file directly uploaded.
       This is mainly here to allow usage with Apollo Studio/Sandbox.
-      For production, prefer the \`url\` from the \`RequestUploadOutput\`.
+      For production, prefer a PUT request to the \`url\` from the \`RequestUploadOutput\`.
     `,
     nullable: true,
   })
-  readonly file?: Promise<FileUpload>;
+  readonly file?: FileUpload;
 
   @Field({
     description: stripIndent`

src/components/file/file.service.ts

@@ -4,7 +4,7 @@ import {
 } from '@aws-sdk/client-s3';
 import { Injectable } from '@nestjs/common';
 import { bufferFromStream, cleanJoin, Nil } from '@seedcompany/common';
-import { fileTypeFromStream } from 'file-type';
+import { fileTypeFromBuffer } from 'file-type';
 import { intersection } from 'lodash';
 import { Duration } from 'luxon';
 import mime from 'mime';
@@ -297,19 +297,19 @@ export class FileService {
           'A file with this ID already exists. Request an new upload ID.',
         );
       }
-      const file = await uploadingFile;
 
-      let type: string | Nil = file.mimetype;
+      const body = await uploadingFile.arrayBuffer();
+
+      let type: string | Nil = uploadingFile.type;
       type = type === 'application/octet-stream' ? null : type;
-      type ??= (await fileTypeFromStream(file.createReadStream()))?.mime;
+      type ??= (await fileTypeFromBuffer(body))?.mime;
       type ??= mime.getType(name);
       type ??= 'application/octet-stream';
 
       await this.bucket.putObject({
         Key: `temp/${uploadId}`,
         ContentType: type,
-        ContentEncoding: file.encoding,
-        Body: file.createReadStream(),
+        Body: Buffer.from(body),
       });
     }
 
@@ -441,8 +441,7 @@ export class FileService {
       return sanitizeFilename(input.name);
     }
     if (input?.file) {
-      const file = await input.file;
-      const sanitized = sanitizeFilename(file.filename);
+      const sanitized = sanitizeFilename(input.file.name);
       if (sanitized) {
         return sanitized;
       }

src/core/config/config.service.ts

@@ -45,6 +45,9 @@ export const makeConfig = (env: EnvironmentService) =>
         ttl: env.duration('GRAPHQL_PERSISTED_QUERIES_TTL').optional('1w'),
       },
     };
+    hive = {
+      token: env.string('HIVE_TOKEN').optional(),
+    };
 
     lruCache = {
       ttl: env.duration('LRU_CACHE_TTL').optional()?.as('milliseconds'),