@contember/cli 2.0.0-alpha.18 → 2.0.0-alpha.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contember/cli",
-  "version": "2.0.0-alpha.18",
+  "version": "2.0.0-alpha.20",
   "license": "Apache-2.0",
   "bin": {
     "contember": "./dist/production/run.js"
@@ -11,27 +11,27 @@
   "devDependencies": {
     "@types/fs-extra": "^11.0.4",
     "@types/js-yaml": "^4.0.9",
-    "@types/node": "^20.16.5",
+    "@types/node": "^20.16.11",
     "@types/prompts": "^2.4.9",
     "@types/semver": "^7.5.8",
     "autoprefixer": "^10.4.20",
-    "postcss": "^8.4.45",
-    "tailwindcss": "^3.4.10"
+    "postcss": "^8.4.47",
+    "tailwindcss": "^3.4.14"
   },
   "dependencies": {
-    "@contember/cli-common": "2.0.0-alpha.18",
-    "@contember/config-loader": "2.0.0-alpha.18",
-    "@contember/database": "2.0.0-alpha.18",
-    "@contember/dic": "2.0.0-alpha.18",
-    "@contember/engine-common": "2.0.0-alpha.18",
-    "@contember/engine-content-api": "2.0.0-alpha.18",
-    "@contember/graphql-client": "2.0.0-alpha.18",
-    "@contember/migrations-client": "2.0.0-alpha.18",
-    "@contember/schema": "2.0.0-alpha.18",
-    "@contember/schema-migrations": "2.0.0-alpha.18",
-    "@contember/schema-utils": "2.0.0-alpha.18",
-    "@contember/typesafe": "2.0.0-alpha.18",
-    "@graphql-tools/schema": "^10.0.6",
+    "@contember/cli-common": "2.0.0-alpha.20",
+    "@contember/config-loader": "2.0.0-alpha.20",
+    "@contember/database": "2.0.0-alpha.20",
+    "@contember/dic": "2.0.0-alpha.20",
+    "@contember/engine-common": "2.0.0-alpha.20",
+    "@contember/engine-content-api": "2.0.0-alpha.20",
+    "@contember/graphql-client": "2.0.0-alpha.20",
+    "@contember/migrations-client": "2.0.0-alpha.20",
+    "@contember/schema": "2.0.0-alpha.20",
+    "@contember/schema-migrations": "2.0.0-alpha.20",
+    "@contember/schema-utils": "2.0.0-alpha.20",
+    "@contember/typesafe": "2.0.0-alpha.20",
+    "@graphql-tools/schema": "^10.0.7",
     "chalk": "^5.3.0",
     "chalk-table": "^1.0.2",
     "esbuild": "^0.21.5",
@@ -41,7 +41,7 @@
     "lodash-es": "^4.17.21",
     "pg": "^8.12.0",
     "preact": "^10.23.2",
-    "preact-render-to-string": "^6.5.10",
+    "preact-render-to-string": "^6.5.11",
     "prompts": "^2.4.2",
     "semver": "^7.6.3",
     "yawn-yaml": "^2.3.0"

package/src/commands/project/ProjectPrintSchemaCommand.ts

@@ -9,7 +9,7 @@ import {
 } from '@contember/engine-content-api'
 import { printSchema } from 'graphql'
 import { mergeSchemas } from '@graphql-tools/schema'
-import { normalizeSchema } from '@contember/schema-utils'
+import { emptySchema, normalizeSchema } from '@contember/schema-utils'
 import { SchemaLoader } from '../../lib/schema/SchemaLoader'
 import { SchemaVersionBuilder } from '@contember/migrations-client'
 import { validateSchemaAndPrintErrors } from '../../lib/schema/SchemaValidationHelper'
@@ -22,6 +22,10 @@ type Options = {
 	normalize?: boolean
 	format?: 'graphql' | 'introspection' | 'schema'
 	source?: 'migrations' | 'definition'
+	['omit-acl']?: boolean
+	['omit-validation']?: boolean
+	['omit-actions']?: boolean
+	['omit-settings']?: boolean
 }
 
 export class ProjectPrintSchemaCommand extends Command<Args, Options> {
@@ -38,6 +42,10 @@ export class ProjectPrintSchemaCommand extends Command<Args, Options> {
 		configuration.option('source').valueRequired().description('migrations|definition')
 		configuration.option('role').valueArray()
 		configuration.option('normalize').valueNone()
+		configuration.option('omit-acl').valueNone()
+		configuration.option('omit-validation').valueNone()
+		configuration.option('omit-actions').valueNone()
+		configuration.option('omit-settings').valueNone()
 	}
 
 	protected async execute(input: Input<Args, Options>): Promise<number> {
@@ -48,13 +56,21 @@ export class ProjectPrintSchemaCommand extends Command<Args, Options> {
 			? await this.schemaVersionBuilder.buildSchema()
 			: await this.schemaLoader.loadSchema()
 
-		if (!validateSchemaAndPrintErrors(schema, 'Defined schema is invalid:')) {
+		const filteredSchema = {
+			model: schema.model,
+			acl: input.getOption('omit-acl') ? emptySchema.acl : schema.acl,
+			validation: input.getOption('omit-validation') ? emptySchema.validation : schema.validation,
+			actions: input.getOption('omit-actions') ? emptySchema.actions : schema.actions,
+			settings: input.getOption('omit-settings') ? emptySchema.settings : schema.settings,
+		}
+
+		if (!validateSchemaAndPrintErrors(filteredSchema, 'Defined schema is invalid:')) {
 			return 1
 		}
 
 		const permissionFactory = new PermissionFactory()
 		const inputRoles = input.getOption('role')
-		const schemaNormalized = input.getOption('normalize') ? normalizeSchema(schema) : schema
+		const schemaNormalized = input.getOption('normalize') ? normalizeSchema(filteredSchema) : filteredSchema
 		const permissions = permissionFactory.create(schemaNormalized, inputRoles || ['admin'])
 		const schemaBuilderFactory = new GraphQlSchemaBuilderFactory()
 		const authorizator = new Authorizator(permissions, schemaNormalized.acl.customPrimary ?? false)

package/src/commands/transfer/ExportCommand.ts

@@ -17,6 +17,7 @@ type Options = {
 	'no-gzip-output'?: boolean
 	'no-gzip-transfer'?: boolean
 	output?: string
+	'exclude-table'?: string[]
 }
 
 export class ExportCommand extends Command<Args, Options> {
@@ -35,6 +36,7 @@ export class ExportCommand extends Command<Args, Options> {
 		configuration.option('no-gzip-transfer').valueNone()
 		configuration.option('no-gzip-output').valueNone()
 		configuration.option('output').valueRequired()
+		configuration.option('exclude-table').valueArray()
 	}
 
 	protected async execute(input: Input<Args, Options>): Promise<void | number> {
@@ -58,6 +60,7 @@ export class ExportCommand extends Command<Args, Options> {
 
 		const response = await this.dataTransferClient.dataExport({
 			project,
+			excludeTables: input.getOption('exclude-table') ?? [],
 			includeSystem,
 			gzip: gzipTransfer,
 		})

package/src/commands/transfer/TransferCommand.ts

@@ -15,6 +15,7 @@ type Options = {
 	'include-system'?: boolean
 	'no-gzip-transfer'?: boolean
 	yes: boolean
+	'exclude-table'?: string[]
 }
 
 export class TransferCommand extends Command<Args, Options> {
@@ -32,6 +33,7 @@ export class TransferCommand extends Command<Args, Options> {
 		configuration.option('include-system').valueNone()
 		configuration.option('no-gzip-transfer').valueNone()
 		configuration.option('yes').valueNone()
+		configuration.option('exclude-table').valueArray()
 	}
 
 	protected async execute(input: Input<Args, Options>): Promise<void | number> {
@@ -68,6 +70,7 @@ export class TransferCommand extends Command<Args, Options> {
 		const exportResponse = (await this.dataTransferClient.dataExport({
 			project: sourceProject,
 			includeSystem,
+			excludeTables: input.getOption('exclude-table') ?? [],
 			gzip: gzipTransfer,
 		}))
 		const ungzipedResponse = gzipTransfer ? exportResponse.pipe(createGunzip()) : exportResponse

package/src/lib/tenant/TenantClient.ts

@@ -15,7 +15,7 @@ export class TenantClient {
 	constructor(private readonly apiClient: GraphQlClient) {}
 
 	public static create(url: string, apiToken: string): TenantClient {
-		const graphqlClient = new GraphQlClient(createTenantApiUrl(url), apiToken)
+		const graphqlClient = new GraphQlClient({ url: createTenantApiUrl(url), apiToken })
 		return new TenantClient(graphqlClient)
 	}
 

package/src/lib/transfer/DataTransferClient.ts

@@ -60,8 +60,9 @@ export class DataTransferClient {
 	}
 
 
-	dataExport = async ({ project: { name: project, token, endpoint: baseUrl }, gzip, includeSystem }: {
+	dataExport = async ({ project: { name: project, token, endpoint: baseUrl }, gzip, includeSystem, excludeTables }: {
 		project: RemoteProject
+		excludeTables?: string[]
 		includeSystem: boolean
 		gzip: boolean
 	}) => {
@@ -73,7 +74,7 @@ export class DataTransferClient {
 				'Content-type': 'application/json',
 			},
 			body: JSON.stringify({
-				projects: [{ slug: project, system: includeSystem }],
+				projects: [{ slug: project, system: includeSystem, excludeTables }],
 			}),
 		})
 	}