@contember/cli 2.1.0-rc.3 → 2.2.0-alpha.10

package/dist/production/src/commands/project/ProjectGenerateDocumentationCommand.js

@@ -1,13 +1,14 @@
-import { Command } from "@contember/cli-common";
+import { Command, CliError, ExitCode } from "@contember/cli-common";
 import { renderProjectInfoHtml } from "../../lib/project/docs/projectDescribe.js";
 import { writeFile } from "node:fs/promises";
 import { join } from "node:path";
 import { validateSchemaAndPrintErrors } from "../../lib/schema/SchemaValidationHelper.js";
 class ProjectGenerateDocumentationCommand extends Command {
-  constructor(schemaLoader, schemaVersionBuilder) {
+  constructor(schemaLoader, schemaVersionBuilder, renderDocumentation = renderProjectInfoHtml) {
     super();
     this.schemaLoader = schemaLoader;
     this.schemaVersionBuilder = schemaVersionBuilder;
+    this.renderDocumentation = renderDocumentation;
   }
   configure(configuration) {
     configuration.description("Generates HTML documentation from project schema");
@@ -15,21 +16,20 @@ class ProjectGenerateDocumentationCommand extends Command {
     configuration.option("output").valueRequired().description('file name or "-" for stdout');
     configuration.option("name").valueRequired().description("project name (for the title)");
   }
-  async execute(input) {
+  async execute(input, output) {
     const schema = input.getOption("source") === "migrations" ? await this.schemaVersionBuilder.buildSchema() : await this.schemaLoader.loadSchema();
-    if (!validateSchemaAndPrintErrors(schema, "Defined schema is invalid:")) {
-      return 1;
+    if (!validateSchemaAndPrintErrors(schema, "Defined schema is invalid:", void 0, output)) {
+      throw new CliError("Defined schema is invalid", { code: "SCHEMA_INVALID", exitCode: ExitCode.InputError });
     }
     const name = input.getOption("name") ?? "Contember project";
-    const html = await renderProjectInfoHtml(schema, name);
-    const output = input.getOption("output") ?? `${name.toLowerCase().replace(/\s+/g, "-")}.html`;
-    if (output === "-") {
-      console.log(html);
-    } else {
-      console.log(`Documentation saved to ${output}`);
-      await writeFile(join(process.cwd(), output), html);
+    const html = await this.renderDocumentation(schema, name);
+    const destination = input.getOption("output") ?? `${name.toLowerCase().replace(/\s+/g, "-")}.html`;
+    if (destination === "-") {
+      output.data(html, { human: (value) => value, quiet: () => destination });
+      return;
     }
-    return 0;
+    await writeFile(join(process.cwd(), destination), html);
+    output.data({ path: destination }, { human: (it) => `Documentation saved to ${it.path}`, quiet: (it) => it.path });
   }
 }
 export {

package/dist/production/src/commands/project/ProjectGenerateDocumentationCommand.js.map

@@ -1 +1 @@
-{"version":3,"file":"ProjectGenerateDocumentationCommand.js","sources":["../../../../../../packages/cli/src/commands/project/ProjectGenerateDocumentationCommand.ts"],"sourcesContent":["import { Command, CommandConfiguration, Input } from '@contember/cli-common'\nimport { renderProjectInfoHtml } from '../../lib/project/docs/projectDescribe'\nimport { writeFile } from 'node:fs/promises'\nimport { join } from 'node:path'\nimport { SchemaLoader } from '../../lib/schema/SchemaLoader'\nimport { validateSchemaAndPrintErrors } from '../../lib/schema/SchemaValidationHelper'\nimport { SchemaVersionBuilder } from '@contember/migrations-client'\n\ntype Args = {}\n\ntype Options = {\n\tsource?: 'migrations' | 'definition'\n\tname?: string\n\toutput?: string\n}\n\nexport class ProjectGenerateDocumentationCommand extends Command<Args, Options> {\n\tconstructor(\n\t\tprivate readonly schemaLoader: SchemaLoader,\n\t\tprivate readonly schemaVersionBuilder: SchemaVersionBuilder,\n\t) {\n\t\tsuper()\n\t}\n\n\tprotected configure(configuration: CommandConfiguration<Args, Options>): void {\n\t\tconfiguration.description('Generates HTML documentation from project schema')\n\t\tconfiguration.option('source').valueRequired().description('migrations|definition')\n\t\tconfiguration.option('output').valueRequired().description('file name or \"-\" for stdout')\n\t\tconfiguration.option('name').valueRequired().description('project name (for the title)')\n\t}\n\n\tprotected async execute(input: Input<Args, Options>): Promise<number> {\n\t\tconst schema = input.getOption('source') === 'migrations'\n\t\t\t? await this.schemaVersionBuilder.buildSchema()\n\t\t\t: await this.schemaLoader.loadSchema()\n\t\tif (!validateSchemaAndPrintErrors(schema, 'Defined schema is invalid:')) {\n\t\t\treturn 1\n\t\t}\n\t\tconst name = input.getOption('name') ?? 'Contember project'\n\n\t\tconst html = await renderProjectInfoHtml(schema, name)\n\t\tconst output = input.getOption('output') ?? `${name.toLowerCase().replace(/\\s+/g, '-')}.html`\n\t\tif (output === '-') {\n\t\t\tconsole.log(html)\n\t\t} else {\n\t\t\tconsole.log(`Documentation saved to ${output}`)\n\t\t\tawait writeFile(join(process.cwd(), output), html)\n\t\t}\n\n\t\treturn 0\n\t}\n}\n"],"names":[],"mappings":";;;;;AAgBO,MAAM,4CAA4C,QAAuB;AAAA,EAC/E,YACkB,cACA,sBAChB;AACD,UAAA;AAHiB,SAAA,eAAA;AACA,SAAA,uBAAA;AAAA,EAGlB;AAAA,EAEU,UAAU,eAA0D;AAC7E,kBAAc,YAAY,kDAAkD;AAC5E,kBAAc,OAAO,QAAQ,EAAE,cAAA,EAAgB,YAAY,uBAAuB;AAClF,kBAAc,OAAO,QAAQ,EAAE,cAAA,EAAgB,YAAY,6BAA6B;AACxF,kBAAc,OAAO,MAAM,EAAE,cAAA,EAAgB,YAAY,8BAA8B;AAAA,EACxF;AAAA,EAEA,MAAgB,QAAQ,OAA8C;AACrE,UAAM,SAAS,MAAM,UAAU,QAAQ,MAAM,eAC1C,MAAM,KAAK,qBAAqB,YAAA,IAChC,MAAM,KAAK,aAAa,WAAA;AAC3B,QAAI,CAAC,6BAA6B,QAAQ,4BAA4B,GAAG;AACxE,aAAO;AAAA,IACR;AACA,UAAM,OAAO,MAAM,UAAU,MAAM,KAAK;AAExC,UAAM,OAAO,MAAM,sBAAsB,QAAQ,IAAI;AACrD,UAAM,SAAS,MAAM,UAAU,QAAQ,KAAK,GAAG,KAAK,YAAA,EAAc,QAAQ,QAAQ,GAAG,CAAC;AACtF,QAAI,WAAW,KAAK;AACnB,cAAQ,IAAI,IAAI;AAAA,IACjB,OAAO;AACN,cAAQ,IAAI,0BAA0B,MAAM,EAAE;AAC9C,YAAM,UAAU,KAAK,QAAQ,OAAO,MAAM,GAAG,IAAI;AAAA,IAClD;AAEA,WAAO;AAAA,EACR;AACD;"}
+{"version":3,"file":"ProjectGenerateDocumentationCommand.js","sources":["../../../../../../packages/cli/src/commands/project/ProjectGenerateDocumentationCommand.ts"],"sourcesContent":["import { CliError, Command, CommandConfiguration, ExitCode, Input, Output } from '@contember/cli-common'\nimport { renderProjectInfoHtml } from '../../lib/project/docs/projectDescribe.js'\nimport { writeFile } from 'node:fs/promises'\nimport { join } from 'node:path'\nimport { SchemaLoader } from '../../lib/schema/SchemaLoader.js'\nimport { validateSchemaAndPrintErrors } from '../../lib/schema/SchemaValidationHelper.js'\nimport { SchemaVersionBuilder } from '@contember/migrations-client'\n\ntype Args = {}\n\ntype Options = {\n\tsource?: 'migrations' | 'definition'\n\tname?: string\n\toutput?: string\n}\n\nexport class ProjectGenerateDocumentationCommand extends Command<Args, Options> {\n\tconstructor(\n\t\tprivate readonly schemaLoader: SchemaLoader,\n\t\tprivate readonly schemaVersionBuilder: SchemaVersionBuilder,\n\t\tprivate readonly renderDocumentation: typeof renderProjectInfoHtml = renderProjectInfoHtml,\n\t) {\n\t\tsuper()\n\t}\n\n\tprotected configure(configuration: CommandConfiguration<Args, Options>): void {\n\t\tconfiguration.description('Generates HTML documentation from project schema')\n\t\tconfiguration.option('source').valueRequired().description('migrations|definition')\n\t\tconfiguration.option('output').valueRequired().description('file name or \"-\" for stdout')\n\t\tconfiguration.option('name').valueRequired().description('project name (for the title)')\n\t}\n\n\tprotected async execute(input: Input<Args, Options>, output: Output): Promise<void> {\n\t\tconst schema = input.getOption('source') === 'migrations'\n\t\t\t? await this.schemaVersionBuilder.buildSchema()\n\t\t\t: await this.schemaLoader.loadSchema()\n\t\tif (!validateSchemaAndPrintErrors(schema, 'Defined schema is invalid:', undefined, output)) {\n\t\t\tthrow new CliError('Defined schema is invalid', { code: 'SCHEMA_INVALID', exitCode: ExitCode.InputError })\n\t\t}\n\t\tconst name = input.getOption('name') ?? 'Contember project'\n\n\t\tconst html = await this.renderDocumentation(schema, name)\n\t\tconst destination = input.getOption('output') ?? `${name.toLowerCase().replace(/\\s+/g, '-')}.html`\n\t\tif (destination === '-') {\n\t\t\toutput.data(html, { human: value => value, quiet: () => destination })\n\t\t\treturn\n\t\t}\n\t\tawait writeFile(join(process.cwd(), destination), html)\n\t\toutput.data({ path: destination }, { human: it => `Documentation saved to ${it.path}`, quiet: it => it.path })\n\t}\n}\n"],"names":[],"mappings":";;;;;AAgBO,MAAM,4CAA4C,QAAuB;AAAA,EAC/E,YACkB,cACA,sBACA,sBAAoD,uBACpE;AACD,UAAA;AAJiB,SAAA,eAAA;AACA,SAAA,uBAAA;AACA,SAAA,sBAAA;AAAA,EAGlB;AAAA,EAEU,UAAU,eAA0D;AAC7E,kBAAc,YAAY,kDAAkD;AAC5E,kBAAc,OAAO,QAAQ,EAAE,cAAA,EAAgB,YAAY,uBAAuB;AAClF,kBAAc,OAAO,QAAQ,EAAE,cAAA,EAAgB,YAAY,6BAA6B;AACxF,kBAAc,OAAO,MAAM,EAAE,cAAA,EAAgB,YAAY,8BAA8B;AAAA,EACxF;AAAA,EAEA,MAAgB,QAAQ,OAA6B,QAA+B;AACnF,UAAM,SAAS,MAAM,UAAU,QAAQ,MAAM,eAC1C,MAAM,KAAK,qBAAqB,YAAA,IAChC,MAAM,KAAK,aAAa,WAAA;AAC3B,QAAI,CAAC,6BAA6B,QAAQ,8BAA8B,QAAW,MAAM,GAAG;AAC3F,YAAM,IAAI,SAAS,6BAA6B,EAAE,MAAM,kBAAkB,UAAU,SAAS,YAAY;AAAA,IAC1G;AACA,UAAM,OAAO,MAAM,UAAU,MAAM,KAAK;AAExC,UAAM,OAAO,MAAM,KAAK,oBAAoB,QAAQ,IAAI;AACxD,UAAM,cAAc,MAAM,UAAU,QAAQ,KAAK,GAAG,KAAK,YAAA,EAAc,QAAQ,QAAQ,GAAG,CAAC;AAC3F,QAAI,gBAAgB,KAAK;AACxB,aAAO,KAAK,MAAM,EAAE,OAAO,WAAS,OAAO,OAAO,MAAM,aAAa;AACrE;AAAA,IACD;AACA,UAAM,UAAU,KAAK,QAAQ,OAAO,WAAW,GAAG,IAAI;AACtD,WAAO,KAAK,EAAE,MAAM,YAAA,GAAe,EAAE,OAAO,CAAA,OAAM,0BAA0B,GAAG,IAAI,IAAI,OAAO,CAAA,OAAM,GAAG,MAAM;AAAA,EAC9G;AACD;"}

package/dist/production/src/commands/project/ProjectPrintSchemaCommand.cjs

@@ -23,7 +23,7 @@ class ProjectPrintSchemaCommand extends cliCommon.Command {
     configuration.option("omit-actions").valueNone();
     configuration.option("omit-settings").valueNone();
   }
-  async execute(input) {
+  async execute(input, output) {
     const format = input.getOption("format") || "graphql";
     const schema$1 = input.getOption("source") === "migrations" ? await this.schemaVersionBuilder.buildSchema() : await this.schemaLoader.loadSchema();
     const filteredSchema = {
@@ -33,8 +33,8 @@ class ProjectPrintSchemaCommand extends cliCommon.Command {
       actions: input.getOption("omit-actions") ? schemaUtils.emptySchema.actions : schema$1.actions,
       settings: input.getOption("omit-settings") ? schemaUtils.emptySchema.settings : schema$1.settings
     };
-    if (!SchemaValidationHelper.validateSchemaAndPrintErrors(filteredSchema, "Defined schema is invalid:")) {
-      return 1;
+    if (!SchemaValidationHelper.validateSchemaAndPrintErrors(filteredSchema, "Defined schema is invalid:", void 0, output)) {
+      throw new cliCommon.CliError("Defined schema is invalid", { code: "SCHEMA_INVALID", exitCode: cliCommon.ExitCode.InputError });
     }
     const permissionFactory = new engineContentApi.PermissionFactory();
     const inputRoles = input.getOption("role");
@@ -51,19 +51,19 @@ class ProjectPrintSchemaCommand extends cliCommon.Command {
       new engineContentApi.EntityRulesResolver(schemaNormalized.validation, schemaNormalized.model),
       authorizator
     );
-    const printByLine = (out) => {
-      out.split("\n").forEach((line) => {
-        process.stdout.write(line + "\n");
-      });
-    };
     if (format === "schema") {
       if (inputRoles) {
-        throw `--roles option is not supported for "schema" format`;
+        throw new cliCommon.CliError('The --role option is not supported for the "schema" format', { code: "UNSUPPORTED_OPTION", exitCode: cliCommon.ExitCode.InputError });
       }
-      const jsonString = JSON.stringify(schemaNormalized, null, "	");
-      printByLine(jsonString);
+      output.data(schemaNormalized, {
+        human: (value) => JSON.stringify(value, null, "	"),
+        quiet: (value) => JSON.stringify(value)
+      });
     } else if (format === "introspection") {
-      printByLine(JSON.stringify(introspection.create(), null, "	"));
+      output.data(introspection.create(), {
+        human: (value) => JSON.stringify(value, null, "	"),
+        quiet: (value) => JSON.stringify(value)
+      });
     } else if (format === "graphql") {
       const contentSchema = schemaBuilderFactory.create(schemaNormalized.model, authorizator).build();
       const introspectionSchemaFactory = new engineContentApi.IntrospectionSchemaDefinitionFactory(introspection);
@@ -73,11 +73,13 @@ class ProjectPrintSchemaCommand extends cliCommon.Command {
       });
       gqlSchema.description = "";
       const printedSchema = graphql.printSchema(gqlSchema).replace('""""""\n', "");
-      printByLine(printedSchema);
+      output.data(printedSchema, {
+        human: (value) => value,
+        quiet: (value) => value.split("\n")
+      });
     } else {
-      throw `Unknown format ${format}`;
+      throw new cliCommon.CliError(`Unknown schema format "${format}"`, { code: "UNKNOWN_FORMAT", exitCode: cliCommon.ExitCode.InputError });
     }
-    return 0;
   }
 }
 exports.ProjectPrintSchemaCommand = ProjectPrintSchemaCommand;

package/dist/production/src/commands/project/ProjectPrintSchemaCommand.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"ProjectPrintSchemaCommand.cjs","sources":["../../../../../../packages/cli/src/commands/project/ProjectPrintSchemaCommand.ts"],"sourcesContent":["import { Command, CommandConfiguration, Input } from '@contember/cli-common'\nimport {\n\tAuthorizator,\n\tEntityRulesResolver,\n\tGraphQlSchemaBuilderFactory,\n\tIntrospectionSchemaDefinitionFactory,\n\tIntrospectionSchemaFactory,\n\tPermissionFactory,\n} from '@contember/engine-content-api'\nimport { printSchema } from 'graphql'\nimport { mergeSchemas } from '@graphql-tools/schema'\nimport { emptySchema, normalizeSchema } from '@contember/schema-utils'\nimport { SchemaLoader } from '../../lib/schema/SchemaLoader'\nimport { SchemaVersionBuilder } from '@contember/migrations-client'\nimport { validateSchemaAndPrintErrors } from '../../lib/schema/SchemaValidationHelper'\n\ntype Args = {}\n\ntype Options = {\n\trole?: string[]\n\tnormalize?: boolean\n\tformat?: 'graphql' | 'introspection' | 'schema'\n\tsource?: 'migrations' | 'definition'\n\t['omit-acl']?: boolean\n\t['omit-validation']?: boolean\n\t['omit-actions']?: boolean\n\t['omit-settings']?: boolean\n}\n\nexport class ProjectPrintSchemaCommand extends Command<Args, Options> {\n\tconstructor(\n\t\tprivate readonly schemaLoader: SchemaLoader,\n\t\tprivate readonly schemaVersionBuilder: SchemaVersionBuilder,\n\t) {\n\t\tsuper()\n\t}\n\n\tprotected configure(configuration: CommandConfiguration<Args, Options>): void {\n\t\tconfiguration.description('Prints project schema')\n\t\tconfiguration.option('format').valueRequired().description('graphql|introspection|schema')\n\t\tconfiguration.option('source').valueRequired().description('migrations|definition')\n\t\tconfiguration.option('role').valueArray()\n\t\tconfiguration.option('normalize').valueNone()\n\t\tconfiguration.option('omit-acl').valueNone()\n\t\tconfiguration.option('omit-validation').valueNone()\n\t\tconfiguration.option('omit-actions').valueNone()\n\t\tconfiguration.option('omit-settings').valueNone()\n\t}\n\n\tprotected async execute(input: Input<Args, Options>): Promise<number> {\n\t\tconst format = input.getOption('format') || 'graphql'\n\n\t\tconst schema = input.getOption('source') === 'migrations'\n\t\t\t? await this.schemaVersionBuilder.buildSchema()\n\t\t\t: await this.schemaLoader.loadSchema()\n\n\t\tconst filteredSchema = {\n\t\t\tmodel: schema.model,\n\t\t\tacl: input.getOption('omit-acl') ? emptySchema.acl : schema.acl,\n\t\t\tvalidation: input.getOption('omit-validation') ? emptySchema.validation : schema.validation,\n\t\t\tactions: input.getOption('omit-actions') ? emptySchema.actions : schema.actions,\n\t\t\tsettings: input.getOption('omit-settings') ? emptySchema.settings : schema.settings,\n\t\t}\n\n\t\tif (!validateSchemaAndPrintErrors(filteredSchema, 'Defined schema is invalid:')) {\n\t\t\treturn 1\n\t\t}\n\n\t\tconst permissionFactory = new PermissionFactory()\n\t\tconst inputRoles = input.getOption('role')\n\t\tconst schemaNormalized = input.getOption('normalize') ? normalizeSchema(filteredSchema) : filteredSchema\n\t\tconst permissions = permissionFactory.create(schemaNormalized, inputRoles || ['admin'])\n\t\tconst schemaBuilderFactory = new GraphQlSchemaBuilderFactory()\n\t\tconst authorizator = new Authorizator(\n\t\t\tpermissions,\n\t\t\tschemaNormalized.acl.customPrimary ?? false,\n\t\t\tObject.values(schemaNormalized.acl.roles).some(it => it.content?.refreshMaterializedView),\n\t\t)\n\t\tconst introspection = new IntrospectionSchemaFactory(\n\t\t\tschemaNormalized.model,\n\t\t\tnew EntityRulesResolver(schemaNormalized.validation, schemaNormalized.model),\n\t\t\tauthorizator,\n\t\t)\n\n\t\tconst printByLine = (out: string) => {\n\t\t\tout.split('\\n').forEach(line => {\n\t\t\t\tprocess.stdout.write(line + '\\n')\n\t\t\t})\n\t\t}\n\t\tif (format === 'schema') {\n\t\t\tif (inputRoles) {\n\t\t\t\tthrow `--roles option is not supported for \"schema\" format`\n\t\t\t}\n\t\t\tconst jsonString = JSON.stringify(schemaNormalized, null, '\\t')\n\t\t\tprintByLine(jsonString)\n\t\t} else if (format === 'introspection') {\n\t\t\tprintByLine(JSON.stringify(introspection.create(), null, '\\t'))\n\t\t} else if (format === 'graphql') {\n\t\t\tconst contentSchema = schemaBuilderFactory.create(schemaNormalized.model, authorizator).build()\n\t\t\tconst introspectionSchemaFactory = new IntrospectionSchemaDefinitionFactory(introspection)\n\t\t\tconst introspectionSchema = introspectionSchemaFactory.create()\n\t\t\tconst gqlSchema = mergeSchemas({\n\t\t\t\tschemas: [contentSchema, introspectionSchema],\n\t\t\t})\n\t\t\tgqlSchema.description = '' // this enforces schema definition print\n\t\t\tconst printedSchema = printSchema(gqlSchema).replace('\"\"\"\"\"\"\\n', '') // remove empty comment\n\t\t\tprintByLine(printedSchema)\n\t\t} else {\n\t\t\tthrow `Unknown format ${format}`\n\t\t}\n\n\t\treturn 0\n\t}\n}\n"],"names":["Command","schema","emptySchema","validateSchemaAndPrintErrors","PermissionFactory","normalizeSchema","GraphQlSchemaBuilderFactory","Authorizator","IntrospectionSchemaFactory","EntityRulesResolver","IntrospectionSchemaDefinitionFactory","mergeSchemas","printSchema"],"mappings":"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"}
+{"version":3,"file":"ProjectPrintSchemaCommand.cjs","sources":["../../../../../../packages/cli/src/commands/project/ProjectPrintSchemaCommand.ts"],"sourcesContent":["import { CliError, Command, CommandConfiguration, ExitCode, Input, Output } from '@contember/cli-common'\nimport {\n\tAuthorizator,\n\tEntityRulesResolver,\n\tGraphQlSchemaBuilderFactory,\n\tIntrospectionSchemaDefinitionFactory,\n\tIntrospectionSchemaFactory,\n\tPermissionFactory,\n} from '@contember/engine-content-api'\nimport { printSchema } from 'graphql'\nimport { mergeSchemas } from '@graphql-tools/schema'\nimport { emptySchema, normalizeSchema } from '@contember/schema-utils'\nimport { SchemaLoader } from '../../lib/schema/SchemaLoader.js'\nimport { SchemaVersionBuilder } from '@contember/migrations-client'\nimport { validateSchemaAndPrintErrors } from '../../lib/schema/SchemaValidationHelper.js'\n\ntype Args = {}\n\ntype Options = {\n\trole?: string[]\n\tnormalize?: boolean\n\tformat?: 'graphql' | 'introspection' | 'schema'\n\tsource?: 'migrations' | 'definition'\n\t['omit-acl']?: boolean\n\t['omit-validation']?: boolean\n\t['omit-actions']?: boolean\n\t['omit-settings']?: boolean\n}\n\nexport class ProjectPrintSchemaCommand extends Command<Args, Options> {\n\tconstructor(\n\t\tprivate readonly schemaLoader: SchemaLoader,\n\t\tprivate readonly schemaVersionBuilder: SchemaVersionBuilder,\n\t) {\n\t\tsuper()\n\t}\n\n\tprotected configure(configuration: CommandConfiguration<Args, Options>): void {\n\t\tconfiguration.description('Prints project schema')\n\t\tconfiguration.option('format').valueRequired().description('graphql|introspection|schema')\n\t\tconfiguration.option('source').valueRequired().description('migrations|definition')\n\t\tconfiguration.option('role').valueArray()\n\t\tconfiguration.option('normalize').valueNone()\n\t\tconfiguration.option('omit-acl').valueNone()\n\t\tconfiguration.option('omit-validation').valueNone()\n\t\tconfiguration.option('omit-actions').valueNone()\n\t\tconfiguration.option('omit-settings').valueNone()\n\t}\n\n\tprotected async execute(input: Input<Args, Options>, output: Output): Promise<void> {\n\t\tconst format = input.getOption('format') || 'graphql'\n\n\t\tconst schema = input.getOption('source') === 'migrations'\n\t\t\t? await this.schemaVersionBuilder.buildSchema()\n\t\t\t: await this.schemaLoader.loadSchema()\n\n\t\tconst filteredSchema = {\n\t\t\tmodel: schema.model,\n\t\t\tacl: input.getOption('omit-acl') ? emptySchema.acl : schema.acl,\n\t\t\tvalidation: input.getOption('omit-validation') ? emptySchema.validation : schema.validation,\n\t\t\tactions: input.getOption('omit-actions') ? emptySchema.actions : schema.actions,\n\t\t\tsettings: input.getOption('omit-settings') ? emptySchema.settings : schema.settings,\n\t\t}\n\n\t\tif (!validateSchemaAndPrintErrors(filteredSchema, 'Defined schema is invalid:', undefined, output)) {\n\t\t\tthrow new CliError('Defined schema is invalid', { code: 'SCHEMA_INVALID', exitCode: ExitCode.InputError })\n\t\t}\n\n\t\tconst permissionFactory = new PermissionFactory()\n\t\tconst inputRoles = input.getOption('role')\n\t\tconst schemaNormalized = input.getOption('normalize') ? normalizeSchema(filteredSchema) : filteredSchema\n\t\tconst permissions = permissionFactory.create(schemaNormalized, inputRoles || ['admin'])\n\t\tconst schemaBuilderFactory = new GraphQlSchemaBuilderFactory()\n\t\tconst authorizator = new Authorizator(\n\t\t\tpermissions,\n\t\t\tschemaNormalized.acl.customPrimary ?? false,\n\t\t\tObject.values(schemaNormalized.acl.roles).some(it => it.content?.refreshMaterializedView),\n\t\t)\n\t\tconst introspection = new IntrospectionSchemaFactory(\n\t\t\tschemaNormalized.model,\n\t\t\tnew EntityRulesResolver(schemaNormalized.validation, schemaNormalized.model),\n\t\t\tauthorizator,\n\t\t)\n\n\t\tif (format === 'schema') {\n\t\t\tif (inputRoles) {\n\t\t\t\tthrow new CliError('The --role option is not supported for the \"schema\" format', { code: 'UNSUPPORTED_OPTION', exitCode: ExitCode.InputError })\n\t\t\t}\n\t\t\t// human mode keeps the tab-indented rendering; --json is a single JSON.stringify of the same value, not a re-encoding of this string\n\t\t\toutput.data(schemaNormalized, {\n\t\t\t\thuman: value => JSON.stringify(value, null, '\\t'),\n\t\t\t\tquiet: value => JSON.stringify(value),\n\t\t\t})\n\t\t} else if (format === 'introspection') {\n\t\t\toutput.data(introspection.create(), {\n\t\t\t\thuman: value => JSON.stringify(value, null, '\\t'),\n\t\t\t\tquiet: value => JSON.stringify(value),\n\t\t\t})\n\t\t} else if (format === 'graphql') {\n\t\t\tconst contentSchema = schemaBuilderFactory.create(schemaNormalized.model, authorizator).build()\n\t\t\tconst introspectionSchemaFactory = new IntrospectionSchemaDefinitionFactory(introspection)\n\t\t\tconst introspectionSchema = introspectionSchemaFactory.create()\n\t\t\tconst gqlSchema = mergeSchemas({\n\t\t\t\tschemas: [contentSchema, introspectionSchema],\n\t\t\t})\n\t\t\tgqlSchema.description = '' // this enforces schema definition print\n\t\t\tconst printedSchema = printSchema(gqlSchema).replace('\"\"\"\"\"\"\\n', '') // remove empty comment\n\t\t\toutput.data(printedSchema, {\n\t\t\t\thuman: value => value,\n\t\t\t\tquiet: value => value.split('\\n'),\n\t\t\t})\n\t\t} else {\n\t\t\tthrow new CliError(`Unknown schema format \"${format}\"`, { code: 'UNKNOWN_FORMAT', exitCode: ExitCode.InputError })\n\t\t}\n\t}\n}\n"],"names":["Command","schema","emptySchema","validateSchemaAndPrintErrors","CliError","ExitCode","PermissionFactory","normalizeSchema","GraphQlSchemaBuilderFactory","Authorizator","IntrospectionSchemaFactory","EntityRulesResolver","IntrospectionSchemaDefinitionFactory","mergeSchemas","printSchema"],"mappings":"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"}

package/dist/production/src/commands/project/ProjectPrintSchemaCommand.js

@@ -1,4 +1,4 @@
-import { Command } from "@contember/cli-common";
+import { Command, CliError, ExitCode } from "@contember/cli-common";
 import { PermissionFactory, GraphQlSchemaBuilderFactory, Authorizator, IntrospectionSchemaFactory, EntityRulesResolver, IntrospectionSchemaDefinitionFactory } from "@contember/engine-content-api";
 import { printSchema } from "graphql";
 import { mergeSchemas } from "@graphql-tools/schema";
@@ -21,7 +21,7 @@ class ProjectPrintSchemaCommand extends Command {
     configuration.option("omit-actions").valueNone();
     configuration.option("omit-settings").valueNone();
   }
-  async execute(input) {
+  async execute(input, output) {
     const format = input.getOption("format") || "graphql";
     const schema = input.getOption("source") === "migrations" ? await this.schemaVersionBuilder.buildSchema() : await this.schemaLoader.loadSchema();
     const filteredSchema = {
@@ -31,8 +31,8 @@ class ProjectPrintSchemaCommand extends Command {
       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;
+    if (!validateSchemaAndPrintErrors(filteredSchema, "Defined schema is invalid:", void 0, output)) {
+      throw new CliError("Defined schema is invalid", { code: "SCHEMA_INVALID", exitCode: ExitCode.InputError });
     }
     const permissionFactory = new PermissionFactory();
     const inputRoles = input.getOption("role");
@@ -49,19 +49,19 @@ class ProjectPrintSchemaCommand extends Command {
       new EntityRulesResolver(schemaNormalized.validation, schemaNormalized.model),
       authorizator
     );
-    const printByLine = (out) => {
-      out.split("\n").forEach((line) => {
-        process.stdout.write(line + "\n");
-      });
-    };
     if (format === "schema") {
       if (inputRoles) {
-        throw `--roles option is not supported for "schema" format`;
+        throw new CliError('The --role option is not supported for the "schema" format', { code: "UNSUPPORTED_OPTION", exitCode: ExitCode.InputError });
       }
-      const jsonString = JSON.stringify(schemaNormalized, null, "	");
-      printByLine(jsonString);
+      output.data(schemaNormalized, {
+        human: (value) => JSON.stringify(value, null, "	"),
+        quiet: (value) => JSON.stringify(value)
+      });
     } else if (format === "introspection") {
-      printByLine(JSON.stringify(introspection.create(), null, "	"));
+      output.data(introspection.create(), {
+        human: (value) => JSON.stringify(value, null, "	"),
+        quiet: (value) => JSON.stringify(value)
+      });
     } else if (format === "graphql") {
       const contentSchema = schemaBuilderFactory.create(schemaNormalized.model, authorizator).build();
       const introspectionSchemaFactory = new IntrospectionSchemaDefinitionFactory(introspection);
@@ -71,11 +71,13 @@ class ProjectPrintSchemaCommand extends Command {
       });
       gqlSchema.description = "";
       const printedSchema = printSchema(gqlSchema).replace('""""""\n', "");
-      printByLine(printedSchema);
+      output.data(printedSchema, {
+        human: (value) => value,
+        quiet: (value) => value.split("\n")
+      });
     } else {
-      throw `Unknown format ${format}`;
+      throw new CliError(`Unknown schema format "${format}"`, { code: "UNKNOWN_FORMAT", exitCode: ExitCode.InputError });
     }
-    return 0;
   }
 }
 export {

package/dist/production/src/commands/project/ProjectPrintSchemaCommand.js.map

@@ -1 +1 @@
-{"version":3,"file":"ProjectPrintSchemaCommand.js","sources":["../../../../../../packages/cli/src/commands/project/ProjectPrintSchemaCommand.ts"],"sourcesContent":["import { Command, CommandConfiguration, Input } from '@contember/cli-common'\nimport {\n\tAuthorizator,\n\tEntityRulesResolver,\n\tGraphQlSchemaBuilderFactory,\n\tIntrospectionSchemaDefinitionFactory,\n\tIntrospectionSchemaFactory,\n\tPermissionFactory,\n} from '@contember/engine-content-api'\nimport { printSchema } from 'graphql'\nimport { mergeSchemas } from '@graphql-tools/schema'\nimport { emptySchema, normalizeSchema } from '@contember/schema-utils'\nimport { SchemaLoader } from '../../lib/schema/SchemaLoader'\nimport { SchemaVersionBuilder } from '@contember/migrations-client'\nimport { validateSchemaAndPrintErrors } from '../../lib/schema/SchemaValidationHelper'\n\ntype Args = {}\n\ntype Options = {\n\trole?: string[]\n\tnormalize?: boolean\n\tformat?: 'graphql' | 'introspection' | 'schema'\n\tsource?: 'migrations' | 'definition'\n\t['omit-acl']?: boolean\n\t['omit-validation']?: boolean\n\t['omit-actions']?: boolean\n\t['omit-settings']?: boolean\n}\n\nexport class ProjectPrintSchemaCommand extends Command<Args, Options> {\n\tconstructor(\n\t\tprivate readonly schemaLoader: SchemaLoader,\n\t\tprivate readonly schemaVersionBuilder: SchemaVersionBuilder,\n\t) {\n\t\tsuper()\n\t}\n\n\tprotected configure(configuration: CommandConfiguration<Args, Options>): void {\n\t\tconfiguration.description('Prints project schema')\n\t\tconfiguration.option('format').valueRequired().description('graphql|introspection|schema')\n\t\tconfiguration.option('source').valueRequired().description('migrations|definition')\n\t\tconfiguration.option('role').valueArray()\n\t\tconfiguration.option('normalize').valueNone()\n\t\tconfiguration.option('omit-acl').valueNone()\n\t\tconfiguration.option('omit-validation').valueNone()\n\t\tconfiguration.option('omit-actions').valueNone()\n\t\tconfiguration.option('omit-settings').valueNone()\n\t}\n\n\tprotected async execute(input: Input<Args, Options>): Promise<number> {\n\t\tconst format = input.getOption('format') || 'graphql'\n\n\t\tconst schema = input.getOption('source') === 'migrations'\n\t\t\t? await this.schemaVersionBuilder.buildSchema()\n\t\t\t: await this.schemaLoader.loadSchema()\n\n\t\tconst filteredSchema = {\n\t\t\tmodel: schema.model,\n\t\t\tacl: input.getOption('omit-acl') ? emptySchema.acl : schema.acl,\n\t\t\tvalidation: input.getOption('omit-validation') ? emptySchema.validation : schema.validation,\n\t\t\tactions: input.getOption('omit-actions') ? emptySchema.actions : schema.actions,\n\t\t\tsettings: input.getOption('omit-settings') ? emptySchema.settings : schema.settings,\n\t\t}\n\n\t\tif (!validateSchemaAndPrintErrors(filteredSchema, 'Defined schema is invalid:')) {\n\t\t\treturn 1\n\t\t}\n\n\t\tconst permissionFactory = new PermissionFactory()\n\t\tconst inputRoles = input.getOption('role')\n\t\tconst schemaNormalized = input.getOption('normalize') ? normalizeSchema(filteredSchema) : filteredSchema\n\t\tconst permissions = permissionFactory.create(schemaNormalized, inputRoles || ['admin'])\n\t\tconst schemaBuilderFactory = new GraphQlSchemaBuilderFactory()\n\t\tconst authorizator = new Authorizator(\n\t\t\tpermissions,\n\t\t\tschemaNormalized.acl.customPrimary ?? false,\n\t\t\tObject.values(schemaNormalized.acl.roles).some(it => it.content?.refreshMaterializedView),\n\t\t)\n\t\tconst introspection = new IntrospectionSchemaFactory(\n\t\t\tschemaNormalized.model,\n\t\t\tnew EntityRulesResolver(schemaNormalized.validation, schemaNormalized.model),\n\t\t\tauthorizator,\n\t\t)\n\n\t\tconst printByLine = (out: string) => {\n\t\t\tout.split('\\n').forEach(line => {\n\t\t\t\tprocess.stdout.write(line + '\\n')\n\t\t\t})\n\t\t}\n\t\tif (format === 'schema') {\n\t\t\tif (inputRoles) {\n\t\t\t\tthrow `--roles option is not supported for \"schema\" format`\n\t\t\t}\n\t\t\tconst jsonString = JSON.stringify(schemaNormalized, null, '\\t')\n\t\t\tprintByLine(jsonString)\n\t\t} else if (format === 'introspection') {\n\t\t\tprintByLine(JSON.stringify(introspection.create(), null, '\\t'))\n\t\t} else if (format === 'graphql') {\n\t\t\tconst contentSchema = schemaBuilderFactory.create(schemaNormalized.model, authorizator).build()\n\t\t\tconst introspectionSchemaFactory = new IntrospectionSchemaDefinitionFactory(introspection)\n\t\t\tconst introspectionSchema = introspectionSchemaFactory.create()\n\t\t\tconst gqlSchema = mergeSchemas({\n\t\t\t\tschemas: [contentSchema, introspectionSchema],\n\t\t\t})\n\t\t\tgqlSchema.description = '' // this enforces schema definition print\n\t\t\tconst printedSchema = printSchema(gqlSchema).replace('\"\"\"\"\"\"\\n', '') // remove empty comment\n\t\t\tprintByLine(printedSchema)\n\t\t} else {\n\t\t\tthrow `Unknown format ${format}`\n\t\t}\n\n\t\treturn 0\n\t}\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"ProjectPrintSchemaCommand.js","sources":["../../../../../../packages/cli/src/commands/project/ProjectPrintSchemaCommand.ts"],"sourcesContent":["import { CliError, Command, CommandConfiguration, ExitCode, Input, Output } from '@contember/cli-common'\nimport {\n\tAuthorizator,\n\tEntityRulesResolver,\n\tGraphQlSchemaBuilderFactory,\n\tIntrospectionSchemaDefinitionFactory,\n\tIntrospectionSchemaFactory,\n\tPermissionFactory,\n} from '@contember/engine-content-api'\nimport { printSchema } from 'graphql'\nimport { mergeSchemas } from '@graphql-tools/schema'\nimport { emptySchema, normalizeSchema } from '@contember/schema-utils'\nimport { SchemaLoader } from '../../lib/schema/SchemaLoader.js'\nimport { SchemaVersionBuilder } from '@contember/migrations-client'\nimport { validateSchemaAndPrintErrors } from '../../lib/schema/SchemaValidationHelper.js'\n\ntype Args = {}\n\ntype Options = {\n\trole?: string[]\n\tnormalize?: boolean\n\tformat?: 'graphql' | 'introspection' | 'schema'\n\tsource?: 'migrations' | 'definition'\n\t['omit-acl']?: boolean\n\t['omit-validation']?: boolean\n\t['omit-actions']?: boolean\n\t['omit-settings']?: boolean\n}\n\nexport class ProjectPrintSchemaCommand extends Command<Args, Options> {\n\tconstructor(\n\t\tprivate readonly schemaLoader: SchemaLoader,\n\t\tprivate readonly schemaVersionBuilder: SchemaVersionBuilder,\n\t) {\n\t\tsuper()\n\t}\n\n\tprotected configure(configuration: CommandConfiguration<Args, Options>): void {\n\t\tconfiguration.description('Prints project schema')\n\t\tconfiguration.option('format').valueRequired().description('graphql|introspection|schema')\n\t\tconfiguration.option('source').valueRequired().description('migrations|definition')\n\t\tconfiguration.option('role').valueArray()\n\t\tconfiguration.option('normalize').valueNone()\n\t\tconfiguration.option('omit-acl').valueNone()\n\t\tconfiguration.option('omit-validation').valueNone()\n\t\tconfiguration.option('omit-actions').valueNone()\n\t\tconfiguration.option('omit-settings').valueNone()\n\t}\n\n\tprotected async execute(input: Input<Args, Options>, output: Output): Promise<void> {\n\t\tconst format = input.getOption('format') || 'graphql'\n\n\t\tconst schema = input.getOption('source') === 'migrations'\n\t\t\t? await this.schemaVersionBuilder.buildSchema()\n\t\t\t: await this.schemaLoader.loadSchema()\n\n\t\tconst filteredSchema = {\n\t\t\tmodel: schema.model,\n\t\t\tacl: input.getOption('omit-acl') ? emptySchema.acl : schema.acl,\n\t\t\tvalidation: input.getOption('omit-validation') ? emptySchema.validation : schema.validation,\n\t\t\tactions: input.getOption('omit-actions') ? emptySchema.actions : schema.actions,\n\t\t\tsettings: input.getOption('omit-settings') ? emptySchema.settings : schema.settings,\n\t\t}\n\n\t\tif (!validateSchemaAndPrintErrors(filteredSchema, 'Defined schema is invalid:', undefined, output)) {\n\t\t\tthrow new CliError('Defined schema is invalid', { code: 'SCHEMA_INVALID', exitCode: ExitCode.InputError })\n\t\t}\n\n\t\tconst permissionFactory = new PermissionFactory()\n\t\tconst inputRoles = input.getOption('role')\n\t\tconst schemaNormalized = input.getOption('normalize') ? normalizeSchema(filteredSchema) : filteredSchema\n\t\tconst permissions = permissionFactory.create(schemaNormalized, inputRoles || ['admin'])\n\t\tconst schemaBuilderFactory = new GraphQlSchemaBuilderFactory()\n\t\tconst authorizator = new Authorizator(\n\t\t\tpermissions,\n\t\t\tschemaNormalized.acl.customPrimary ?? false,\n\t\t\tObject.values(schemaNormalized.acl.roles).some(it => it.content?.refreshMaterializedView),\n\t\t)\n\t\tconst introspection = new IntrospectionSchemaFactory(\n\t\t\tschemaNormalized.model,\n\t\t\tnew EntityRulesResolver(schemaNormalized.validation, schemaNormalized.model),\n\t\t\tauthorizator,\n\t\t)\n\n\t\tif (format === 'schema') {\n\t\t\tif (inputRoles) {\n\t\t\t\tthrow new CliError('The --role option is not supported for the \"schema\" format', { code: 'UNSUPPORTED_OPTION', exitCode: ExitCode.InputError })\n\t\t\t}\n\t\t\t// human mode keeps the tab-indented rendering; --json is a single JSON.stringify of the same value, not a re-encoding of this string\n\t\t\toutput.data(schemaNormalized, {\n\t\t\t\thuman: value => JSON.stringify(value, null, '\\t'),\n\t\t\t\tquiet: value => JSON.stringify(value),\n\t\t\t})\n\t\t} else if (format === 'introspection') {\n\t\t\toutput.data(introspection.create(), {\n\t\t\t\thuman: value => JSON.stringify(value, null, '\\t'),\n\t\t\t\tquiet: value => JSON.stringify(value),\n\t\t\t})\n\t\t} else if (format === 'graphql') {\n\t\t\tconst contentSchema = schemaBuilderFactory.create(schemaNormalized.model, authorizator).build()\n\t\t\tconst introspectionSchemaFactory = new IntrospectionSchemaDefinitionFactory(introspection)\n\t\t\tconst introspectionSchema = introspectionSchemaFactory.create()\n\t\t\tconst gqlSchema = mergeSchemas({\n\t\t\t\tschemas: [contentSchema, introspectionSchema],\n\t\t\t})\n\t\t\tgqlSchema.description = '' // this enforces schema definition print\n\t\t\tconst printedSchema = printSchema(gqlSchema).replace('\"\"\"\"\"\"\\n', '') // remove empty comment\n\t\t\toutput.data(printedSchema, {\n\t\t\t\thuman: value => value,\n\t\t\t\tquiet: value => value.split('\\n'),\n\t\t\t})\n\t\t} else {\n\t\t\tthrow new CliError(`Unknown schema format \"${format}\"`, { code: 'UNKNOWN_FORMAT', exitCode: ExitCode.InputError })\n\t\t}\n\t}\n}\n"],"names":[],"mappings":"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"}

package/dist/production/src/commands/project/ProjectValidateCommand.cjs

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const cliCommon = require("@contember/cli-common");
 const schemaUtils = require("@contember/schema-utils");
-const SchemaValidationHelper = require("../../lib/schema/SchemaValidationHelper.cjs");
 class ProjectValidateCommand extends cliCommon.Command {
   constructor(schemaLoader, migrationValidator, migrationsResolver, schemaDiffer, schemaVersionBuilder) {
     super();
@@ -15,25 +14,54 @@ class ProjectValidateCommand extends cliCommon.Command {
   configure(configuration) {
     configuration.description("Validates project schema");
   }
-  async execute() {
-    let projectValid = true;
+  async execute(input, output) {
+    const issues = [];
     const migrations = await this.migrationsResolver.getSchemaMigrations();
-    projectValid = this.migrationValidator.validate(schemaUtils.emptySchema, migrations) && projectValid;
+    if (!this.migrationValidator.validate(schemaUtils.emptySchema, migrations)) {
+      issues.push({
+        source: "migrations",
+        path: "",
+        code: "MIGRATIONS_INVALID_SCHEMA",
+        message: "One or more migrations produce an invalid schema; see the diagnostics above for details"
+      });
+    }
     const schema = await this.schemaLoader.loadSchema();
-    projectValid = SchemaValidationHelper.validateSchemaAndPrintErrors(schema, "Defined schema is invalid:") && projectValid;
+    for (const err of schemaUtils.SchemaValidator.validate(schema)) {
+      issues.push({ source: "schema", path: err.path.join("."), code: err.code, message: err.message });
+    }
     const builtSchema = await this.schemaVersionBuilder.buildSchema();
-    projectValid = SchemaValidationHelper.validateSchemaAndPrintErrors(builtSchema, "Schema built from migrations is invalid:") && projectValid;
-    if (projectValid) {
+    for (const err of schemaUtils.SchemaValidator.validate(builtSchema)) {
+      issues.push({ source: "built-schema", path: err.path.join("."), code: err.code, message: err.message });
+    }
+    if (issues.length === 0) {
       const diff = await this.schemaDiffer.diffSchemas(builtSchema, schema);
       if (diff.length > 0) {
-        console.log("Migrations are not in sync with a defined schema");
-        projectValid = false;
+        issues.push({
+          source: "diff",
+          path: "",
+          code: "SCHEMA_MIGRATIONS_DIFF",
+          message: "Migrations are not in sync with the defined schema"
+        });
       }
     }
-    if (projectValid) {
-      console.log("Project schema is valid");
+    const columns = [
+      { field: "source", name: "Source" },
+      { field: "path", name: "Path" },
+      { field: "code", name: "Code" },
+      { field: "message", name: "Message" }
+    ];
+    if (issues.length > 0) {
+      if (!output.isJson && !output.isQuiet) {
+        output.table(columns, issues, "message");
+      }
+      throw new cliCommon.CliError(`Project schema is invalid: found ${issues.length} issue(s)`, {
+        code: "SCHEMA_INVALID",
+        exitCode: cliCommon.ExitCode.InputError,
+        details: issues
+      });
     }
-    return projectValid ? 0 : 1;
+    output.table(columns, issues, "message");
+    output.info("Project schema is valid");
   }
 }
 exports.ProjectValidateCommand = ProjectValidateCommand;

package/dist/production/src/commands/project/ProjectValidateCommand.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"ProjectValidateCommand.cjs","sources":["../../../../../../packages/cli/src/commands/project/ProjectValidateCommand.ts"],"sourcesContent":["import { Command, CommandConfiguration } from '@contember/cli-common'\nimport { emptySchema } from '@contember/schema-utils'\nimport { SchemaLoader } from '../../lib/schema/SchemaLoader'\nimport { validateSchemaAndPrintErrors } from '../../lib/schema/SchemaValidationHelper'\nimport { MigrationsValidator } from '../../lib/migrations/MigrationsValidator'\nimport { MigrationsResolver, SchemaVersionBuilder } from '@contember/migrations-client'\nimport { SchemaDiffer } from '@contember/schema-migrations'\n\ntype Args = {}\n\ntype Options = {}\n\nexport class ProjectValidateCommand extends Command<Args, Options> {\n\tconstructor(\n\t\tprivate readonly schemaLoader: SchemaLoader,\n\t\tprivate readonly migrationValidator: MigrationsValidator,\n\t\tprivate readonly migrationsResolver: MigrationsResolver,\n\t\tprivate readonly schemaDiffer: SchemaDiffer,\n\t\tprivate readonly schemaVersionBuilder: SchemaVersionBuilder,\n\t) {\n\t\tsuper()\n\t}\n\n\tprotected configure(configuration: CommandConfiguration<Args, Options>): void {\n\t\tconfiguration.description('Validates project schema')\n\t}\n\n\tprotected async execute(): Promise<number> {\n\t\tlet projectValid = true\n\n\t\tconst migrations = await this.migrationsResolver.getSchemaMigrations()\n\t\tprojectValid = this.migrationValidator.validate(emptySchema, migrations)\n\t\t\t&& projectValid\n\n\t\tconst schema = await this.schemaLoader.loadSchema()\n\t\tprojectValid = validateSchemaAndPrintErrors(schema, 'Defined schema is invalid:')\n\t\t\t&& projectValid\n\n\t\tconst builtSchema = await this.schemaVersionBuilder.buildSchema()\n\t\tprojectValid = validateSchemaAndPrintErrors(builtSchema, 'Schema built from migrations is invalid:')\n\t\t\t&& projectValid\n\n\t\tif (projectValid) {\n\t\t\tconst diff = await this.schemaDiffer.diffSchemas(builtSchema, schema)\n\t\t\tif (diff.length > 0) {\n\t\t\t\tconsole.log('Migrations are not in sync with a defined schema')\n\t\t\t\tprojectValid = false\n\t\t\t}\n\t\t}\n\n\t\tif (projectValid) {\n\t\t\tconsole.log('Project schema is valid')\n\t\t}\n\n\t\treturn projectValid ? 0 : 1\n\t}\n}\n"],"names":["Command","emptySchema","validateSchemaAndPrintErrors"],"mappings":";;;;;AAYO,MAAM,+BAA+BA,UAAAA,QAAuB;AAAA,EAClE,YACkB,cACA,oBACA,oBACA,cACA,sBAChB;AACD,UAAA;AANiB,SAAA,eAAA;AACA,SAAA,qBAAA;AACA,SAAA,qBAAA;AACA,SAAA,eAAA;AACA,SAAA,uBAAA;AAAA,EAGlB;AAAA,EAEU,UAAU,eAA0D;AAC7E,kBAAc,YAAY,0BAA0B;AAAA,EACrD;AAAA,EAEA,MAAgB,UAA2B;AAC1C,QAAI,eAAe;AAEnB,UAAM,aAAa,MAAM,KAAK,mBAAmB,oBAAA;AACjD,mBAAe,KAAK,mBAAmB,SAASC,YAAAA,aAAa,UAAU,KACnE;AAEJ,UAAM,SAAS,MAAM,KAAK,aAAa,WAAA;AACvC,mBAAeC,uBAAAA,6BAA6B,QAAQ,4BAA4B,KAC5E;AAEJ,UAAM,cAAc,MAAM,KAAK,qBAAqB,YAAA;AACpD,mBAAeA,uBAAAA,6BAA6B,aAAa,0CAA0C,KAC/F;AAEJ,QAAI,cAAc;AACjB,YAAM,OAAO,MAAM,KAAK,aAAa,YAAY,aAAa,MAAM;AACpE,UAAI,KAAK,SAAS,GAAG;AACpB,gBAAQ,IAAI,kDAAkD;AAC9D,uBAAe;AAAA,MAChB;AAAA,IACD;AAEA,QAAI,cAAc;AACjB,cAAQ,IAAI,yBAAyB;AAAA,IACtC;AAEA,WAAO,eAAe,IAAI;AAAA,EAC3B;AACD;;"}
+{"version":3,"file":"ProjectValidateCommand.cjs","sources":["../../../../../../packages/cli/src/commands/project/ProjectValidateCommand.ts"],"sourcesContent":["import { CliError, Command, CommandConfiguration, ExitCode, Input, Output } from '@contember/cli-common'\nimport { emptySchema, SchemaValidator } from '@contember/schema-utils'\nimport { MigrationsValidator } from '../../lib/migrations/MigrationsValidator.js'\nimport { MigrationsResolver, SchemaVersionBuilder } from '@contember/migrations-client'\nimport { SchemaDiffer } from '@contember/schema-migrations'\nimport { SchemaLoader } from '../../lib/schema/SchemaLoader.js'\n\ntype Args = {}\n\ntype Options = {}\n\ntype ValidationIssue = {\n\tsource: 'schema' | 'built-schema' | 'migrations' | 'diff'\n\tpath: string\n\tcode: string\n\tmessage: string\n}\n\nexport class ProjectValidateCommand extends Command<Args, Options> {\n\tconstructor(\n\t\tprivate readonly schemaLoader: SchemaLoader,\n\t\tprivate readonly migrationValidator: MigrationsValidator,\n\t\tprivate readonly migrationsResolver: MigrationsResolver,\n\t\tprivate readonly schemaDiffer: SchemaDiffer,\n\t\tprivate readonly schemaVersionBuilder: SchemaVersionBuilder,\n\t) {\n\t\tsuper()\n\t}\n\n\tprotected configure(configuration: CommandConfiguration<Args, Options>): void {\n\t\tconfiguration.description('Validates project schema')\n\t}\n\n\tprotected async execute(input: Input<Args, Options>, output: Output): Promise<void> {\n\t\tconst issues: ValidationIssue[] = []\n\n\t\t// prints its own itemized diagnostics per offending migration; here we only need the pass/fail\n\t\tconst migrations = await this.migrationsResolver.getSchemaMigrations()\n\t\tif (!this.migrationValidator.validate(emptySchema, migrations)) {\n\t\t\tissues.push({\n\t\t\t\tsource: 'migrations',\n\t\t\t\tpath: '',\n\t\t\t\tcode: 'MIGRATIONS_INVALID_SCHEMA',\n\t\t\t\tmessage: 'One or more migrations produce an invalid schema; see the diagnostics above for details',\n\t\t\t})\n\t\t}\n\n\t\tconst schema = await this.schemaLoader.loadSchema()\n\t\tfor (const err of SchemaValidator.validate(schema)) {\n\t\t\tissues.push({ source: 'schema', path: err.path.join('.'), code: err.code, message: err.message })\n\t\t}\n\n\t\tconst builtSchema = await this.schemaVersionBuilder.buildSchema()\n\t\tfor (const err of SchemaValidator.validate(builtSchema)) {\n\t\t\tissues.push({ source: 'built-schema', path: err.path.join('.'), code: err.code, message: err.message })\n\t\t}\n\n\t\t// comparing an already-invalid schema against migrations is meaningless — only diff once both sides are valid\n\t\tif (issues.length === 0) {\n\t\t\tconst diff = await this.schemaDiffer.diffSchemas(builtSchema, schema)\n\t\t\tif (diff.length > 0) {\n\t\t\t\tissues.push({\n\t\t\t\t\tsource: 'diff',\n\t\t\t\t\tpath: '',\n\t\t\t\t\tcode: 'SCHEMA_MIGRATIONS_DIFF',\n\t\t\t\t\tmessage: 'Migrations are not in sync with the defined schema',\n\t\t\t\t})\n\t\t\t}\n\t\t}\n\n\t\tconst columns: { field: keyof ValidationIssue & string; name: string }[] = [\n\t\t\t{ field: 'source', name: 'Source' },\n\t\t\t{ field: 'path', name: 'Path' },\n\t\t\t{ field: 'code', name: 'Code' },\n\t\t\t{ field: 'message', name: 'Message' },\n\t\t]\n\t\tif (issues.length > 0) {\n\t\t\tif (!output.isJson && !output.isQuiet) {\n\t\t\t\toutput.table(columns, issues, 'message')\n\t\t\t}\n\t\t\tthrow new CliError(`Project schema is invalid: found ${issues.length} issue(s)`, {\n\t\t\t\tcode: 'SCHEMA_INVALID',\n\t\t\t\texitCode: ExitCode.InputError,\n\t\t\t\tdetails: issues,\n\t\t\t})\n\t\t}\n\n\t\toutput.table(columns, issues, 'message')\n\t\toutput.info('Project schema is valid')\n\t}\n}\n"],"names":["Command","emptySchema","SchemaValidator","CliError","ExitCode"],"mappings":";;;;AAkBO,MAAM,+BAA+BA,UAAAA,QAAuB;AAAA,EAClE,YACkB,cACA,oBACA,oBACA,cACA,sBAChB;AACD,UAAA;AANiB,SAAA,eAAA;AACA,SAAA,qBAAA;AACA,SAAA,qBAAA;AACA,SAAA,eAAA;AACA,SAAA,uBAAA;AAAA,EAGlB;AAAA,EAEU,UAAU,eAA0D;AAC7E,kBAAc,YAAY,0BAA0B;AAAA,EACrD;AAAA,EAEA,MAAgB,QAAQ,OAA6B,QAA+B;AACnF,UAAM,SAA4B,CAAA;AAGlC,UAAM,aAAa,MAAM,KAAK,mBAAmB,oBAAA;AACjD,QAAI,CAAC,KAAK,mBAAmB,SAASC,YAAAA,aAAa,UAAU,GAAG;AAC/D,aAAO,KAAK;AAAA,QACX,QAAQ;AAAA,QACR,MAAM;AAAA,QACN,MAAM;AAAA,QACN,SAAS;AAAA,MAAA,CACT;AAAA,IACF;AAEA,UAAM,SAAS,MAAM,KAAK,aAAa,WAAA;AACvC,eAAW,OAAOC,YAAAA,gBAAgB,SAAS,MAAM,GAAG;AACnD,aAAO,KAAK,EAAE,QAAQ,UAAU,MAAM,IAAI,KAAK,KAAK,GAAG,GAAG,MAAM,IAAI,MAAM,SAAS,IAAI,SAAS;AAAA,IACjG;AAEA,UAAM,cAAc,MAAM,KAAK,qBAAqB,YAAA;AACpD,eAAW,OAAOA,YAAAA,gBAAgB,SAAS,WAAW,GAAG;AACxD,aAAO,KAAK,EAAE,QAAQ,gBAAgB,MAAM,IAAI,KAAK,KAAK,GAAG,GAAG,MAAM,IAAI,MAAM,SAAS,IAAI,SAAS;AAAA,IACvG;AAGA,QAAI,OAAO,WAAW,GAAG;AACxB,YAAM,OAAO,MAAM,KAAK,aAAa,YAAY,aAAa,MAAM;AACpE,UAAI,KAAK,SAAS,GAAG;AACpB,eAAO,KAAK;AAAA,UACX,QAAQ;AAAA,UACR,MAAM;AAAA,UACN,MAAM;AAAA,UACN,SAAS;AAAA,QAAA,CACT;AAAA,MACF;AAAA,IACD;AAEA,UAAM,UAAqE;AAAA,MAC1E,EAAE,OAAO,UAAU,MAAM,SAAA;AAAA,MACzB,EAAE,OAAO,QAAQ,MAAM,OAAA;AAAA,MACvB,EAAE,OAAO,QAAQ,MAAM,OAAA;AAAA,MACvB,EAAE,OAAO,WAAW,MAAM,UAAA;AAAA,IAAU;AAErC,QAAI,OAAO,SAAS,GAAG;AACtB,UAAI,CAAC,OAAO,UAAU,CAAC,OAAO,SAAS;AACtC,eAAO,MAAM,SAAS,QAAQ,SAAS;AAAA,MACxC;AACA,YAAM,IAAIC,UAAAA,SAAS,oCAAoC,OAAO,MAAM,aAAa;AAAA,QAChF,MAAM;AAAA,QACN,UAAUC,UAAAA,SAAS;AAAA,QACnB,SAAS;AAAA,MAAA,CACT;AAAA,IACF;AAEA,WAAO,MAAM,SAAS,QAAQ,SAAS;AACvC,WAAO,KAAK,yBAAyB;AAAA,EACtC;AACD;;"}

package/dist/production/src/commands/project/ProjectValidateCommand.js

@@ -1,6 +1,5 @@
-import { Command } from "@contember/cli-common";
-import { emptySchema } from "@contember/schema-utils";
-import { validateSchemaAndPrintErrors } from "../../lib/schema/SchemaValidationHelper.js";
+import { Command, CliError, ExitCode } from "@contember/cli-common";
+import { emptySchema, SchemaValidator } from "@contember/schema-utils";
 class ProjectValidateCommand extends Command {
   constructor(schemaLoader, migrationValidator, migrationsResolver, schemaDiffer, schemaVersionBuilder) {
     super();
@@ -13,25 +12,54 @@ class ProjectValidateCommand extends Command {
   configure(configuration) {
     configuration.description("Validates project schema");
   }
-  async execute() {
-    let projectValid = true;
+  async execute(input, output) {
+    const issues = [];
     const migrations = await this.migrationsResolver.getSchemaMigrations();
-    projectValid = this.migrationValidator.validate(emptySchema, migrations) && projectValid;
+    if (!this.migrationValidator.validate(emptySchema, migrations)) {
+      issues.push({
+        source: "migrations",
+        path: "",
+        code: "MIGRATIONS_INVALID_SCHEMA",
+        message: "One or more migrations produce an invalid schema; see the diagnostics above for details"
+      });
+    }
     const schema = await this.schemaLoader.loadSchema();
-    projectValid = validateSchemaAndPrintErrors(schema, "Defined schema is invalid:") && projectValid;
+    for (const err of SchemaValidator.validate(schema)) {
+      issues.push({ source: "schema", path: err.path.join("."), code: err.code, message: err.message });
+    }
     const builtSchema = await this.schemaVersionBuilder.buildSchema();
-    projectValid = validateSchemaAndPrintErrors(builtSchema, "Schema built from migrations is invalid:") && projectValid;
-    if (projectValid) {
+    for (const err of SchemaValidator.validate(builtSchema)) {
+      issues.push({ source: "built-schema", path: err.path.join("."), code: err.code, message: err.message });
+    }
+    if (issues.length === 0) {
       const diff = await this.schemaDiffer.diffSchemas(builtSchema, schema);
       if (diff.length > 0) {
-        console.log("Migrations are not in sync with a defined schema");
-        projectValid = false;
+        issues.push({
+          source: "diff",
+          path: "",
+          code: "SCHEMA_MIGRATIONS_DIFF",
+          message: "Migrations are not in sync with the defined schema"
+        });
       }
     }
-    if (projectValid) {
-      console.log("Project schema is valid");
+    const columns = [
+      { field: "source", name: "Source" },
+      { field: "path", name: "Path" },
+      { field: "code", name: "Code" },
+      { field: "message", name: "Message" }
+    ];
+    if (issues.length > 0) {
+      if (!output.isJson && !output.isQuiet) {
+        output.table(columns, issues, "message");
+      }
+      throw new CliError(`Project schema is invalid: found ${issues.length} issue(s)`, {
+        code: "SCHEMA_INVALID",
+        exitCode: ExitCode.InputError,
+        details: issues
+      });
     }
-    return projectValid ? 0 : 1;
+    output.table(columns, issues, "message");
+    output.info("Project schema is valid");
   }
 }
 export {

package/dist/production/src/commands/project/ProjectValidateCommand.js.map

@@ -1 +1 @@
-{"version":3,"file":"ProjectValidateCommand.js","sources":["../../../../../../packages/cli/src/commands/project/ProjectValidateCommand.ts"],"sourcesContent":["import { Command, CommandConfiguration } from '@contember/cli-common'\nimport { emptySchema } from '@contember/schema-utils'\nimport { SchemaLoader } from '../../lib/schema/SchemaLoader'\nimport { validateSchemaAndPrintErrors } from '../../lib/schema/SchemaValidationHelper'\nimport { MigrationsValidator } from '../../lib/migrations/MigrationsValidator'\nimport { MigrationsResolver, SchemaVersionBuilder } from '@contember/migrations-client'\nimport { SchemaDiffer } from '@contember/schema-migrations'\n\ntype Args = {}\n\ntype Options = {}\n\nexport class ProjectValidateCommand extends Command<Args, Options> {\n\tconstructor(\n\t\tprivate readonly schemaLoader: SchemaLoader,\n\t\tprivate readonly migrationValidator: MigrationsValidator,\n\t\tprivate readonly migrationsResolver: MigrationsResolver,\n\t\tprivate readonly schemaDiffer: SchemaDiffer,\n\t\tprivate readonly schemaVersionBuilder: SchemaVersionBuilder,\n\t) {\n\t\tsuper()\n\t}\n\n\tprotected configure(configuration: CommandConfiguration<Args, Options>): void {\n\t\tconfiguration.description('Validates project schema')\n\t}\n\n\tprotected async execute(): Promise<number> {\n\t\tlet projectValid = true\n\n\t\tconst migrations = await this.migrationsResolver.getSchemaMigrations()\n\t\tprojectValid = this.migrationValidator.validate(emptySchema, migrations)\n\t\t\t&& projectValid\n\n\t\tconst schema = await this.schemaLoader.loadSchema()\n\t\tprojectValid = validateSchemaAndPrintErrors(schema, 'Defined schema is invalid:')\n\t\t\t&& projectValid\n\n\t\tconst builtSchema = await this.schemaVersionBuilder.buildSchema()\n\t\tprojectValid = validateSchemaAndPrintErrors(builtSchema, 'Schema built from migrations is invalid:')\n\t\t\t&& projectValid\n\n\t\tif (projectValid) {\n\t\t\tconst diff = await this.schemaDiffer.diffSchemas(builtSchema, schema)\n\t\t\tif (diff.length > 0) {\n\t\t\t\tconsole.log('Migrations are not in sync with a defined schema')\n\t\t\t\tprojectValid = false\n\t\t\t}\n\t\t}\n\n\t\tif (projectValid) {\n\t\t\tconsole.log('Project schema is valid')\n\t\t}\n\n\t\treturn projectValid ? 0 : 1\n\t}\n}\n"],"names":[],"mappings":";;;AAYO,MAAM,+BAA+B,QAAuB;AAAA,EAClE,YACkB,cACA,oBACA,oBACA,cACA,sBAChB;AACD,UAAA;AANiB,SAAA,eAAA;AACA,SAAA,qBAAA;AACA,SAAA,qBAAA;AACA,SAAA,eAAA;AACA,SAAA,uBAAA;AAAA,EAGlB;AAAA,EAEU,UAAU,eAA0D;AAC7E,kBAAc,YAAY,0BAA0B;AAAA,EACrD;AAAA,EAEA,MAAgB,UAA2B;AAC1C,QAAI,eAAe;AAEnB,UAAM,aAAa,MAAM,KAAK,mBAAmB,oBAAA;AACjD,mBAAe,KAAK,mBAAmB,SAAS,aAAa,UAAU,KACnE;AAEJ,UAAM,SAAS,MAAM,KAAK,aAAa,WAAA;AACvC,mBAAe,6BAA6B,QAAQ,4BAA4B,KAC5E;AAEJ,UAAM,cAAc,MAAM,KAAK,qBAAqB,YAAA;AACpD,mBAAe,6BAA6B,aAAa,0CAA0C,KAC/F;AAEJ,QAAI,cAAc;AACjB,YAAM,OAAO,MAAM,KAAK,aAAa,YAAY,aAAa,MAAM;AACpE,UAAI,KAAK,SAAS,GAAG;AACpB,gBAAQ,IAAI,kDAAkD;AAC9D,uBAAe;AAAA,MAChB;AAAA,IACD;AAEA,QAAI,cAAc;AACjB,cAAQ,IAAI,yBAAyB;AAAA,IACtC;AAEA,WAAO,eAAe,IAAI;AAAA,EAC3B;AACD;"}
+{"version":3,"file":"ProjectValidateCommand.js","sources":["../../../../../../packages/cli/src/commands/project/ProjectValidateCommand.ts"],"sourcesContent":["import { CliError, Command, CommandConfiguration, ExitCode, Input, Output } from '@contember/cli-common'\nimport { emptySchema, SchemaValidator } from '@contember/schema-utils'\nimport { MigrationsValidator } from '../../lib/migrations/MigrationsValidator.js'\nimport { MigrationsResolver, SchemaVersionBuilder } from '@contember/migrations-client'\nimport { SchemaDiffer } from '@contember/schema-migrations'\nimport { SchemaLoader } from '../../lib/schema/SchemaLoader.js'\n\ntype Args = {}\n\ntype Options = {}\n\ntype ValidationIssue = {\n\tsource: 'schema' | 'built-schema' | 'migrations' | 'diff'\n\tpath: string\n\tcode: string\n\tmessage: string\n}\n\nexport class ProjectValidateCommand extends Command<Args, Options> {\n\tconstructor(\n\t\tprivate readonly schemaLoader: SchemaLoader,\n\t\tprivate readonly migrationValidator: MigrationsValidator,\n\t\tprivate readonly migrationsResolver: MigrationsResolver,\n\t\tprivate readonly schemaDiffer: SchemaDiffer,\n\t\tprivate readonly schemaVersionBuilder: SchemaVersionBuilder,\n\t) {\n\t\tsuper()\n\t}\n\n\tprotected configure(configuration: CommandConfiguration<Args, Options>): void {\n\t\tconfiguration.description('Validates project schema')\n\t}\n\n\tprotected async execute(input: Input<Args, Options>, output: Output): Promise<void> {\n\t\tconst issues: ValidationIssue[] = []\n\n\t\t// prints its own itemized diagnostics per offending migration; here we only need the pass/fail\n\t\tconst migrations = await this.migrationsResolver.getSchemaMigrations()\n\t\tif (!this.migrationValidator.validate(emptySchema, migrations)) {\n\t\t\tissues.push({\n\t\t\t\tsource: 'migrations',\n\t\t\t\tpath: '',\n\t\t\t\tcode: 'MIGRATIONS_INVALID_SCHEMA',\n\t\t\t\tmessage: 'One or more migrations produce an invalid schema; see the diagnostics above for details',\n\t\t\t})\n\t\t}\n\n\t\tconst schema = await this.schemaLoader.loadSchema()\n\t\tfor (const err of SchemaValidator.validate(schema)) {\n\t\t\tissues.push({ source: 'schema', path: err.path.join('.'), code: err.code, message: err.message })\n\t\t}\n\n\t\tconst builtSchema = await this.schemaVersionBuilder.buildSchema()\n\t\tfor (const err of SchemaValidator.validate(builtSchema)) {\n\t\t\tissues.push({ source: 'built-schema', path: err.path.join('.'), code: err.code, message: err.message })\n\t\t}\n\n\t\t// comparing an already-invalid schema against migrations is meaningless — only diff once both sides are valid\n\t\tif (issues.length === 0) {\n\t\t\tconst diff = await this.schemaDiffer.diffSchemas(builtSchema, schema)\n\t\t\tif (diff.length > 0) {\n\t\t\t\tissues.push({\n\t\t\t\t\tsource: 'diff',\n\t\t\t\t\tpath: '',\n\t\t\t\t\tcode: 'SCHEMA_MIGRATIONS_DIFF',\n\t\t\t\t\tmessage: 'Migrations are not in sync with the defined schema',\n\t\t\t\t})\n\t\t\t}\n\t\t}\n\n\t\tconst columns: { field: keyof ValidationIssue & string; name: string }[] = [\n\t\t\t{ field: 'source', name: 'Source' },\n\t\t\t{ field: 'path', name: 'Path' },\n\t\t\t{ field: 'code', name: 'Code' },\n\t\t\t{ field: 'message', name: 'Message' },\n\t\t]\n\t\tif (issues.length > 0) {\n\t\t\tif (!output.isJson && !output.isQuiet) {\n\t\t\t\toutput.table(columns, issues, 'message')\n\t\t\t}\n\t\t\tthrow new CliError(`Project schema is invalid: found ${issues.length} issue(s)`, {\n\t\t\t\tcode: 'SCHEMA_INVALID',\n\t\t\t\texitCode: ExitCode.InputError,\n\t\t\t\tdetails: issues,\n\t\t\t})\n\t\t}\n\n\t\toutput.table(columns, issues, 'message')\n\t\toutput.info('Project schema is valid')\n\t}\n}\n"],"names":[],"mappings":";;AAkBO,MAAM,+BAA+B,QAAuB;AAAA,EAClE,YACkB,cACA,oBACA,oBACA,cACA,sBAChB;AACD,UAAA;AANiB,SAAA,eAAA;AACA,SAAA,qBAAA;AACA,SAAA,qBAAA;AACA,SAAA,eAAA;AACA,SAAA,uBAAA;AAAA,EAGlB;AAAA,EAEU,UAAU,eAA0D;AAC7E,kBAAc,YAAY,0BAA0B;AAAA,EACrD;AAAA,EAEA,MAAgB,QAAQ,OAA6B,QAA+B;AACnF,UAAM,SAA4B,CAAA;AAGlC,UAAM,aAAa,MAAM,KAAK,mBAAmB,oBAAA;AACjD,QAAI,CAAC,KAAK,mBAAmB,SAAS,aAAa,UAAU,GAAG;AAC/D,aAAO,KAAK;AAAA,QACX,QAAQ;AAAA,QACR,MAAM;AAAA,QACN,MAAM;AAAA,QACN,SAAS;AAAA,MAAA,CACT;AAAA,IACF;AAEA,UAAM,SAAS,MAAM,KAAK,aAAa,WAAA;AACvC,eAAW,OAAO,gBAAgB,SAAS,MAAM,GAAG;AACnD,aAAO,KAAK,EAAE,QAAQ,UAAU,MAAM,IAAI,KAAK,KAAK,GAAG,GAAG,MAAM,IAAI,MAAM,SAAS,IAAI,SAAS;AAAA,IACjG;AAEA,UAAM,cAAc,MAAM,KAAK,qBAAqB,YAAA;AACpD,eAAW,OAAO,gBAAgB,SAAS,WAAW,GAAG;AACxD,aAAO,KAAK,EAAE,QAAQ,gBAAgB,MAAM,IAAI,KAAK,KAAK,GAAG,GAAG,MAAM,IAAI,MAAM,SAAS,IAAI,SAAS;AAAA,IACvG;AAGA,QAAI,OAAO,WAAW,GAAG;AACxB,YAAM,OAAO,MAAM,KAAK,aAAa,YAAY,aAAa,MAAM;AACpE,UAAI,KAAK,SAAS,GAAG;AACpB,eAAO,KAAK;AAAA,UACX,QAAQ;AAAA,UACR,MAAM;AAAA,UACN,MAAM;AAAA,UACN,SAAS;AAAA,QAAA,CACT;AAAA,MACF;AAAA,IACD;AAEA,UAAM,UAAqE;AAAA,MAC1E,EAAE,OAAO,UAAU,MAAM,SAAA;AAAA,MACzB,EAAE,OAAO,QAAQ,MAAM,OAAA;AAAA,MACvB,EAAE,OAAO,QAAQ,MAAM,OAAA;AAAA,MACvB,EAAE,OAAO,WAAW,MAAM,UAAA;AAAA,IAAU;AAErC,QAAI,OAAO,SAAS,GAAG;AACtB,UAAI,CAAC,OAAO,UAAU,CAAC,OAAO,SAAS;AACtC,eAAO,MAAM,SAAS,QAAQ,SAAS;AAAA,MACxC;AACA,YAAM,IAAI,SAAS,oCAAoC,OAAO,MAAM,aAAa;AAAA,QAChF,MAAM;AAAA,QACN,UAAU,SAAS;AAAA,QACnB,SAAS;AAAA,MAAA,CACT;AAAA,IACF;AAEA,WAAO,MAAM,SAAS,QAAQ,SAAS;AACvC,WAAO,KAAK,yBAAyB;AAAA,EACtC;AACD;"}

package/dist/production/src/commands/tenant/TenantApplyCommand.cjs

@@ -0,0 +1,59 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const cliCommon = require("@contember/cli-common");
+const TenantApiTransport = require("../../lib/tenant/TenantApiTransport.cjs");
+const index = require("../../lib/tenant/clients/index.cjs");
+const tenantOutput = require("./tenantOutput.cjs");
+const DEFAULT_CONFIG_PATH = "tenant.config.ts";
+class TenantApplyCommand extends cliCommon.Command {
+  constructor(remoteProjectResolver, tenantConfigLoader, tenantConfigApplier) {
+    super();
+    this.remoteProjectResolver = remoteProjectResolver;
+    this.tenantConfigLoader = tenantConfigLoader;
+    this.tenantConfigApplier = tenantConfigApplier;
+  }
+  configure(configuration) {
+    configuration.description("Apply declarative tenant configuration (global config, identity providers, mail templates, custom roles)");
+    configuration.argument("config").optional().description(`Path to the tenant config file (default: ${DEFAULT_CONFIG_PATH})`);
+    configuration.option("dsn").valueRequired().description("Project DSN. Falls back to CONTEMBER_* environment variables.");
+    configuration.option("dry-run").valueNone().description("Print the actions that would be performed without executing them.");
+  }
+  async execute(input, output) {
+    const configPath = input.getArgument("config") ?? DEFAULT_CONFIG_PATH;
+    const dsn = input.getOption("dsn");
+    const dryRun = input.getOption("dry-run") === true;
+    const remoteProject = this.remoteProjectResolver.resolve(dsn);
+    if (!remoteProject) {
+      throw new cliCommon.CliError("Project not defined. Please provide a DSN (--dsn) or set CONTEMBER_* environment variables.", {
+        code: "PROJECT_NOT_DEFINED",
+        exitCode: cliCommon.ExitCode.InputError
+      });
+    }
+    const config = await this.tenantConfigLoader.loadConfig(configPath);
+    const clients = index.createTenantClients(TenantApiTransport.TenantApiTransport.create(remoteProject.endpoint, remoteProject.token));
+    output.info(`Applying tenant config from ${configPath}`);
+    output.info(`API URL: ${remoteProject.endpoint}`);
+    const { actions, warnings } = await this.tenantConfigApplier.apply(clients, config, { dryRun });
+    const result = { configPath, dryRun, actions, warnings };
+    output.data(result, {
+      human: renderApplyResult,
+      // deliberately actions only: quiet is a scalar stream meant for piping, and the applier
+      // already printed the warnings on stderr wherever they are not suppressed
+      quiet: (value) => value.actions.map(formatAction)
+    });
+    if (actions.length === 0) {
+      output.info("Nothing to apply, the config declares no actions.");
+    } else {
+      output.info(dryRun ? "Dry run complete. No changes were made." : "Tenant configuration applied.");
+    }
+  }
+}
+const formatAction = (action) => action.target === null ? tenantOutput.humanText(action.action) : `${tenantOutput.humanText(action.action)}:${tenantOutput.humanText(action.target)}`;
+const renderApplyResult = (result) => {
+  if (result.actions.length === 0) {
+    return "No tenant configuration actions.";
+  }
+  return result.actions.map(formatAction).join("\n");
+};
+exports.TenantApplyCommand = TenantApplyCommand;
+//# sourceMappingURL=TenantApplyCommand.cjs.map

package/dist/production/src/commands/tenant/TenantApplyCommand.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"TenantApplyCommand.cjs","sources":["../../../../../../packages/cli/src/commands/tenant/TenantApplyCommand.ts"],"sourcesContent":["import { CliError, Command, CommandConfiguration, ExitCode, Input, Output } from '@contember/cli-common'\nimport { RemoteProjectResolver } from '../../lib/project/RemoteProjectResolver.js'\nimport { TenantApiTransport } from '../../lib/tenant/TenantApiTransport.js'\nimport { createTenantClients } from '../../lib/tenant/clients/index.js'\nimport { TenantConfigLoader } from '../../lib/tenant/TenantConfigLoader.js'\nimport { TenantConfigAction, TenantConfigApplier, TenantConfigWarning } from '../../lib/tenant/TenantConfigApplier.js'\nimport { humanText } from './tenantOutput.js'\n\ntype Args = {\n\tconfig?: string\n}\n\ntype Options = {\n\tdsn?: string\n\t['dry-run']?: boolean\n}\n\nconst DEFAULT_CONFIG_PATH = 'tenant.config.ts'\n\nexport class TenantApplyCommand extends Command<Args, Options> {\n\tconstructor(\n\t\tprivate readonly remoteProjectResolver: RemoteProjectResolver,\n\t\tprivate readonly tenantConfigLoader: TenantConfigLoader,\n\t\tprivate readonly tenantConfigApplier: TenantConfigApplier,\n\t) {\n\t\tsuper()\n\t}\n\n\tprotected configure(configuration: CommandConfiguration<Args, Options>): void {\n\t\tconfiguration.description('Apply declarative tenant configuration (global config, identity providers, mail templates, custom roles)')\n\t\tconfiguration.argument('config').optional().description(`Path to the tenant config file (default: ${DEFAULT_CONFIG_PATH})`)\n\t\tconfiguration.option('dsn').valueRequired().description('Project DSN. Falls back to CONTEMBER_* environment variables.')\n\t\tconfiguration.option('dry-run').valueNone().description('Print the actions that would be performed without executing them.')\n\t}\n\n\tprotected async execute(input: Input<Args, Options>, output: Output): Promise<void> {\n\t\tconst configPath = input.getArgument('config') ?? DEFAULT_CONFIG_PATH\n\t\tconst dsn = input.getOption('dsn')\n\t\tconst dryRun = input.getOption('dry-run') === true\n\n\t\tconst remoteProject = this.remoteProjectResolver.resolve(dsn)\n\t\tif (!remoteProject) {\n\t\t\tthrow new CliError('Project not defined. Please provide a DSN (--dsn) or set CONTEMBER_* environment variables.', {\n\t\t\t\tcode: 'PROJECT_NOT_DEFINED',\n\t\t\t\texitCode: ExitCode.InputError,\n\t\t\t})\n\t\t}\n\n\t\tconst config = await this.tenantConfigLoader.loadConfig(configPath)\n\t\tconst clients = createTenantClients(TenantApiTransport.create(remoteProject.endpoint, remoteProject.token))\n\n\t\toutput.info(`Applying tenant config from ${configPath}`)\n\t\toutput.info(`API URL: ${remoteProject.endpoint}`)\n\n\t\tconst { actions, warnings } = await this.tenantConfigApplier.apply(clients, config, { dryRun })\n\n\t\tconst result: TenantConfigApplyResult = { configPath, dryRun, actions, warnings }\n\t\toutput.data(result, {\n\t\t\thuman: renderApplyResult,\n\t\t\t// deliberately actions only: quiet is a scalar stream meant for piping, and the applier\n\t\t\t// already printed the warnings on stderr wherever they are not suppressed\n\t\t\tquiet: value => value.actions.map(formatAction),\n\t\t})\n\n\t\tif (actions.length === 0) {\n\t\t\toutput.info('Nothing to apply, the config declares no actions.')\n\t\t} else {\n\t\t\toutput.info(dryRun ? 'Dry run complete. No changes were made.' : 'Tenant configuration applied.')\n\t\t}\n\t}\n}\n\nexport interface TenantConfigApplyResult {\n\tconfigPath: string\n\tdryRun: boolean\n\tactions: TenantConfigAction[]\n\t/** Reachable in `--json` only; `output.warn` writes nothing outside human mode. */\n\twarnings: TenantConfigWarning[]\n}\n\nconst formatAction = (action: TenantConfigAction): string =>\n\taction.target === null ? humanText(action.action) : `${humanText(action.action)}:${humanText(action.target)}`\n\nconst renderApplyResult = (result: TenantConfigApplyResult): string => {\n\tif (result.actions.length === 0) {\n\t\treturn 'No tenant configuration actions.'\n\t}\n\treturn result.actions.map(formatAction).join('\\n')\n}\n"],"names":["Command","CliError","ExitCode","createTenantClients","TenantApiTransport","humanText"],"mappings":";;;;;;AAiBA,MAAM,sBAAsB;AAErB,MAAM,2BAA2BA,UAAAA,QAAuB;AAAA,EAC9D,YACkB,uBACA,oBACA,qBAChB;AACD,UAAA;AAJiB,SAAA,wBAAA;AACA,SAAA,qBAAA;AACA,SAAA,sBAAA;AAAA,EAGlB;AAAA,EAEU,UAAU,eAA0D;AAC7E,kBAAc,YAAY,0GAA0G;AACpI,kBAAc,SAAS,QAAQ,EAAE,SAAA,EAAW,YAAY,4CAA4C,mBAAmB,GAAG;AAC1H,kBAAc,OAAO,KAAK,EAAE,cAAA,EAAgB,YAAY,+DAA+D;AACvH,kBAAc,OAAO,SAAS,EAAE,UAAA,EAAY,YAAY,mEAAmE;AAAA,EAC5H;AAAA,EAEA,MAAgB,QAAQ,OAA6B,QAA+B;AACnF,UAAM,aAAa,MAAM,YAAY,QAAQ,KAAK;AAClD,UAAM,MAAM,MAAM,UAAU,KAAK;AACjC,UAAM,SAAS,MAAM,UAAU,SAAS,MAAM;AAE9C,UAAM,gBAAgB,KAAK,sBAAsB,QAAQ,GAAG;AAC5D,QAAI,CAAC,eAAe;AACnB,YAAM,IAAIC,UAAAA,SAAS,+FAA+F;AAAA,QACjH,MAAM;AAAA,QACN,UAAUC,UAAAA,SAAS;AAAA,MAAA,CACnB;AAAA,IACF;AAEA,UAAM,SAAS,MAAM,KAAK,mBAAmB,WAAW,UAAU;AAClE,UAAM,UAAUC,MAAAA,oBAAoBC,sCAAmB,OAAO,cAAc,UAAU,cAAc,KAAK,CAAC;AAE1G,WAAO,KAAK,+BAA+B,UAAU,EAAE;AACvD,WAAO,KAAK,YAAY,cAAc,QAAQ,EAAE;AAEhD,UAAM,EAAE,SAAS,SAAA,IAAa,MAAM,KAAK,oBAAoB,MAAM,SAAS,QAAQ,EAAE,OAAA,CAAQ;AAE9F,UAAM,SAAkC,EAAE,YAAY,QAAQ,SAAS,SAAA;AACvE,WAAO,KAAK,QAAQ;AAAA,MACnB,OAAO;AAAA;AAAA;AAAA,MAGP,OAAO,CAAA,UAAS,MAAM,QAAQ,IAAI,YAAY;AAAA,IAAA,CAC9C;AAED,QAAI,QAAQ,WAAW,GAAG;AACzB,aAAO,KAAK,mDAAmD;AAAA,IAChE,OAAO;AACN,aAAO,KAAK,SAAS,4CAA4C,+BAA+B;AAAA,IACjG;AAAA,EACD;AACD;AAUA,MAAM,eAAe,CAAC,WACrB,OAAO,WAAW,OAAOC,aAAAA,UAAU,OAAO,MAAM,IAAI,GAAGA,uBAAU,OAAO,MAAM,CAAC,IAAIA,aAAAA,UAAU,OAAO,MAAM,CAAC;AAE5G,MAAM,oBAAoB,CAAC,WAA4C;AACtE,MAAI,OAAO,QAAQ,WAAW,GAAG;AAChC,WAAO;AAAA,EACR;AACA,SAAO,OAAO,QAAQ,IAAI,YAAY,EAAE,KAAK,IAAI;AAClD;;"}