@contember/engine-system-api 2.0.0-alpha.15 → 2.0.0-alpha.17

package/graphql.codegen.yml

@@ -19,4 +19,4 @@ generates:
       - "typescript-resolvers"
 hooks:
   afterAllFileWrite:
-    - eslint --fix
+    - yarn run -T eslint --fix

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contember/engine-system-api",
-  "version": "2.0.0-alpha.15",
+  "version": "2.0.0-alpha.17",
   "license": "Apache-2.0",
   "main": "./dist/production/index.js",
   "typings": "./dist/types/index.d.ts",
@@ -22,32 +22,25 @@
       }
     }
   },
-  "scripts": {
-    "generate": "gql-gen --config graphql.codegen.yml"
-  },
   "dependencies": {
-    "@contember/authorization": "2.0.0-alpha.15",
-    "@contember/database": "2.0.0-alpha.15",
-    "@contember/database-migrations": "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/queryable": "2.0.0-alpha.15",
-    "@contember/schema": "2.0.0-alpha.15",
-    "@contember/schema-migrations": "2.0.0-alpha.15",
-    "@contember/schema-utils": "2.0.0-alpha.15",
-    "@graphql-tools/utils": "^10.0.8",
+    "@contember/authorization": "2.0.0-alpha.17",
+    "@contember/database": "2.0.0-alpha.17",
+    "@contember/database-migrations": "2.0.0-alpha.17",
+    "@contember/dic": "2.0.0-alpha.17",
+    "@contember/graphql-utils": "2.0.0-alpha.17",
+    "@contember/logger": "2.0.0-alpha.17",
+    "@contember/queryable": "2.0.0-alpha.17",
+    "@contember/schema": "2.0.0-alpha.17",
+    "@contember/schema-migrations": "2.0.0-alpha.17",
+    "@contember/schema-utils": "2.0.0-alpha.17",
+    "@graphql-tools/utils": "^10.5.4",
     "graphql-tag": "^2.12.6"
   },
   "devDependencies": {
-    "@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/schema-definition": "2.0.0-alpha.17",
+    "@types/node": "^20.16.5",
+    "graphql": "^16.9.0",
+    "pg": "^8.12.0"
   },
   "peerDependencies": {
     "graphql": ">= 14.6.0",

package/src/migrations/2024-06-28-153001-schema-init.ts

@@ -8,5 +8,5 @@ export default async function (builder: MigrationBuilder, args: MigrationArgs<Sy
 		return
 	}
 	builder.sql(`INSERT INTO schema(schema, checksum, version, migration_id) 
-VALUES(${escapeValue(JSON.stringify(schema))}, ${escapeValue(schema.meta.checksum)}, ${escapeValue(schema.meta.version)}, ${schema.meta.id})`)
+VALUES(${escapeValue(JSON.stringify(schema.schema))}, ${escapeValue(schema.meta.checksum)}, ${escapeValue(schema.meta.version)}, ${schema.meta.id})`)
 }

package/src/migrations/snapshot-factory.ts

@@ -10,7 +10,7 @@ export const snapshotMigration = (sqlFactory: (args: { randomUuidFn: string }) =
             WHERE pg_namespace.nspname = 'pg_catalog' AND pg_proc.proname = 'gen_random_uuid'
 		`)
 		let randomUuidFn: string = 'uuid_generate_v4'
-		if (hasGenRandomUuid.rowCount > 0) {
+		if ((hasGenRandomUuid.rowCount ?? 0) > 0) {
 			randomUuidFn = 'gen_random_uuid'
 		} else {
 			const hasUuidGenV4 = await args.connection.query(`

package/src/schema/types.ts

@@ -14,10 +14,10 @@ export type Scalars = {
 	Boolean: { input: boolean; output: boolean }
 	Int: { input: number; output: number }
 	Float: { input: number; output: number }
-	Schema: { input: any; output: any }
 	DateTime: { input: Date; output: Date }
 	Json: { input: unknown; output: unknown }
 	PrimaryKey: { input: string | number; output: string | number }
+	Schema: { input: any; output: any }
 }
 
 export type ContentMigration = {
@@ -368,7 +368,7 @@ export type DirectiveResolverFn<TResult = {}, TParent = {}, TContext = {}, TArgs
 
 
 /** Mapping of interface types */
-export type ResolversInterfaceTypes<RefType extends Record<string, unknown>> = {
+export type ResolversInterfaceTypes<_RefType extends Record<string, unknown>> = {
 	Event: (CreateEvent) | (DeleteEvent) | (UpdateEvent)
 }
 
@@ -376,7 +376,6 @@ export type ResolversInterfaceTypes<RefType extends Record<string, unknown>> = {
 export type ResolversTypes = {
 	Boolean: ResolverTypeWrapper<Scalars['Boolean']['output']>
 	ContentMigration: ContentMigration
-	Schema: ResolverTypeWrapper<Scalars['Schema']['output']>
 	CreateEvent: ResolverTypeWrapper<CreateEvent>
 	DateTime: ResolverTypeWrapper<Scalars['DateTime']['output']>
 	DeleteEvent: ResolverTypeWrapper<DeleteEvent>
@@ -407,6 +406,7 @@ export type ResolversTypes = {
 	Mutation: ResolverTypeWrapper<{}>
 	PrimaryKey: ResolverTypeWrapper<Scalars['PrimaryKey']['output']>
 	Query: ResolverTypeWrapper<{}>
+	Schema: ResolverTypeWrapper<Scalars['Schema']['output']>
 	SchemaMigration: SchemaMigration
 	Stage: ResolverTypeWrapper<Stage>
 	String: ResolverTypeWrapper<Scalars['String']['output']>
@@ -418,7 +418,6 @@ export type ResolversTypes = {
 export type ResolversParentTypes = {
 	Boolean: Scalars['Boolean']['output']
 	ContentMigration: ContentMigration
-	Schema: Scalars['Schema']['output']
 	CreateEvent: CreateEvent
 	DateTime: Scalars['DateTime']['output']
 	DeleteEvent: DeleteEvent
@@ -443,6 +442,7 @@ export type ResolversParentTypes = {
 	Mutation: {}
 	PrimaryKey: Scalars['PrimaryKey']['output']
 	Query: {}
+	Schema: Scalars['Schema']['output']
 	SchemaMigration: SchemaMigration
 	Stage: Stage
 	String: Scalars['String']['output']
@@ -450,10 +450,6 @@ export type ResolversParentTypes = {
 	UpdateEvent: UpdateEvent
 }
 
-export interface SchemaScalarConfig extends GraphQLScalarTypeConfig<ResolversTypes['Schema'], any> {
-	name: 'Schema'
-}
-
 export type CreateEventResolvers<ContextType = any, ParentType extends ResolversParentTypes['CreateEvent'] = ResolversParentTypes['CreateEvent']> = {
 	appliedAt?: Resolver<ResolversTypes['DateTime'], ParentType, ContextType>
 	createdAt?: Resolver<ResolversTypes['DateTime'], ParentType, ContextType>
@@ -579,6 +575,10 @@ export type QueryResolvers<ContextType = any, ParentType extends ResolversParent
 	stages?: Resolver<ReadonlyArray<ResolversTypes['Stage']>, ParentType, ContextType>
 }
 
+export interface SchemaScalarConfig extends GraphQLScalarTypeConfig<ResolversTypes['Schema'], any> {
+	name: 'Schema'
+}
+
 export type StageResolvers<ContextType = any, ParentType extends ResolversParentTypes['Stage'] = ResolversParentTypes['Stage']> = {
 	id?: Resolver<ResolversTypes['String'], ParentType, ContextType>
 	name?: Resolver<ResolversTypes['String'], ParentType, ContextType>
@@ -608,7 +608,6 @@ export type UpdateEventResolvers<ContextType = any, ParentType extends Resolvers
 }
 
 export type Resolvers<ContextType = any> = {
-	Schema?: GraphQLScalarType
 	CreateEvent?: CreateEventResolvers<ContextType>
 	DateTime?: GraphQLScalarType
 	DeleteEvent?: DeleteEventResolvers<ContextType>
@@ -625,6 +624,7 @@ export type Resolvers<ContextType = any> = {
 	Mutation?: MutationResolvers<ContextType>
 	PrimaryKey?: GraphQLScalarType
 	Query?: QueryResolvers<ContextType>
+	Schema?: GraphQLScalarType
 	Stage?: StageResolvers<ContextType>
 	TruncateResponse?: TruncateResponseResolvers<ContextType>
 	UpdateEvent?: UpdateEventResolvers<ContextType>