@contember/cli 2.0.0-alpha.19 → 2.0.0-alpha.21

package/package.json

@@ -1,37 +1,37 @@
 {
   "name": "@contember/cli",
-  "version": "2.0.0-alpha.19",
+  "version": "2.0.0-alpha.21",
   "license": "Apache-2.0",
   "bin": {
     "contember": "./dist/production/run.js"
   },
   "scripts": {
-    "build": "tailwindcss -i src/lib/project/docs/resources/style.css -o ./dist/src/utils/project/resources/out.css"
+    "build": "tailwindcss -i src/lib/project/docs/resources/style.css -o ./dist/resources/out.css"
   },
   "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.19",
-    "@contember/config-loader": "2.0.0-alpha.19",
-    "@contember/database": "2.0.0-alpha.19",
-    "@contember/dic": "2.0.0-alpha.19",
-    "@contember/engine-common": "2.0.0-alpha.19",
-    "@contember/engine-content-api": "2.0.0-alpha.19",
-    "@contember/graphql-client": "2.0.0-alpha.19",
-    "@contember/migrations-client": "2.0.0-alpha.19",
-    "@contember/schema": "2.0.0-alpha.19",
-    "@contember/schema-migrations": "2.0.0-alpha.19",
-    "@contember/schema-utils": "2.0.0-alpha.19",
-    "@contember/typesafe": "2.0.0-alpha.19",
-    "@graphql-tools/schema": "^10.0.6",
+    "@contember/cli-common": "2.0.0-alpha.21",
+    "@contember/config-loader": "2.0.0-alpha.21",
+    "@contember/database": "2.0.0-alpha.21",
+    "@contember/dic": "2.0.0-alpha.21",
+    "@contember/engine-common": "2.0.0-alpha.21",
+    "@contember/engine-content-api": "2.0.0-alpha.21",
+    "@contember/graphql-client": "2.0.0-alpha.21",
+    "@contember/migrations-client": "2.0.0-alpha.21",
+    "@contember/schema": "2.0.0-alpha.21",
+    "@contember/schema-migrations": "2.0.0-alpha.21",
+    "@contember/schema-utils": "2.0.0-alpha.21",
+    "@contember/typesafe": "2.0.0-alpha.21",
+    "@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/deploy/DeployCommand.ts

@@ -50,24 +50,25 @@ export class DeployCommand extends Command<Args, Options> {
 	protected async execute(input: Input<Args, Options>): Promise<void | number> {
 
 		const dsn = input.getArgument('dsn')
-		const remoteProject = this.remoteProjectResolver.resolve(dsn)
+		const adminEndpoint = input.getOption('admin')
+		const remoteProject = this.remoteProjectResolver.resolve(dsn, adminEndpoint)
 		if (!remoteProject) {
 			throw `Project not defined. Please provide DSN or environment variables CONTEMBER_*`
 		}
 		this.remoteProjectProvider.setRemoteProject(remoteProject)
 
-		let adminEndpoint = input.getOption('admin')
 		const deployMigration = input.getOption('no-migrations') !== true
 		const yes = input.getOption('yes') === true
 		const projectAdminDistDir = this.workspace.adminDistDir
-		const deployAdmin = input.getOption('no-admin') !== true && !!adminEndpoint && !!projectAdminDistDir
+
+		const deployAdmin = input.getOption('no-admin') !== true && !!remoteProject.adminEndpoint && !!projectAdminDistDir
 
 
 		console.log('')
 		console.log('Contember project deployment configuration:')
 		console.log(`Target project name: ${remoteProject.name}`)
 		console.log(`API URL: ${remoteProject.endpoint}`)
-		console.log(`Admin URL: ${adminEndpoint ?? 'none'}`)
+		console.log(`Admin URL: ${remoteProject.adminEndpoint ?? 'none'}`)
 		console.log(`Deploy token: ${maskToken(remoteProject.token)}`)
 		console.log('')
 
@@ -113,7 +114,7 @@ export class DeployCommand extends Command<Args, Options> {
 		console.log('')
 		console.log('Deployment successful')
 		console.log(`API URL: ${remoteProject.endpoint}`)
-		console.log(`Admin URL: ${adminEndpoint ?? 'none'}`)
+		console.log(`Admin URL: ${remoteProject.adminEndpoint ?? 'none'}`)
 
 		return 0
 	}

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/admin/AdminClient.ts

@@ -14,7 +14,7 @@ export class AdminClient {
 		if (!response.ok) {
 			const project = this.remoteProjectProvider.get()
 			const maskedToken = maskToken(project.token)
-			throw `Failed to deploy admin, POST request to ${project.endpoint}/_deploy with token ${maskedToken} returned status ${response.status} ${response.statusText}\n${await response.text()}`
+			throw `Failed to deploy admin, POST request to ${project.adminEndpoint}/_deploy with token ${maskedToken} returned status ${response.status} ${response.statusText}\n${await response.text()}`
 		}
 	}
 

package/src/lib/project/RemoteProjectResolver.ts

@@ -8,7 +8,7 @@ export class RemoteProjectResolver {
 	) {
 	}
 
-	resolve(identifier?: string): RemoteProject | undefined {
+	resolve(identifier?: string, adminEndpoint?: string): RemoteProject | undefined {
 		let endpoint: string | undefined
 		let token: string | undefined
 		let project: string | undefined
@@ -25,6 +25,11 @@ export class RemoteProjectResolver {
 			return undefined
 		}
 
-		return new RemoteProject(project, endpoint, token)
+		if (!adminEndpoint && (endpoint.endsWith('.contember.cloud') || !endpoint.includes('://api-'))) {
+			adminEndpoint = endpoint
+			endpoint += '/_api'
+		}
+
+		return new RemoteProject(project, endpoint, token, adminEndpoint)
 	}
 }

package/src/lib/project/docs/projectDescribe.tsx

@@ -3,13 +3,12 @@ import { h } from 'preact'
 import render from 'preact-render-to-string'
 import { ProjectInfo } from './components/ProjectInfo'
 import { readFile } from 'node:fs/promises'
-import { dirname } from 'node:path'
-import { fileURLToPath } from 'node:url'
+import { packageRoot } from '../../../consts'
 
 export const renderProjectInfoHtml = async (schema: Schema, projectName: string) => {
 	const html = render(<ProjectInfo schema={schema} projectName={projectName} />)
 
-	const css = await readFile(dirname(fileURLToPath(import.meta.url)) + '/resources/out.css')
+	const css = await readFile(packageRoot + '/dist/resources/out.css')
 	return `<!DOCTYPE html>
 <html lang="en">
 <head>

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 }],
 			}),
 		})
 	}