@contember/cli 1.4.0-rc.1 → 1.4.0-rc.3

package/dist/src/utils/yaml.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateYaml = void 0;
 const cli_common_1 = require("@contember/cli-common");
-const cjs_1 = __importDefault(require("yawn-yaml/cjs"));
+const yawn_yaml_1 = __importDefault(require("yawn-yaml"));
 const config_loader_1 = require("@contember/config-loader");
 const js_yaml_1 = __importDefault(require("js-yaml"));
 const promises_1 = require("node:fs/promises");
@@ -20,7 +20,7 @@ const updateYaml = async (path, updater, options = {}) => {
     let newConfig = '';
     const mergeUtils = { merge: (a, b) => config_loader_1.Merger.merge(a, b) };
     if (config) {
-        const yawn = new cjs_1.default(config);
+        const yawn = new yawn_yaml_1.default(config);
         yawn.json = updater(yawn.json, mergeUtils);
         newConfig = yawn.yaml;
     }

package/dist/src/utils/yaml.js.map

@@ -1 +1 @@
-{"version":3,"file":"yaml.js","sourceRoot":"","sources":["../../../src/utils/yaml.ts"],"names":[],"mappings":";;;;;;AAAA,sDAA6E;AAC7E,wDAAgC;AAChC,4DAAiD;AACjD,sDAA4B;AAC5B,+CAAsD;AAO/C,MAAM,UAAU,GAAG,KAAK,EAC9B,IAAY,EACZ,OAAkC,EAClC,UAAuC,EAAE,EACxC,EAAE;IACH,IAAI,MAAM,GAAG,EAAE,CAAA;IACf,IAAI,MAAM,IAAA,uBAAU,EAAC,IAAI,CAAC,EAAE;QAC3B,MAAM,GAAG,MAAM,IAAA,mBAAQ,EAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAA;KACnD;SAAM,IAAI,OAAO,CAAC,aAAa,KAAK,IAAI,EAAE;QAC1C,MAAM,IAAI,KAAK,CAAC,QAAQ,IAAI,kBAAkB,CAAC,CAAA;KAC/C;IAED,IAAI,SAAS,GAAG,EAAE,CAAA;IAClB,MAAM,UAAU,GAAG,EAAE,KAAK,EAAE,CAAC,CAAa,EAAE,CAAa,EAAE,EAAE,CAAC,sBAAM,CAAC,KAAK,CAAgB,CAAC,EAAE,CAAC,CAAC,EAAE,CAAA;IACjG,IAAI,MAAM,EAAE;QACX,MAAM,IAAI,GAAG,IAAI,aAAI,CAAC,MAAM,CAAC,CAAA;QAC7B,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,CAAA;QAC1C,SAAS,GAAG,IAAI,CAAC,IAAI,CAAA;KACrB;SAAM;QACN,SAAS,GAAG,iBAAM,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC,CAAA;KAChD;IAED,MAAM,IAAA,oBAAS,EAAC,IAAI,EAAE,SAAS,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAA;AACvD,CAAC,CAAA;AAvBY,QAAA,UAAU,cAuBtB"}
+{"version":3,"file":"yaml.js","sourceRoot":"","sources":["../../../src/utils/yaml.ts"],"names":[],"mappings":";;;;;;AAAA,sDAA6E;AAC7E,0DAA4B;AAC5B,4DAAiD;AACjD,sDAA4B;AAC5B,+CAAsD;AAO/C,MAAM,UAAU,GAAG,KAAK,EAC9B,IAAY,EACZ,OAAkC,EAClC,UAAuC,EAAE,EACxC,EAAE;IACH,IAAI,MAAM,GAAG,EAAE,CAAA;IACf,IAAI,MAAM,IAAA,uBAAU,EAAC,IAAI,CAAC,EAAE;QAC3B,MAAM,GAAG,MAAM,IAAA,mBAAQ,EAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAA;KACnD;SAAM,IAAI,OAAO,CAAC,aAAa,KAAK,IAAI,EAAE;QAC1C,MAAM,IAAI,KAAK,CAAC,QAAQ,IAAI,kBAAkB,CAAC,CAAA;KAC/C;IAED,IAAI,SAAS,GAAG,EAAE,CAAA;IAClB,MAAM,UAAU,GAAG,EAAE,KAAK,EAAE,CAAC,CAAa,EAAE,CAAa,EAAE,EAAE,CAAC,sBAAM,CAAC,KAAK,CAAgB,CAAC,EAAE,CAAC,CAAC,EAAE,CAAA;IACjG,IAAI,MAAM,EAAE;QACX,MAAM,IAAI,GAAG,IAAI,mBAAI,CAAC,MAAM,CAAC,CAAA;QAC7B,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,CAAA;QAC1C,SAAS,GAAG,IAAI,CAAC,IAAI,CAAA;KACrB;SAAM;QACN,SAAS,GAAG,iBAAM,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC,CAAA;KAChD;IAED,MAAM,IAAA,oBAAS,EAAC,IAAI,EAAE,SAAS,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAA;AACvD,CAAC,CAAA;AAvBY,QAAA,UAAU,cAuBtB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contember/cli",
-  "version": "1.4.0-rc.1",
+  "version": "1.4.0-rc.3",
   "license": "Apache-2.0",
   "bin": {
     "contember": "./dist/src/run.js"
@@ -20,15 +20,15 @@
     "tailwindcss": "^3.3.5"
   },
   "dependencies": {
-    "@contember/cli-common": "1.4.0-rc.1",
-    "@contember/config-loader": "1.4.0-rc.1",
-    "@contember/database": "1.4.0-rc.1",
-    "@contember/dic": "1.4.0-rc.1",
-    "@contember/engine-content-api": "1.4.0-rc.1",
-    "@contember/migrations-client": "1.4.0-rc.1",
-    "@contember/schema": "1.4.0-rc.1",
-    "@contember/schema-migrations": "1.4.0-rc.1",
-    "@contember/schema-utils": "1.4.0-rc.1",
+    "@contember/cli-common": "1.4.0-rc.3",
+    "@contember/config-loader": "1.4.0-rc.3",
+    "@contember/database": "1.4.0-rc.3",
+    "@contember/dic": "1.4.0-rc.3",
+    "@contember/engine-content-api": "1.4.0-rc.3",
+    "@contember/migrations-client": "1.4.0-rc.3",
+    "@contember/schema": "1.4.0-rc.3",
+    "@contember/schema-migrations": "1.4.0-rc.3",
+    "@contember/schema-utils": "1.4.0-rc.3",
     "@graphql-tools/schema": "^10.0.0",
     "chalk": "^4.1.2",
     "chalk-table": "^1.0.2",
@@ -41,6 +41,6 @@
     "preact-render-to-string": "^6.3.1",
     "prompts": "^2.4.2",
     "semver": "^7.5.4",
-    "yawn-yaml": "^1.5.0"
+    "yawn-yaml": "^2.2.0"
   }
 }

package/src/commands/transfer/ExportCommand.ts

@@ -4,13 +4,17 @@ import { dataExport, resolveProject } from './utils'
 import { maskToken } from '../../utils/token'
 import { pipeline } from 'node:stream/promises'
 import { printProgressLine } from '../../utils/stdio'
+import { createGunzip, createGzip } from 'node:zlib'
 
 type Args = {
 	source?: string
 }
 type Options = {
 	'include-system'?: boolean
+	/** @deprecated */
 	'no-gzip'?: boolean
+	'no-gzip-output'?: boolean
+	'no-gzip-transfer'?: boolean
 	output?: string
 }
 
@@ -28,7 +32,9 @@ export class ExportCommand extends Command<Args, Options> {
 			from.optional()
 		}
 		configuration.option('include-system').valueNone()
-		configuration.option('no-gzip').valueNone()
+		configuration.option('no-gzip').valueNone().deprecated()
+		configuration.option('no-gzip-transfer').valueNone()
+		configuration.option('no-gzip-output').valueNone()
 		configuration.option('output').valueRequired()
 	}
 
@@ -43,10 +49,16 @@ export class ExportCommand extends Command<Args, Options> {
 		console.log(`API URL: ${project.baseUrl}`)
 		console.log(`Token: ${maskToken(project.token)}`)
 
-		const noGzip = input.getOption('no-gzip') === true
+		const gzipOutput = !input.getOption('no-gzip-output') && !input.getOption('no-gzip')
+		const gzipTransfer = !input.getOption('no-gzip-transfer')
+
 		const includeSystem = input.getOption('include-system') === true
 
-		const response = await dataExport({ project, includeSystem, noGzip })
+		const response = await dataExport({
+			project,
+			includeSystem,
+			gzip: gzipTransfer,
+		})
 
 		let transferred = 0
 		let start = Date.now()
@@ -62,11 +74,16 @@ export class ExportCommand extends Command<Args, Options> {
 			}
 		})
 
-		const fileName = input.getOption('output') ?? `${project.project}.jsonl${noGzip ? '' : '.gz'}`
+		const fileName = input.getOption('output') ?? `${project.project}.jsonl${gzipOutput ? '.gz' : ''}`
 		const fileStream = createWriteStream(fileName)
 
-		await pipeline(response, fileStream)
+		const responseStream = gzipOutput === gzipTransfer
+			? response
+			: response.pipe(gzipOutput ? createGzip() : createGunzip())
+
+		await pipeline(responseStream, fileStream)
 
 		console.log('\nExport done.')
+		console.log(`Data saved to ${fileName}`)
 	}
 }

package/src/commands/transfer/ImportCommand.ts

@@ -12,6 +12,7 @@ type Args = {
 }
 type Options = {
 	'yes': boolean
+	'no-gzip-transfer'?: boolean
 }
 
 export class ImportCommand extends Command<Args, Options> {
@@ -28,6 +29,7 @@ export class ImportCommand extends Command<Args, Options> {
 		if (this.workspace.isSingleProjectMode()) {
 			from.optional()
 		}
+		configuration.option('no-gzip-transfer').valueNone()
 		configuration.option('yes').valueNone()
 	}
 
@@ -47,7 +49,13 @@ export class ImportCommand extends Command<Args, Options> {
 		const file = input.getArgument('file')
 		const baseInputStream = createReadStream(file)
 		const stream = (file.endsWith('.gz') ? baseInputStream.pipe(createGunzip()) : baseInputStream)
-		const response = await dataImport({ stream: stream, project, printProgress: printProgressLine })
+		const gzipTransfer = !input.getOption('no-gzip-transfer')
+		const response = await dataImport({
+			stream: stream,
+			project,
+			printProgress: printProgressLine,
+			gzip: gzipTransfer,
+		})
 		console.log('')
 		const responseData = JSON.parse((await readStream(response)).toString())
 		if (responseData.ok) {

package/src/commands/transfer/TransferCommand.ts

@@ -3,6 +3,7 @@ import { confirmImport, dataExport, dataImport, resolveProject } from './utils'
 import { maskToken } from '../../utils/token'
 import { printProgressLine } from '../../utils/stdio'
 import { readStream } from '../../utils/stream'
+import { createGunzip } from 'node:zlib'
 
 type Args = {
 	source: string
@@ -10,6 +11,7 @@ type Args = {
 }
 type Options = {
 	'include-system'?: boolean
+	'no-gzip-transfer'?: boolean
 	yes: boolean
 }
 
@@ -28,6 +30,7 @@ export class TransferCommand extends Command<Args, Options> {
 			target.optional()
 		}
 		configuration.option('include-system').valueNone()
+		configuration.option('no-gzip-transfer').valueNone()
 		configuration.option('yes').valueNone()
 	}
 
@@ -54,9 +57,14 @@ export class TransferCommand extends Command<Args, Options> {
 		}
 
 		const includeSystem = input.getOption('include-system') === true
-		const exportResponse = (await dataExport({ project: sourceProject, includeSystem, noGzip: true }))
+		const gzipTransfer = !input.getOption('no-gzip-transfer')
+		const exportResponse = (await dataExport({ project: sourceProject, includeSystem, gzip: gzipTransfer }))
+		const ungzipedResponse = gzipTransfer ? exportResponse.pipe(createGunzip()) : exportResponse
 		const importResponse = await dataImport({
-			stream: exportResponse, project: targetProject, printProgress: printProgressLine,
+			stream: ungzipedResponse,
+			project: targetProject,
+			printProgress: printProgressLine,
+			gzip: gzipTransfer,
 		})
 		console.log('')
 

package/src/commands/transfer/utils.ts

@@ -7,6 +7,7 @@ import { parseDsn } from '../../utils/dsn'
 import { interactiveResolveInstanceEnvironmentFromInput } from '../../utils/instance'
 import { interactiveResolveApiToken } from '../../utils/tenant'
 import prompts from 'prompts'
+import { createGzip } from 'node:zlib'
 
 export type ProjectEndpoint = {
 	token: string
@@ -30,7 +31,7 @@ export const resolveProject = async ({ projectOrDsn, workspace }: { projectOrDsn
 
 }
 
-export const dataImport = async ({ printProgress, stream, project: { project, token, baseUrl } }: { stream: Readable; project: ProjectEndpoint; printProgress: (message: string) => void }) => {
+export const dataImport = async ({ printProgress, stream, project: { project, token, baseUrl }, gzip }: { stream: Readable; project: ProjectEndpoint; printProgress: (message: string) => void; gzip: boolean }) => {
 	let table = ''
 	let rowCount = 0
 	let rowTotal = 0
@@ -71,17 +72,18 @@ export const dataImport = async ({ printProgress, stream, project: { project, to
 		token,
 		headers: {
 			'Content-type': 'application/x-ndjson',
+			...(gzip ? { 'Content-Encoding': 'gzip' } : {}),
 		},
-		body: inputStream,
+		body: gzip ? inputStream.pipe(createGzip()) : inputStream,
 	})
 }
 
-export const dataExport = async ({ project: { project, token, baseUrl }, noGzip, includeSystem }: { project: ProjectEndpoint; includeSystem: boolean; noGzip: boolean }) => {
+export const dataExport = async ({ project: { project, token, baseUrl }, gzip, includeSystem }: { project: ProjectEndpoint; includeSystem: boolean; gzip: boolean }) => {
 	return await executeRequest({
 		url: `${baseUrl}/export`,
 		token,
 		headers: {
-			'Accept-Encoding': noGzip ? 'identity' : 'gzip',
+			'Accept-Encoding': gzip ? 'gzip' : 'identity',
 			'Content-type': 'application/json',
 		},
 		body: JSON.stringify({

package/src/utils/yaml.ts

@@ -1,5 +1,5 @@
 import { JSONObject, JSONPrimitive, pathExists } from '@contember/cli-common'
-import YAWN from 'yawn-yaml/cjs'
+import YAWN from 'yawn-yaml'
 import { Merger } from '@contember/config-loader'
 import jsyaml from 'js-yaml'
 import { readFile, writeFile } from 'node:fs/promises'

package/types/yawn-yaml/index.d.ts

@@ -1,7 +0,0 @@
-declare module 'yawn-yaml/cjs' {
-	export default class YAWN {
-		json: any
-		readonly yaml: string
-		constructor(yaml: string)
-	}
-}