@contember/engine-content-api 2.0.0-alpha.15 → 2.0.0-alpha.16

package/graphql.codegen.yml

@@ -1,5 +1,5 @@
 schema:
-  - "./src/introspection/IntrospectionSchemaDefinitionFactory.ts"
+  - "./src/introspection/introspection.schema.ts"
 documents: []
 config:
   immutableTypes: "1"
@@ -12,4 +12,4 @@ generates:
       - "typescript-operations"
 hooks:
   afterAllFileWrite:
-    - eslint --fix
+    - yarn run -T eslint --fix

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contember/engine-content-api",
-  "version": "2.0.0-alpha.15",
+  "version": "2.0.0-alpha.16",
   "license": "Apache-2.0",
   "main": "./dist/production/index.js",
   "typings": "./dist/types/index.d.ts",
@@ -26,25 +26,21 @@
     "generate": "gql-gen --config graphql.codegen.yml"
   },
   "dependencies": {
-    "@contember/database": "2.0.0-alpha.15",
-    "@contember/dic": "2.0.0-alpha.15",
-    "@contember/graphql-utils": "2.0.0-alpha.15",
-    "@contember/logger": "2.0.0-alpha.15",
-    "@contember/schema": "2.0.0-alpha.15",
-    "@contember/schema-definition": "2.0.0-alpha.15",
-    "@contember/schema-utils": "2.0.0-alpha.15",
+    "@contember/database": "2.0.0-alpha.16",
+    "@contember/dic": "2.0.0-alpha.16",
+    "@contember/graphql-utils": "2.0.0-alpha.16",
+    "@contember/logger": "2.0.0-alpha.16",
+    "@contember/schema": "2.0.0-alpha.16",
+    "@contember/schema-definition": "2.0.0-alpha.16",
+    "@contember/schema-utils": "2.0.0-alpha.16",
     "fast-deep-equal": "^3.1.3"
   },
   "devDependencies": {
-    "@contember/database-tester": "2.0.0-alpha.15",
-    "@contember/schema-definition": "2.0.0-alpha.15",
-    "@graphql-codegen/cli": "^5.0.0",
-    "@graphql-codegen/typescript": "^4.0.1",
-    "@graphql-codegen/typescript-operations": "^4.0.1",
-    "@graphql-codegen/typescript-resolvers": "^4.0.1",
-    "@types/node": "^20.9.0",
-    "graphql": "^16.8.1",
-    "pg": "^8.11.3"
+    "@contember/database-tester": "2.0.0-alpha.16",
+    "@contember/schema-definition": "2.0.0-alpha.16",
+    "@types/node": "^20.16.5",
+    "graphql": "^16.9.0",
+    "pg": "^8.12.0"
   },
   "peerDependencies": {
     "graphql": ">= 14.6.0",

package/src/introspection/IntrospectionSchemaDefinitionFactory.ts

@@ -1,199 +1,7 @@
+import { GraphQLSchema, GraphQLSchemaConfig } from 'graphql'
 import * as ContentSchema from './content-schema.types'
 import { IntrospectionSchemaFactory } from './IntrospectionSchemaFactory'
-import { JSONType } from '@contember/graphql-utils'
-
-import {
-	GraphQLBoolean,
-	GraphQLEnumType,
-	GraphQLFieldResolver,
-	GraphQLInt,
-	GraphQLInterfaceType,
-	GraphQLList,
-	GraphQLNonNull,
-	GraphQLObjectType,
-	GraphQLSchema,
-	GraphQLSchemaConfig,
-	GraphQLString,
-	GraphQLUnionType,
-} from 'graphql'
-
-const _RuleMessage = new GraphQLObjectType({
-	name: '_RuleMessage',
-	fields: {
-		text: { type: GraphQLString },
-	},
-})
-
-const _ValidatorArgument = new GraphQLObjectType({
-	name: '_ValidatorArgument',
-	fields: {
-		validator: { type: new GraphQLNonNull(GraphQLInt) },
-	},
-})
-
-const _PathArgument = new GraphQLObjectType({
-	name: '_PathArgument',
-	fields: {
-		path: { type: new GraphQLNonNull(new GraphQLList(new GraphQLNonNull(GraphQLString))) },
-	},
-})
-
-const _LiteralArgument = new GraphQLObjectType({
-	name: '_LiteralArgument',
-	fields: {
-		value: { type: JSONType },
-	},
-})
-
-const _Argument = new GraphQLUnionType({
-	name: '_Argument',
-	types: [_ValidatorArgument, _PathArgument, _LiteralArgument],
-})
-
-const _Validator = new GraphQLObjectType({
-	name: '_Validator',
-	fields: {
-		operation: { type: new GraphQLNonNull(GraphQLString) },
-		arguments: { type: new GraphQLNonNull(new GraphQLList(new GraphQLNonNull(_Argument))) },
-	},
-})
-
-const _Rule = new GraphQLObjectType({
-	name: '_Rule',
-	fields: {
-		message: { type: _RuleMessage },
-		validator: { type: new GraphQLNonNull(GraphQLInt) },
-	},
-})
-
-const _FieldInterface = new GraphQLInterfaceType({
-	name: '_Field',
-	fields: {
-		name: { type: new GraphQLNonNull(GraphQLString) },
-		type: { type: new GraphQLNonNull(GraphQLString) },
-		nullable: { type: GraphQLBoolean },
-		rules: { type: new GraphQLNonNull(new GraphQLList(new GraphQLNonNull(_Rule))) },
-		validators: { type: new GraphQLNonNull(new GraphQLList(new GraphQLNonNull(_Validator))) },
-	},
-})
-
-const _OrderByDirection = new GraphQLEnumType({
-	name: '_OrderByDirection',
-	values: {
-		asc: {},
-		desc: {},
-	},
-})
-
-const _OrderBy = new GraphQLObjectType({
-	name: '_OrderBy',
-	fields: {
-		path: { type: new GraphQLNonNull(new GraphQLList(new GraphQLNonNull(GraphQLString))) },
-		direction: { type: new GraphQLNonNull(_OrderByDirection) },
-	},
-})
-
-const _OnDeleteBehaviour = new GraphQLEnumType({
-	name: '_OnDeleteBehaviour',
-	values: {
-		restrict: {},
-		cascade: {},
-		setNull: {},
-	},
-})
-
-const _RelationSide = new GraphQLEnumType({
-	name: '_RelationSide',
-	values: {
-		owning: {},
-		inverse: {},
-	},
-})
-
-const _Relation = new GraphQLObjectType({
-	name: '_Relation',
-	interfaces: [_FieldInterface],
-	fields: {
-		name: { type: new GraphQLNonNull(GraphQLString) },
-		type: { type: new GraphQLNonNull(GraphQLString) },
-		side: { type: new GraphQLNonNull(_RelationSide) },
-		targetEntity: { type: new GraphQLNonNull(GraphQLString) },
-		ownedBy: { type: GraphQLString },
-		inversedBy: { type: GraphQLString },
-		nullable: { type: GraphQLBoolean },
-		onDelete: { type: _OnDeleteBehaviour },
-		orphanRemoval: { type: GraphQLBoolean },
-		orderBy: { type: new GraphQLList(new GraphQLNonNull(_OrderBy)) },
-		rules: { type: new GraphQLNonNull(new GraphQLList(new GraphQLNonNull(_Rule))) },
-		validators: { type: new GraphQLNonNull(new GraphQLList(new GraphQLNonNull(_Validator))) },
-	},
-})
-
-const _Column = new GraphQLObjectType({
-	name: '_Column',
-	interfaces: [_FieldInterface],
-	fields: {
-		name: { type: new GraphQLNonNull(GraphQLString) },
-		type: { type: new GraphQLNonNull(GraphQLString) },
-		enumName: { type: GraphQLString },
-		defaultValue: { type: JSONType },
-		nullable: { type: new GraphQLNonNull(GraphQLBoolean) },
-		rules: { type: new GraphQLNonNull(new GraphQLList(new GraphQLNonNull(_Rule))) },
-		validators: { type: new GraphQLNonNull(new GraphQLList(new GraphQLNonNull(_Validator))) },
-	},
-})
-
-const _UniqueConstraint = new GraphQLObjectType({
-	name: '_UniqueConstraint',
-	fields: {
-		fields: { type: new GraphQLNonNull(new GraphQLList(new GraphQLNonNull(GraphQLString))) },
-	},
-})
-
-const _Entity = new GraphQLObjectType({
-	name: '_Entity',
-	fields: {
-		name: { type: new GraphQLNonNull(GraphQLString) },
-		customPrimaryAllowed: { type: new GraphQLNonNull(GraphQLBoolean) },
-		fields: { type: new GraphQLNonNull(new GraphQLList(new GraphQLNonNull(_FieldInterface))) },
-		unique: { type: new GraphQLNonNull(new GraphQLList(new GraphQLNonNull(_UniqueConstraint))) },
-	},
-})
-
-const _Enum = new GraphQLObjectType({
-	name: '_Enum',
-	fields: {
-		name: { type: new GraphQLNonNull(GraphQLString) },
-		values: { type: new GraphQLNonNull(new GraphQLList(new GraphQLNonNull(GraphQLString))) },
-	},
-})
-
-const _Schema = new GraphQLObjectType({
-	name: '_Schema',
-	fields: {
-		enums: { type: new GraphQLNonNull(new GraphQLList(new GraphQLNonNull(_Enum))) },
-		entities: { type: new GraphQLNonNull(new GraphQLList(new GraphQLNonNull(_Entity))) },
-	},
-})
-
-
-const createSchemaConfig = (resolver?: GraphQLFieldResolver<any, any>): GraphQLSchemaConfig => {
-	return {
-		query: new GraphQLObjectType({
-			name: 'Query',
-			fields: {
-				schema: {
-					type: _Schema,
-					resolve: resolver,
-				},
-			},
-		}),
-		types: [_Column, _Relation],
-	}
-}
-
-
-export default new GraphQLSchema(createSchemaConfig())
+import { createSchemaConfig } from './introspection.schema'
 
 export class IntrospectionSchemaDefinitionFactory {
 	constructor(private readonly introspectionSchemaFactory: IntrospectionSchemaFactory) {}

package/src/introspection/index.ts

@@ -1,3 +1,4 @@
 export * as ContentSchemaTypes from './content-schema.types'
-export { IntrospectionSchemaDefinitionFactory, default as ContentSchema } from './IntrospectionSchemaDefinitionFactory'
+export { IntrospectionSchemaDefinitionFactory } from './IntrospectionSchemaDefinitionFactory'
+export { default as ContentSchema } from './introspection.schema'
 export * from './IntrospectionSchemaFactory'

package/src/introspection/introspection.schema.ts

@@ -0,0 +1,194 @@
+import { JSONType } from '@contember/graphql-utils'
+
+import {
+	GraphQLBoolean,
+	GraphQLEnumType,
+	GraphQLFieldResolver,
+	GraphQLInt,
+	GraphQLInterfaceType,
+	GraphQLList,
+	GraphQLNonNull,
+	GraphQLObjectType,
+	GraphQLSchema,
+	GraphQLSchemaConfig,
+	GraphQLString,
+	GraphQLUnionType,
+} from 'graphql'
+
+const _RuleMessage = new GraphQLObjectType({
+	name: '_RuleMessage',
+	fields: {
+		text: { type: GraphQLString },
+	},
+})
+
+const _ValidatorArgument = new GraphQLObjectType({
+	name: '_ValidatorArgument',
+	fields: {
+		validator: { type: new GraphQLNonNull(GraphQLInt) },
+	},
+})
+
+const _PathArgument = new GraphQLObjectType({
+	name: '_PathArgument',
+	fields: {
+		path: { type: new GraphQLNonNull(new GraphQLList(new GraphQLNonNull(GraphQLString))) },
+	},
+})
+
+const _LiteralArgument = new GraphQLObjectType({
+	name: '_LiteralArgument',
+	fields: {
+		value: { type: JSONType },
+	},
+})
+
+const _Argument = new GraphQLUnionType({
+	name: '_Argument',
+	types: [_ValidatorArgument, _PathArgument, _LiteralArgument],
+})
+
+const _Validator = new GraphQLObjectType({
+	name: '_Validator',
+	fields: {
+		operation: { type: new GraphQLNonNull(GraphQLString) },
+		arguments: { type: new GraphQLNonNull(new GraphQLList(new GraphQLNonNull(_Argument))) },
+	},
+})
+
+const _Rule = new GraphQLObjectType({
+	name: '_Rule',
+	fields: {
+		message: { type: _RuleMessage },
+		validator: { type: new GraphQLNonNull(GraphQLInt) },
+	},
+})
+
+const _FieldInterface = new GraphQLInterfaceType({
+	name: '_Field',
+	fields: {
+		name: { type: new GraphQLNonNull(GraphQLString) },
+		type: { type: new GraphQLNonNull(GraphQLString) },
+		nullable: { type: GraphQLBoolean },
+		rules: { type: new GraphQLNonNull(new GraphQLList(new GraphQLNonNull(_Rule))) },
+		validators: { type: new GraphQLNonNull(new GraphQLList(new GraphQLNonNull(_Validator))) },
+	},
+})
+
+const _OrderByDirection = new GraphQLEnumType({
+	name: '_OrderByDirection',
+	values: {
+		asc: {},
+		desc: {},
+	},
+})
+
+const _OrderBy = new GraphQLObjectType({
+	name: '_OrderBy',
+	fields: {
+		path: { type: new GraphQLNonNull(new GraphQLList(new GraphQLNonNull(GraphQLString))) },
+		direction: { type: new GraphQLNonNull(_OrderByDirection) },
+	},
+})
+
+const _OnDeleteBehaviour = new GraphQLEnumType({
+	name: '_OnDeleteBehaviour',
+	values: {
+		restrict: {},
+		cascade: {},
+		setNull: {},
+	},
+})
+
+const _RelationSide = new GraphQLEnumType({
+	name: '_RelationSide',
+	values: {
+		owning: {},
+		inverse: {},
+	},
+})
+
+const _Relation = new GraphQLObjectType({
+	name: '_Relation',
+	interfaces: [_FieldInterface],
+	fields: {
+		name: { type: new GraphQLNonNull(GraphQLString) },
+		type: { type: new GraphQLNonNull(GraphQLString) },
+		side: { type: new GraphQLNonNull(_RelationSide) },
+		targetEntity: { type: new GraphQLNonNull(GraphQLString) },
+		ownedBy: { type: GraphQLString },
+		inversedBy: { type: GraphQLString },
+		nullable: { type: GraphQLBoolean },
+		onDelete: { type: _OnDeleteBehaviour },
+		orphanRemoval: { type: GraphQLBoolean },
+		orderBy: { type: new GraphQLList(new GraphQLNonNull(_OrderBy)) },
+		rules: { type: new GraphQLNonNull(new GraphQLList(new GraphQLNonNull(_Rule))) },
+		validators: { type: new GraphQLNonNull(new GraphQLList(new GraphQLNonNull(_Validator))) },
+	},
+})
+
+const _Column = new GraphQLObjectType({
+	name: '_Column',
+	interfaces: [_FieldInterface],
+	fields: {
+		name: { type: new GraphQLNonNull(GraphQLString) },
+		type: { type: new GraphQLNonNull(GraphQLString) },
+		enumName: { type: GraphQLString },
+		defaultValue: { type: JSONType },
+		nullable: { type: new GraphQLNonNull(GraphQLBoolean) },
+		rules: { type: new GraphQLNonNull(new GraphQLList(new GraphQLNonNull(_Rule))) },
+		validators: { type: new GraphQLNonNull(new GraphQLList(new GraphQLNonNull(_Validator))) },
+	},
+})
+
+const _UniqueConstraint = new GraphQLObjectType({
+	name: '_UniqueConstraint',
+	fields: {
+		fields: { type: new GraphQLNonNull(new GraphQLList(new GraphQLNonNull(GraphQLString))) },
+	},
+})
+
+const _Entity = new GraphQLObjectType({
+	name: '_Entity',
+	fields: {
+		name: { type: new GraphQLNonNull(GraphQLString) },
+		customPrimaryAllowed: { type: new GraphQLNonNull(GraphQLBoolean) },
+		fields: { type: new GraphQLNonNull(new GraphQLList(new GraphQLNonNull(_FieldInterface))) },
+		unique: { type: new GraphQLNonNull(new GraphQLList(new GraphQLNonNull(_UniqueConstraint))) },
+	},
+})
+
+const _Enum = new GraphQLObjectType({
+	name: '_Enum',
+	fields: {
+		name: { type: new GraphQLNonNull(GraphQLString) },
+		values: { type: new GraphQLNonNull(new GraphQLList(new GraphQLNonNull(GraphQLString))) },
+	},
+})
+
+const _Schema = new GraphQLObjectType({
+	name: '_Schema',
+	fields: {
+		enums: { type: new GraphQLNonNull(new GraphQLList(new GraphQLNonNull(_Enum))) },
+		entities: { type: new GraphQLNonNull(new GraphQLList(new GraphQLNonNull(_Entity))) },
+	},
+})
+
+
+export const createSchemaConfig = (resolver?: GraphQLFieldResolver<any, any>): GraphQLSchemaConfig => {
+	return {
+		query: new GraphQLObjectType({
+			name: 'Query',
+			fields: {
+				schema: {
+					type: _Schema,
+					resolve: resolver,
+				},
+			},
+		}),
+		types: [_Column, _Relation],
+	}
+}
+
+
+export default new GraphQLSchema(createSchemaConfig())