@contember/engine-vimeo-plugin 2.0.0-alpha.9 → 2.0.0-beta.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@contember/engine-vimeo-plugin",
   "license": "Apache-2.0",
-  "version": "2.0.0-alpha.9",
+  "version": "2.0.0-beta.2",
   "main": "./dist/production/index.js",
   "typings": "./dist/types/index.d.ts",
   "exports": {
@@ -23,16 +23,16 @@
     }
   },
   "dependencies": {
-    "@contember/engine-plugins": "2.0.0-alpha.9",
-    "@contember/typesafe": "2.0.0-alpha.9"
+    "@contember/engine-plugins": "2.0.0-beta.2",
+    "@contember/typesafe": "2.0.0-beta.2"
   },
   "devDependencies": {
-    "@types/node": "^20.9.0",
-    "graphql": "^16.8.1"
+    "@types/node": "^20.16.11",
+    "graphql": "^16.9.0"
   },
   "peerDependencies": {
     "graphql": ">= 14.6.0",
     "pg": "^8.9.0"
   },
   "type": "module"
-}
+}

package/src/VimeoSchemaContributor.ts

@@ -1,5 +1,6 @@
 import {
 	GraphQLBoolean,
+	GraphQLError,
 	GraphQLFieldConfig,
 	GraphQLInt,
 	GraphQLList,
@@ -8,8 +9,8 @@ import {
 	GraphQLSchemaConfig,
 	GraphQLString,
 } from 'graphql'
-import { VimeoService, VimeoServiceFactory } from './VimeoService'
-import { VimeoConfig } from './Config'
+import { VimeoServiceFactory } from './VimeoService'
+import { ProjectVimeoConfig } from './Config'
 import { GraphQLSchemaContributor, GraphQLSchemaContributorContext } from '@contember/engine-plugins'
 
 interface VimeoAcl {
@@ -18,12 +19,15 @@ interface VimeoAcl {
 
 export class VimeoSchemaContributor implements GraphQLSchemaContributor {
 	constructor(
-		private readonly vimeoConfig: VimeoConfig | undefined,
 		private readonly vimeoServiceFactory: VimeoServiceFactory,
 	) {}
 
+	getCacheKey?(context: GraphQLSchemaContributorContext): string {
+		return context.project.vimeo ? 'yes' : 'no'
+	}
+
 	createSchema(context: GraphQLSchemaContributorContext): GraphQLSchemaConfig | undefined {
-		if (!this.vimeoConfig) {
+		if (!context.project.vimeo) {
 			return undefined
 		}
 
@@ -35,9 +39,7 @@ export class VimeoSchemaContributor implements GraphQLSchemaContributor {
 			return undefined
 		}
 
-		const vimeoService = this.vimeoServiceFactory.create(this.vimeoConfig)
-
-		const uploadMutation = this.createMutation(vimeoService)
+		const uploadMutation = this.createMutation()
 		const mutation = {
 			generateVimeoUploadUrl: uploadMutation as GraphQLFieldConfig<any, any, any>,
 		}
@@ -57,7 +59,7 @@ export class VimeoSchemaContributor implements GraphQLSchemaContributor {
 		}
 	}
 
-	private createMutation(vimeoService: VimeoService): GraphQLFieldConfig<any, any, any> {
+	private createMutation(): GraphQLFieldConfig<any, any, any> {
 		return {
 			type: new GraphQLNonNull(
 				new GraphQLObjectType({
@@ -97,7 +99,11 @@ export class VimeoSchemaContributor implements GraphQLSchemaContributor {
 					type: new GraphQLNonNull(GraphQLInt),
 				},
 			},
-			resolve: async (parent: any, args: { size: number }) => {
+			resolve: async (parent: any, args: { size: number }, ctx: { project: ProjectVimeoConfig }) => {
+				if (!ctx.project.vimeo) {
+					throw new GraphQLError('Vimeo is not configured for this project')
+				}
+				const vimeoService = this.vimeoServiceFactory.create(ctx.project.vimeo)
 				return await vimeoService.getUploadUrl(args.size)
 			},
 		}

package/src/index.ts

@@ -14,11 +14,8 @@ export default class VimeoPlugin implements Plugin<ProjectVimeoConfig> {
 		return new VimeoConfigProcessor()
 	}
 
-	getSchemaContributor({ project }: SchemaContributorArgs<ProjectVimeoConfig>) {
-		if (!project.vimeo) {
-			return undefined
-		}
+	getSchemaContributor() {
 		const vimeoServiceFactory = new VimeoServiceFactory()
-		return new VimeoSchemaContributor(project.vimeo, vimeoServiceFactory)
+		return new VimeoSchemaContributor(vimeoServiceFactory)
 	}
 }

package/tsconfig.settings.json

@@ -1,9 +1,5 @@
 {
 	"compilerOptions": {
-		"typeRoots": [
-			"./types",
-			"./node_modules/@types"
-		]
 	},
 	"extends": "../../tsconfig.settings.json"
 }