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

package/dist/development/src/commands/transfer/utils.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"utils.cjs","sources":["../../../../../../packages/cli/src/commands/transfer/utils.ts"],"sourcesContent":["import { Input } from '@contember/cli-common'\nimport prompts from 'prompts'\n\nexport const confirmImport = async (input: Input<{}, { yes: boolean }>): Promise<boolean> => {\n\tif (input.getOption('yes')) {\n\t\treturn true\n\t}\n\tif (!process.stdin.isTTY) {\n\t\tthrow 'TTY not available. Pass --yes option to confirm execution.'\n\t}\n\tconsole.log('This will completely wipe the target project.')\n\tconsole.log('(to skip this dialog, you can pass --yes option)')\n\tconsole.log('')\n\tconst { ok } = await prompts({\n\t\ttype: 'confirm',\n\t\tname: 'ok',\n\t\tmessage: `Do you want to continue?`,\n\t})\n\treturn ok\n}\n"],"names":[],"mappings":";;;AAGO,MAAM,gBAAgB,OAAO,UAAyD;AAC5F,MAAI,MAAM,UAAU,KAAK,GAAG;AAC3B,WAAO;AAAA,EACR;AACA,MAAI,CAAC,QAAQ,MAAM,OAAO;AACzB,UAAM;AAAA,EACP;AACA,UAAQ,IAAI,+CAA+C;AAC3D,UAAQ,IAAI,kDAAkD;AAC9D,UAAQ,IAAI,EAAE;AACd,QAAM,EAAE,OAAO,MAAM,QAAQ;AAAA,IAC5B,MAAM;AAAA,IACN,MAAM;AAAA,IACN,SAAS;AAAA,EAAA,CACT;AACD,SAAO;AACR;;"}
+{"version":3,"file":"utils.cjs","sources":["../../../../../../packages/cli/src/commands/transfer/utils.ts"],"sourcesContent":["import { CliError, ExitCode, Input, Output } from '@contember/cli-common'\nimport { promptConfirm } from '../../lib/prompt/index.js'\n\nexport const confirmImport = async (input: Input<{}, { yes: boolean }>, output: Output): Promise<boolean> => {\n\tif (input.getOption('yes')) {\n\t\treturn true\n\t}\n\tif (!output.canPrompt()) {\n\t\tthrow new CliError('TTY not available. Pass --yes to confirm execution.', {\n\t\t\tcode: 'TTY_UNAVAILABLE',\n\t\t\texitCode: ExitCode.InputError,\n\t\t})\n\t}\n\toutput.warn('This will completely wipe the target project.')\n\toutput.info('(to skip this dialog, you can pass --yes option)')\n\toutput.info('')\n\tconst ok = await promptConfirm(output, {\n\t\tmessage: `Do you want to continue?`,\n\t})\n\treturn ok\n}\n"],"names":["CliError","ExitCode","promptConfirm"],"mappings":";;;;AAGO,MAAM,gBAAgB,OAAO,OAAoC,WAAqC;AAC5G,MAAI,MAAM,UAAU,KAAK,GAAG;AAC3B,WAAO;AAAA,EACR;AACA,MAAI,CAAC,OAAO,aAAa;AACxB,UAAM,IAAIA,UAAAA,SAAS,uDAAuD;AAAA,MACzE,MAAM;AAAA,MACN,UAAUC,UAAAA,SAAS;AAAA,IAAA,CACnB;AAAA,EACF;AACA,SAAO,KAAK,+CAA+C;AAC3D,SAAO,KAAK,kDAAkD;AAC9D,SAAO,KAAK,EAAE;AACd,QAAM,KAAK,MAAMC,OAAAA,cAAc,QAAQ;AAAA,IACtC,SAAS;AAAA,EAAA,CACT;AACD,SAAO;AACR;;"}

package/dist/development/src/commands/transfer/utils.js

@@ -1,17 +1,19 @@
-import prompts from "prompts";
-const confirmImport = async (input) => {
+import { CliError, ExitCode } from "@contember/cli-common";
+import { promptConfirm } from "../../lib/prompt/prompt.js";
+const confirmImport = async (input, output) => {
   if (input.getOption("yes")) {
     return true;
   }
-  if (!process.stdin.isTTY) {
-    throw "TTY not available. Pass --yes option to confirm execution.";
+  if (!output.canPrompt()) {
+    throw new CliError("TTY not available. Pass --yes to confirm execution.", {
+      code: "TTY_UNAVAILABLE",
+      exitCode: ExitCode.InputError
+    });
   }
-  console.log("This will completely wipe the target project.");
-  console.log("(to skip this dialog, you can pass --yes option)");
-  console.log("");
-  const { ok } = await prompts({
-    type: "confirm",
-    name: "ok",
+  output.warn("This will completely wipe the target project.");
+  output.info("(to skip this dialog, you can pass --yes option)");
+  output.info("");
+  const ok = await promptConfirm(output, {
     message: `Do you want to continue?`
   });
   return ok;

package/dist/development/src/commands/transfer/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sources":["../../../../../../packages/cli/src/commands/transfer/utils.ts"],"sourcesContent":["import { Input } from '@contember/cli-common'\nimport prompts from 'prompts'\n\nexport const confirmImport = async (input: Input<{}, { yes: boolean }>): Promise<boolean> => {\n\tif (input.getOption('yes')) {\n\t\treturn true\n\t}\n\tif (!process.stdin.isTTY) {\n\t\tthrow 'TTY not available. Pass --yes option to confirm execution.'\n\t}\n\tconsole.log('This will completely wipe the target project.')\n\tconsole.log('(to skip this dialog, you can pass --yes option)')\n\tconsole.log('')\n\tconst { ok } = await prompts({\n\t\ttype: 'confirm',\n\t\tname: 'ok',\n\t\tmessage: `Do you want to continue?`,\n\t})\n\treturn ok\n}\n"],"names":[],"mappings":";AAGO,MAAM,gBAAgB,OAAO,UAAyD;AAC5F,MAAI,MAAM,UAAU,KAAK,GAAG;AAC3B,WAAO;AAAA,EACR;AACA,MAAI,CAAC,QAAQ,MAAM,OAAO;AACzB,UAAM;AAAA,EACP;AACA,UAAQ,IAAI,+CAA+C;AAC3D,UAAQ,IAAI,kDAAkD;AAC9D,UAAQ,IAAI,EAAE;AACd,QAAM,EAAE,OAAO,MAAM,QAAQ;AAAA,IAC5B,MAAM;AAAA,IACN,MAAM;AAAA,IACN,SAAS;AAAA,EAAA,CACT;AACD,SAAO;AACR;"}
+{"version":3,"file":"utils.js","sources":["../../../../../../packages/cli/src/commands/transfer/utils.ts"],"sourcesContent":["import { CliError, ExitCode, Input, Output } from '@contember/cli-common'\nimport { promptConfirm } from '../../lib/prompt/index.js'\n\nexport const confirmImport = async (input: Input<{}, { yes: boolean }>, output: Output): Promise<boolean> => {\n\tif (input.getOption('yes')) {\n\t\treturn true\n\t}\n\tif (!output.canPrompt()) {\n\t\tthrow new CliError('TTY not available. Pass --yes to confirm execution.', {\n\t\t\tcode: 'TTY_UNAVAILABLE',\n\t\t\texitCode: ExitCode.InputError,\n\t\t})\n\t}\n\toutput.warn('This will completely wipe the target project.')\n\toutput.info('(to skip this dialog, you can pass --yes option)')\n\toutput.info('')\n\tconst ok = await promptConfirm(output, {\n\t\tmessage: `Do you want to continue?`,\n\t})\n\treturn ok\n}\n"],"names":[],"mappings":";;AAGO,MAAM,gBAAgB,OAAO,OAAoC,WAAqC;AAC5G,MAAI,MAAM,UAAU,KAAK,GAAG;AAC3B,WAAO;AAAA,EACR;AACA,MAAI,CAAC,OAAO,aAAa;AACxB,UAAM,IAAI,SAAS,uDAAuD;AAAA,MACzE,MAAM;AAAA,MACN,UAAU,SAAS;AAAA,IAAA,CACnB;AAAA,EACF;AACA,SAAO,KAAK,+CAA+C;AAC3D,SAAO,KAAK,kDAAkD;AAC9D,SAAO,KAAK,EAAE;AACd,QAAM,KAAK,MAAM,cAAc,QAAQ;AAAA,IACtC,SAAS;AAAA,EAAA,CACT;AACD,SAAO;AACR;"}

package/dist/development/src/commands/workspace/WorkspaceUpdateApiCommand.cjs

@@ -12,45 +12,100 @@ class WorkspaceUpdateApiCommand extends cliCommon.Command {
     configuration.description("Updates Contember API version and all related packages");
     configuration.argument("version");
   }
-  async execute(input) {
+  async execute(input, output) {
     const version = input.getArgument("version");
     const packageWorkspace = await this.packageWorkspaceResolver.resolve();
-    await packageWorkspace.updateEverywhere({
+    const packageUpdates = {
       "@contember/schema": version,
       "@contember/schema-definition": version,
       "@contember/cli": version
-    });
-    console.log("Updating docker-compose");
-    const getNewImage = (currentImage) => {
-      for (const candidate of consts.contemberDockerImages) {
-        if (currentImage.startsWith(`${candidate}:`)) {
-          return `${candidate.replace(/-ee$/, "")}:${version}`;
-        }
-      }
-      return null;
     };
-    await this.dockerComposeManager.updateMainDockerComposeConfig((data) => ({
-      ...data,
-      services: Object.fromEntries(
-        Object.entries(data?.services ?? {}).map(([name, service]) => {
-          const newImage = getNewImage(service.image);
-          if (newImage) {
-            console.log(`docker-compose service ${name} updated`);
-            return [
-              name,
-              {
-                ...service,
-                image: newImage
-              }
-            ];
-          }
-          return [name, service];
-        })
-      )
-    }));
-    console.log("API versions updated");
-    console.log("Restart server to apply changes");
+    validatePackageUpdatePlan(packageWorkspace, packageUpdates);
+    const composePlan = createWorkspaceApiUpdatePlan(
+      await this.dockerComposeManager.tryReadMainDockerComposeConfig(),
+      version
+    );
+    const updatedDependencies = await packageWorkspace.updateEverywhere(packageUpdates);
+    const updatedPackages = [...new Set(updatedDependencies.map((dependency) => dependency.name))];
+    output.info("Updating docker-compose");
+    await this.dockerComposeManager.updateMainDockerComposeConfig(() => composePlan.compose);
+    for (const name of composePlan.updatedServices) {
+      output.info(`docker-compose service ${name} updated`);
+    }
+    output.info("API versions updated");
+    output.info("Restart server to apply changes");
+    writeMachineResult(output, { version, updatedPackages, updatedServices: composePlan.updatedServices });
   }
 }
+const writeMachineResult = (output, result) => {
+  if (output.mode !== "human") {
+    output.data(result, {
+      quiet: (value) => [value.version, ...value.updatedPackages, ...value.updatedServices]
+    });
+  }
+};
+const createWorkspaceApiUpdatePlan = (input, version) => {
+  if (version.length === 0) {
+    throw invalidWorkspaceUpdate("Version must not be empty", "version");
+  }
+  if (input !== null && input !== void 0 && !isDockerComposeConfig(input)) {
+    throw invalidWorkspaceUpdate("docker-compose configuration is malformed", "docker-compose");
+  }
+  const config = input ?? {};
+  const services = {};
+  const updatedServices = [];
+  for (const [name, service] of Object.entries(config.services ?? {})) {
+    const image = service.image === void 0 ? null : getNewImage(service.image, version);
+    if (image === null) {
+      services[name] = service;
+      continue;
+    }
+    services[name] = { ...service, image };
+    updatedServices.push(name);
+  }
+  return { compose: { ...config, services }, updatedServices };
+};
+const validatePackageUpdatePlan = (workspace, updates) => {
+  for (const [packageName, version] of Object.entries(updates)) {
+    if (packageName.length === 0 || version.length === 0) {
+      throw invalidWorkspaceUpdate("Package update is malformed", packageName || "package");
+    }
+    const dependencies = workspace.findDefinedDependencies(packageName);
+    if (!Array.isArray(dependencies) || !dependencies.every((value) => isPlannedDependency(value, packageName))) {
+      throw invalidWorkspaceUpdate(`Package metadata for ${packageName} is malformed`, packageName);
+    }
+  }
+};
+const isPlannedDependency = (value, packageName) => {
+  if (!isRecord(value) || typeof value.name !== "string" || typeof value.version !== "string" || typeof value.isDev !== "boolean") {
+    return false;
+  }
+  return value.name === packageName && value.version.length > 0 && isRecord(value.pckg) && typeof value.pckg.dir === "string" && typeof value.pckg.isRoot === "boolean";
+};
+const isDockerComposeConfig = (value) => {
+  if (!isRecord(value)) {
+    return false;
+  }
+  if (value.services === void 0) {
+    return true;
+  }
+  return isRecord(value.services) && Object.values(value.services).every(isDockerComposeServiceRecord);
+};
+const isDockerComposeServiceRecord = (value) => isRecord(value) && (value.image === void 0 || typeof value.image === "string");
+const isRecord = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
+const getNewImage = (currentImage, version) => {
+  for (const candidate of consts.contemberDockerImages) {
+    if (currentImage.startsWith(`${candidate}:`)) {
+      return `${candidate.replace(/-ee$/, "")}:${version}`;
+    }
+  }
+  return null;
+};
+const invalidWorkspaceUpdate = (message, source) => new cliCommon.CliError(message, {
+  code: "INVALID_WORKSPACE_UPDATE",
+  exitCode: cliCommon.ExitCode.InputError,
+  details: { source }
+});
 exports.WorkspaceUpdateApiCommand = WorkspaceUpdateApiCommand;
+exports.createWorkspaceApiUpdatePlan = createWorkspaceApiUpdatePlan;
 //# sourceMappingURL=WorkspaceUpdateApiCommand.cjs.map

package/dist/development/src/commands/workspace/WorkspaceUpdateApiCommand.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"WorkspaceUpdateApiCommand.cjs","sources":["../../../../../../packages/cli/src/commands/workspace/WorkspaceUpdateApiCommand.ts"],"sourcesContent":["import { Command, CommandConfiguration, Input, PackageWorkspaceResolver } from '@contember/cli-common'\nimport { DockerComposeManager } from '../../lib/fs/DockerComposeManager'\nimport { contemberDockerImages } from '../../consts'\n\ntype Args = {\n\tversion: string\n}\n\ntype Options = {}\n\nexport class WorkspaceUpdateApiCommand extends Command<Args, Options> {\n\tconstructor(\n\t\tprivate readonly packageWorkspaceResolver: PackageWorkspaceResolver,\n\t\tprivate readonly dockerComposeManager: DockerComposeManager,\n\t) {\n\t\tsuper()\n\t}\n\n\tprotected configure(configuration: CommandConfiguration<Args, Options>): void {\n\t\tconfiguration.description('Updates Contember API version and all related packages')\n\t\tconfiguration.argument('version')\n\t}\n\n\tprotected async execute(input: Input<Args, Options>): Promise<void> {\n\t\tconst version = input.getArgument('version')\n\t\tconst packageWorkspace = await this.packageWorkspaceResolver.resolve()\n\n\t\tawait packageWorkspace.updateEverywhere({\n\t\t\t'@contember/schema': version,\n\t\t\t'@contember/schema-definition': version,\n\t\t\t'@contember/cli': version,\n\t\t})\n\n\t\tconsole.log('Updating docker-compose')\n\t\tconst getNewImage = (currentImage: string): string | null => {\n\t\t\tfor (const candidate of contemberDockerImages) {\n\t\t\t\tif (currentImage.startsWith(`${candidate}:`)) {\n\t\t\t\t\treturn `${candidate.replace(/-ee$/, '')}:${version}`\n\t\t\t\t}\n\t\t\t}\n\t\t\treturn null\n\t\t}\n\t\tawait this.dockerComposeManager.updateMainDockerComposeConfig(data => ({\n\t\t\t...data,\n\t\t\tservices: Object.fromEntries(\n\t\t\t\tObject.entries(data?.services ?? {}).map(([name, service]: [string, any]) => {\n\t\t\t\t\tconst newImage = getNewImage(service.image)\n\t\t\t\t\tif (newImage) {\n\t\t\t\t\t\tconsole.log(`docker-compose service ${name} updated`)\n\t\t\t\t\t\treturn [\n\t\t\t\t\t\t\tname,\n\t\t\t\t\t\t\t{\n\t\t\t\t\t\t\t\t...service,\n\t\t\t\t\t\t\t\timage: newImage,\n\t\t\t\t\t\t\t},\n\t\t\t\t\t\t]\n\t\t\t\t\t}\n\t\t\t\t\treturn [name, service]\n\t\t\t\t}),\n\t\t\t),\n\t\t}))\n\t\tconsole.log('API versions updated')\n\t\tconsole.log('Restart server to apply changes')\n\t}\n}\n"],"names":["Command","contemberDockerImages"],"mappings":";;;;AAUO,MAAM,kCAAkCA,UAAAA,QAAuB;AAAA,EACrE,YACkB,0BACA,sBAChB;AACD,UAAA;AAHiB,SAAA,2BAAA;AACA,SAAA,uBAAA;AAAA,EAGlB;AAAA,EAEU,UAAU,eAA0D;AAC7E,kBAAc,YAAY,wDAAwD;AAClF,kBAAc,SAAS,SAAS;AAAA,EACjC;AAAA,EAEA,MAAgB,QAAQ,OAA4C;AACnE,UAAM,UAAU,MAAM,YAAY,SAAS;AAC3C,UAAM,mBAAmB,MAAM,KAAK,yBAAyB,QAAA;AAE7D,UAAM,iBAAiB,iBAAiB;AAAA,MACvC,qBAAqB;AAAA,MACrB,gCAAgC;AAAA,MAChC,kBAAkB;AAAA,IAAA,CAClB;AAED,YAAQ,IAAI,yBAAyB;AACrC,UAAM,cAAc,CAAC,iBAAwC;AAC5D,iBAAW,aAAaC,8BAAuB;AAC9C,YAAI,aAAa,WAAW,GAAG,SAAS,GAAG,GAAG;AAC7C,iBAAO,GAAG,UAAU,QAAQ,QAAQ,EAAE,CAAC,IAAI,OAAO;AAAA,QACnD;AAAA,MACD;AACA,aAAO;AAAA,IACR;AACA,UAAM,KAAK,qBAAqB,8BAA8B,CAAA,UAAS;AAAA,MACtE,GAAG;AAAA,MACH,UAAU,OAAO;AAAA,QAChB,OAAO,QAAQ,MAAM,YAAY,CAAA,CAAE,EAAE,IAAI,CAAC,CAAC,MAAM,OAAO,MAAqB;AAC5E,gBAAM,WAAW,YAAY,QAAQ,KAAK;AAC1C,cAAI,UAAU;AACb,oBAAQ,IAAI,0BAA0B,IAAI,UAAU;AACpD,mBAAO;AAAA,cACN;AAAA,cACA;AAAA,gBACC,GAAG;AAAA,gBACH,OAAO;AAAA,cAAA;AAAA,YACR;AAAA,UAEF;AACA,iBAAO,CAAC,MAAM,OAAO;AAAA,QACtB,CAAC;AAAA,MAAA;AAAA,IACF,EACC;AACF,YAAQ,IAAI,sBAAsB;AAClC,YAAQ,IAAI,iCAAiC;AAAA,EAC9C;AACD;;"}
+{"version":3,"file":"WorkspaceUpdateApiCommand.cjs","sources":["../../../../../../packages/cli/src/commands/workspace/WorkspaceUpdateApiCommand.ts"],"sourcesContent":["import { CliError, Command, CommandConfiguration, ExitCode, Input, Output } from '@contember/cli-common'\nimport { DockerComposeConfig } from '../../lib/fs/DockerComposeManager.js'\nimport { contemberDockerImages } from '../../consts.js'\n\ntype Args = {\n\tversion: string\n}\n\ntype Options = {}\n\nexport interface PackageUpdateWorkspace {\n\tfindDefinedDependencies(packageName: string): unknown\n\tupdateEverywhere(updates: Record<string, string>): Promise<readonly { name: string }[]>\n}\n\nexport interface PackageUpdateWorkspaceResolver {\n\tresolve(): Promise<PackageUpdateWorkspace>\n}\n\nexport interface DockerComposeAccess {\n\ttryReadMainDockerComposeConfig(): Promise<unknown>\n\tupdateMainDockerComposeConfig(updater: (data: Partial<DockerComposeConfig>) => DockerComposeConfig): Promise<void>\n}\n\nexport interface WorkspaceApiUpdatePlan {\n\tcompose: DockerComposeConfig\n\tupdatedServices: string[]\n}\n\nexport interface WorkspaceApiUpdateResult {\n\tversion: string\n\tupdatedPackages: string[]\n\tupdatedServices: string[]\n}\n\ntype DockerComposeServiceRecord = Record<string, unknown> & { image?: string }\ntype DockerComposeDocument = Record<string, unknown> & { services?: Record<string, DockerComposeServiceRecord> }\n\nexport class WorkspaceUpdateApiCommand extends Command<Args, Options> {\n\tconstructor(\n\t\tprivate readonly packageWorkspaceResolver: PackageUpdateWorkspaceResolver,\n\t\tprivate readonly dockerComposeManager: DockerComposeAccess,\n\t) {\n\t\tsuper()\n\t}\n\n\tprotected configure(configuration: CommandConfiguration<Args, Options>): void {\n\t\tconfiguration.description('Updates Contember API version and all related packages')\n\t\tconfiguration.argument('version')\n\t}\n\n\tprotected async execute(input: Input<Args, Options>, output: Output): Promise<void> {\n\t\tconst version = input.getArgument('version')\n\t\tconst packageWorkspace = await this.packageWorkspaceResolver.resolve()\n\t\tconst packageUpdates = {\n\t\t\t'@contember/schema': version,\n\t\t\t'@contember/schema-definition': version,\n\t\t\t'@contember/cli': version,\n\t\t}\n\n\t\tvalidatePackageUpdatePlan(packageWorkspace, packageUpdates)\n\t\tconst composePlan = createWorkspaceApiUpdatePlan(\n\t\t\tawait this.dockerComposeManager.tryReadMainDockerComposeConfig(),\n\t\t\tversion,\n\t\t)\n\n\t\tconst updatedDependencies = await packageWorkspace.updateEverywhere(packageUpdates)\n\t\tconst updatedPackages = [...new Set(updatedDependencies.map(dependency => dependency.name))]\n\n\t\toutput.info('Updating docker-compose')\n\t\tawait this.dockerComposeManager.updateMainDockerComposeConfig(() => composePlan.compose)\n\t\tfor (const name of composePlan.updatedServices) {\n\t\t\toutput.info(`docker-compose service ${name} updated`)\n\t\t}\n\t\toutput.info('API versions updated')\n\t\toutput.info('Restart server to apply changes')\n\t\twriteMachineResult(output, { version, updatedPackages, updatedServices: composePlan.updatedServices })\n\t}\n}\n\nconst writeMachineResult = (output: Output, result: WorkspaceApiUpdateResult): void => {\n\tif (output.mode !== 'human') {\n\t\toutput.data(result, {\n\t\t\tquiet: value => [value.version, ...value.updatedPackages, ...value.updatedServices],\n\t\t})\n\t}\n}\n\nexport const createWorkspaceApiUpdatePlan = (input: unknown, version: string): WorkspaceApiUpdatePlan => {\n\tif (version.length === 0) {\n\t\tthrow invalidWorkspaceUpdate('Version must not be empty', 'version')\n\t}\n\tif (input !== null && input !== undefined && !isDockerComposeConfig(input)) {\n\t\tthrow invalidWorkspaceUpdate('docker-compose configuration is malformed', 'docker-compose')\n\t}\n\n\tconst config = input ?? {}\n\tconst services: Record<string, DockerComposeServiceRecord> = {}\n\tconst updatedServices: string[] = []\n\tfor (const [name, service] of Object.entries(config.services ?? {})) {\n\t\tconst image = service.image === undefined ? null : getNewImage(service.image, version)\n\t\tif (image === null) {\n\t\t\tservices[name] = service\n\t\t\tcontinue\n\t\t}\n\t\tservices[name] = { ...service, image }\n\t\tupdatedServices.push(name)\n\t}\n\treturn { compose: { ...config, services }, updatedServices }\n}\n\nconst validatePackageUpdatePlan = (workspace: PackageUpdateWorkspace, updates: Record<string, string>): void => {\n\tfor (const [packageName, version] of Object.entries(updates)) {\n\t\tif (packageName.length === 0 || version.length === 0) {\n\t\t\tthrow invalidWorkspaceUpdate('Package update is malformed', packageName || 'package')\n\t\t}\n\t\tconst dependencies = workspace.findDefinedDependencies(packageName)\n\t\tif (!Array.isArray(dependencies) || !dependencies.every(value => isPlannedDependency(value, packageName))) {\n\t\t\tthrow invalidWorkspaceUpdate(`Package metadata for ${packageName} is malformed`, packageName)\n\t\t}\n\t}\n}\n\nconst isPlannedDependency = (value: unknown, packageName: string): boolean => {\n\tif (!isRecord(value) || typeof value.name !== 'string' || typeof value.version !== 'string' || typeof value.isDev !== 'boolean') {\n\t\treturn false\n\t}\n\treturn value.name === packageName\n\t\t&& value.version.length > 0\n\t\t&& isRecord(value.pckg)\n\t\t&& typeof value.pckg.dir === 'string'\n\t\t&& typeof value.pckg.isRoot === 'boolean'\n}\n\nconst isDockerComposeConfig = (value: unknown): value is DockerComposeDocument => {\n\tif (!isRecord(value)) {\n\t\treturn false\n\t}\n\tif (value.services === undefined) {\n\t\treturn true\n\t}\n\treturn isRecord(value.services) && Object.values(value.services).every(isDockerComposeServiceRecord)\n}\n\nconst isDockerComposeServiceRecord = (value: unknown): value is DockerComposeServiceRecord =>\n\tisRecord(value) && (value.image === undefined || typeof value.image === 'string')\n\nconst isRecord = (value: unknown): value is Record<string, unknown> => typeof value === 'object' && value !== null && !Array.isArray(value)\n\nconst getNewImage = (currentImage: string, version: string): string | null => {\n\tfor (const candidate of contemberDockerImages) {\n\t\tif (currentImage.startsWith(`${candidate}:`)) {\n\t\t\treturn `${candidate.replace(/-ee$/, '')}:${version}`\n\t\t}\n\t}\n\treturn null\n}\n\nconst invalidWorkspaceUpdate = (message: string, source: string): CliError =>\n\tnew CliError(message, {\n\t\tcode: 'INVALID_WORKSPACE_UPDATE',\n\t\texitCode: ExitCode.InputError,\n\t\tdetails: { source },\n\t})\n"],"names":["Command","contemberDockerImages","CliError","ExitCode"],"mappings":"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"}

package/dist/development/src/commands/workspace/WorkspaceUpdateApiCommand.js

@@ -1,4 +1,4 @@
-import { Command } from "@contember/cli-common";
+import { Command, CliError, ExitCode } from "@contember/cli-common";
 import { contemberDockerImages } from "../../consts.js";
 class WorkspaceUpdateApiCommand extends Command {
   constructor(packageWorkspaceResolver, dockerComposeManager) {
@@ -10,47 +10,102 @@ class WorkspaceUpdateApiCommand extends Command {
     configuration.description("Updates Contember API version and all related packages");
     configuration.argument("version");
   }
-  async execute(input) {
+  async execute(input, output) {
     const version = input.getArgument("version");
     const packageWorkspace = await this.packageWorkspaceResolver.resolve();
-    await packageWorkspace.updateEverywhere({
+    const packageUpdates = {
       "@contember/schema": version,
       "@contember/schema-definition": version,
       "@contember/cli": version
-    });
-    console.log("Updating docker-compose");
-    const getNewImage = (currentImage) => {
-      for (const candidate of contemberDockerImages) {
-        if (currentImage.startsWith(`${candidate}:`)) {
-          return `${candidate.replace(/-ee$/, "")}:${version}`;
-        }
-      }
-      return null;
     };
-    await this.dockerComposeManager.updateMainDockerComposeConfig((data) => ({
-      ...data,
-      services: Object.fromEntries(
-        Object.entries(data?.services ?? {}).map(([name, service]) => {
-          const newImage = getNewImage(service.image);
-          if (newImage) {
-            console.log(`docker-compose service ${name} updated`);
-            return [
-              name,
-              {
-                ...service,
-                image: newImage
-              }
-            ];
-          }
-          return [name, service];
-        })
-      )
-    }));
-    console.log("API versions updated");
-    console.log("Restart server to apply changes");
+    validatePackageUpdatePlan(packageWorkspace, packageUpdates);
+    const composePlan = createWorkspaceApiUpdatePlan(
+      await this.dockerComposeManager.tryReadMainDockerComposeConfig(),
+      version
+    );
+    const updatedDependencies = await packageWorkspace.updateEverywhere(packageUpdates);
+    const updatedPackages = [...new Set(updatedDependencies.map((dependency) => dependency.name))];
+    output.info("Updating docker-compose");
+    await this.dockerComposeManager.updateMainDockerComposeConfig(() => composePlan.compose);
+    for (const name of composePlan.updatedServices) {
+      output.info(`docker-compose service ${name} updated`);
+    }
+    output.info("API versions updated");
+    output.info("Restart server to apply changes");
+    writeMachineResult(output, { version, updatedPackages, updatedServices: composePlan.updatedServices });
   }
 }
+const writeMachineResult = (output, result) => {
+  if (output.mode !== "human") {
+    output.data(result, {
+      quiet: (value) => [value.version, ...value.updatedPackages, ...value.updatedServices]
+    });
+  }
+};
+const createWorkspaceApiUpdatePlan = (input, version) => {
+  if (version.length === 0) {
+    throw invalidWorkspaceUpdate("Version must not be empty", "version");
+  }
+  if (input !== null && input !== void 0 && !isDockerComposeConfig(input)) {
+    throw invalidWorkspaceUpdate("docker-compose configuration is malformed", "docker-compose");
+  }
+  const config = input ?? {};
+  const services = {};
+  const updatedServices = [];
+  for (const [name, service] of Object.entries(config.services ?? {})) {
+    const image = service.image === void 0 ? null : getNewImage(service.image, version);
+    if (image === null) {
+      services[name] = service;
+      continue;
+    }
+    services[name] = { ...service, image };
+    updatedServices.push(name);
+  }
+  return { compose: { ...config, services }, updatedServices };
+};
+const validatePackageUpdatePlan = (workspace, updates) => {
+  for (const [packageName, version] of Object.entries(updates)) {
+    if (packageName.length === 0 || version.length === 0) {
+      throw invalidWorkspaceUpdate("Package update is malformed", packageName || "package");
+    }
+    const dependencies = workspace.findDefinedDependencies(packageName);
+    if (!Array.isArray(dependencies) || !dependencies.every((value) => isPlannedDependency(value, packageName))) {
+      throw invalidWorkspaceUpdate(`Package metadata for ${packageName} is malformed`, packageName);
+    }
+  }
+};
+const isPlannedDependency = (value, packageName) => {
+  if (!isRecord(value) || typeof value.name !== "string" || typeof value.version !== "string" || typeof value.isDev !== "boolean") {
+    return false;
+  }
+  return value.name === packageName && value.version.length > 0 && isRecord(value.pckg) && typeof value.pckg.dir === "string" && typeof value.pckg.isRoot === "boolean";
+};
+const isDockerComposeConfig = (value) => {
+  if (!isRecord(value)) {
+    return false;
+  }
+  if (value.services === void 0) {
+    return true;
+  }
+  return isRecord(value.services) && Object.values(value.services).every(isDockerComposeServiceRecord);
+};
+const isDockerComposeServiceRecord = (value) => isRecord(value) && (value.image === void 0 || typeof value.image === "string");
+const isRecord = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
+const getNewImage = (currentImage, version) => {
+  for (const candidate of contemberDockerImages) {
+    if (currentImage.startsWith(`${candidate}:`)) {
+      return `${candidate.replace(/-ee$/, "")}:${version}`;
+    }
+  }
+  return null;
+};
+const invalidWorkspaceUpdate = (message, source) => new CliError(message, {
+  code: "INVALID_WORKSPACE_UPDATE",
+  exitCode: ExitCode.InputError,
+  details: { source }
+});
 export {
-  WorkspaceUpdateApiCommand
+  WorkspaceUpdateApiCommand,
+  createWorkspaceApiUpdatePlan
 };
 //# sourceMappingURL=WorkspaceUpdateApiCommand.js.map

package/dist/development/src/commands/workspace/WorkspaceUpdateApiCommand.js.map

@@ -1 +1 @@
-{"version":3,"file":"WorkspaceUpdateApiCommand.js","sources":["../../../../../../packages/cli/src/commands/workspace/WorkspaceUpdateApiCommand.ts"],"sourcesContent":["import { Command, CommandConfiguration, Input, PackageWorkspaceResolver } from '@contember/cli-common'\nimport { DockerComposeManager } from '../../lib/fs/DockerComposeManager'\nimport { contemberDockerImages } from '../../consts'\n\ntype Args = {\n\tversion: string\n}\n\ntype Options = {}\n\nexport class WorkspaceUpdateApiCommand extends Command<Args, Options> {\n\tconstructor(\n\t\tprivate readonly packageWorkspaceResolver: PackageWorkspaceResolver,\n\t\tprivate readonly dockerComposeManager: DockerComposeManager,\n\t) {\n\t\tsuper()\n\t}\n\n\tprotected configure(configuration: CommandConfiguration<Args, Options>): void {\n\t\tconfiguration.description('Updates Contember API version and all related packages')\n\t\tconfiguration.argument('version')\n\t}\n\n\tprotected async execute(input: Input<Args, Options>): Promise<void> {\n\t\tconst version = input.getArgument('version')\n\t\tconst packageWorkspace = await this.packageWorkspaceResolver.resolve()\n\n\t\tawait packageWorkspace.updateEverywhere({\n\t\t\t'@contember/schema': version,\n\t\t\t'@contember/schema-definition': version,\n\t\t\t'@contember/cli': version,\n\t\t})\n\n\t\tconsole.log('Updating docker-compose')\n\t\tconst getNewImage = (currentImage: string): string | null => {\n\t\t\tfor (const candidate of contemberDockerImages) {\n\t\t\t\tif (currentImage.startsWith(`${candidate}:`)) {\n\t\t\t\t\treturn `${candidate.replace(/-ee$/, '')}:${version}`\n\t\t\t\t}\n\t\t\t}\n\t\t\treturn null\n\t\t}\n\t\tawait this.dockerComposeManager.updateMainDockerComposeConfig(data => ({\n\t\t\t...data,\n\t\t\tservices: Object.fromEntries(\n\t\t\t\tObject.entries(data?.services ?? {}).map(([name, service]: [string, any]) => {\n\t\t\t\t\tconst newImage = getNewImage(service.image)\n\t\t\t\t\tif (newImage) {\n\t\t\t\t\t\tconsole.log(`docker-compose service ${name} updated`)\n\t\t\t\t\t\treturn [\n\t\t\t\t\t\t\tname,\n\t\t\t\t\t\t\t{\n\t\t\t\t\t\t\t\t...service,\n\t\t\t\t\t\t\t\timage: newImage,\n\t\t\t\t\t\t\t},\n\t\t\t\t\t\t]\n\t\t\t\t\t}\n\t\t\t\t\treturn [name, service]\n\t\t\t\t}),\n\t\t\t),\n\t\t}))\n\t\tconsole.log('API versions updated')\n\t\tconsole.log('Restart server to apply changes')\n\t}\n}\n"],"names":[],"mappings":";;AAUO,MAAM,kCAAkC,QAAuB;AAAA,EACrE,YACkB,0BACA,sBAChB;AACD,UAAA;AAHiB,SAAA,2BAAA;AACA,SAAA,uBAAA;AAAA,EAGlB;AAAA,EAEU,UAAU,eAA0D;AAC7E,kBAAc,YAAY,wDAAwD;AAClF,kBAAc,SAAS,SAAS;AAAA,EACjC;AAAA,EAEA,MAAgB,QAAQ,OAA4C;AACnE,UAAM,UAAU,MAAM,YAAY,SAAS;AAC3C,UAAM,mBAAmB,MAAM,KAAK,yBAAyB,QAAA;AAE7D,UAAM,iBAAiB,iBAAiB;AAAA,MACvC,qBAAqB;AAAA,MACrB,gCAAgC;AAAA,MAChC,kBAAkB;AAAA,IAAA,CAClB;AAED,YAAQ,IAAI,yBAAyB;AACrC,UAAM,cAAc,CAAC,iBAAwC;AAC5D,iBAAW,aAAa,uBAAuB;AAC9C,YAAI,aAAa,WAAW,GAAG,SAAS,GAAG,GAAG;AAC7C,iBAAO,GAAG,UAAU,QAAQ,QAAQ,EAAE,CAAC,IAAI,OAAO;AAAA,QACnD;AAAA,MACD;AACA,aAAO;AAAA,IACR;AACA,UAAM,KAAK,qBAAqB,8BAA8B,CAAA,UAAS;AAAA,MACtE,GAAG;AAAA,MACH,UAAU,OAAO;AAAA,QAChB,OAAO,QAAQ,MAAM,YAAY,CAAA,CAAE,EAAE,IAAI,CAAC,CAAC,MAAM,OAAO,MAAqB;AAC5E,gBAAM,WAAW,YAAY,QAAQ,KAAK;AAC1C,cAAI,UAAU;AACb,oBAAQ,IAAI,0BAA0B,IAAI,UAAU;AACpD,mBAAO;AAAA,cACN;AAAA,cACA;AAAA,gBACC,GAAG;AAAA,gBACH,OAAO;AAAA,cAAA;AAAA,YACR;AAAA,UAEF;AACA,iBAAO,CAAC,MAAM,OAAO;AAAA,QACtB,CAAC;AAAA,MAAA;AAAA,IACF,EACC;AACF,YAAQ,IAAI,sBAAsB;AAClC,YAAQ,IAAI,iCAAiC;AAAA,EAC9C;AACD;"}
+{"version":3,"file":"WorkspaceUpdateApiCommand.js","sources":["../../../../../../packages/cli/src/commands/workspace/WorkspaceUpdateApiCommand.ts"],"sourcesContent":["import { CliError, Command, CommandConfiguration, ExitCode, Input, Output } from '@contember/cli-common'\nimport { DockerComposeConfig } from '../../lib/fs/DockerComposeManager.js'\nimport { contemberDockerImages } from '../../consts.js'\n\ntype Args = {\n\tversion: string\n}\n\ntype Options = {}\n\nexport interface PackageUpdateWorkspace {\n\tfindDefinedDependencies(packageName: string): unknown\n\tupdateEverywhere(updates: Record<string, string>): Promise<readonly { name: string }[]>\n}\n\nexport interface PackageUpdateWorkspaceResolver {\n\tresolve(): Promise<PackageUpdateWorkspace>\n}\n\nexport interface DockerComposeAccess {\n\ttryReadMainDockerComposeConfig(): Promise<unknown>\n\tupdateMainDockerComposeConfig(updater: (data: Partial<DockerComposeConfig>) => DockerComposeConfig): Promise<void>\n}\n\nexport interface WorkspaceApiUpdatePlan {\n\tcompose: DockerComposeConfig\n\tupdatedServices: string[]\n}\n\nexport interface WorkspaceApiUpdateResult {\n\tversion: string\n\tupdatedPackages: string[]\n\tupdatedServices: string[]\n}\n\ntype DockerComposeServiceRecord = Record<string, unknown> & { image?: string }\ntype DockerComposeDocument = Record<string, unknown> & { services?: Record<string, DockerComposeServiceRecord> }\n\nexport class WorkspaceUpdateApiCommand extends Command<Args, Options> {\n\tconstructor(\n\t\tprivate readonly packageWorkspaceResolver: PackageUpdateWorkspaceResolver,\n\t\tprivate readonly dockerComposeManager: DockerComposeAccess,\n\t) {\n\t\tsuper()\n\t}\n\n\tprotected configure(configuration: CommandConfiguration<Args, Options>): void {\n\t\tconfiguration.description('Updates Contember API version and all related packages')\n\t\tconfiguration.argument('version')\n\t}\n\n\tprotected async execute(input: Input<Args, Options>, output: Output): Promise<void> {\n\t\tconst version = input.getArgument('version')\n\t\tconst packageWorkspace = await this.packageWorkspaceResolver.resolve()\n\t\tconst packageUpdates = {\n\t\t\t'@contember/schema': version,\n\t\t\t'@contember/schema-definition': version,\n\t\t\t'@contember/cli': version,\n\t\t}\n\n\t\tvalidatePackageUpdatePlan(packageWorkspace, packageUpdates)\n\t\tconst composePlan = createWorkspaceApiUpdatePlan(\n\t\t\tawait this.dockerComposeManager.tryReadMainDockerComposeConfig(),\n\t\t\tversion,\n\t\t)\n\n\t\tconst updatedDependencies = await packageWorkspace.updateEverywhere(packageUpdates)\n\t\tconst updatedPackages = [...new Set(updatedDependencies.map(dependency => dependency.name))]\n\n\t\toutput.info('Updating docker-compose')\n\t\tawait this.dockerComposeManager.updateMainDockerComposeConfig(() => composePlan.compose)\n\t\tfor (const name of composePlan.updatedServices) {\n\t\t\toutput.info(`docker-compose service ${name} updated`)\n\t\t}\n\t\toutput.info('API versions updated')\n\t\toutput.info('Restart server to apply changes')\n\t\twriteMachineResult(output, { version, updatedPackages, updatedServices: composePlan.updatedServices })\n\t}\n}\n\nconst writeMachineResult = (output: Output, result: WorkspaceApiUpdateResult): void => {\n\tif (output.mode !== 'human') {\n\t\toutput.data(result, {\n\t\t\tquiet: value => [value.version, ...value.updatedPackages, ...value.updatedServices],\n\t\t})\n\t}\n}\n\nexport const createWorkspaceApiUpdatePlan = (input: unknown, version: string): WorkspaceApiUpdatePlan => {\n\tif (version.length === 0) {\n\t\tthrow invalidWorkspaceUpdate('Version must not be empty', 'version')\n\t}\n\tif (input !== null && input !== undefined && !isDockerComposeConfig(input)) {\n\t\tthrow invalidWorkspaceUpdate('docker-compose configuration is malformed', 'docker-compose')\n\t}\n\n\tconst config = input ?? {}\n\tconst services: Record<string, DockerComposeServiceRecord> = {}\n\tconst updatedServices: string[] = []\n\tfor (const [name, service] of Object.entries(config.services ?? {})) {\n\t\tconst image = service.image === undefined ? null : getNewImage(service.image, version)\n\t\tif (image === null) {\n\t\t\tservices[name] = service\n\t\t\tcontinue\n\t\t}\n\t\tservices[name] = { ...service, image }\n\t\tupdatedServices.push(name)\n\t}\n\treturn { compose: { ...config, services }, updatedServices }\n}\n\nconst validatePackageUpdatePlan = (workspace: PackageUpdateWorkspace, updates: Record<string, string>): void => {\n\tfor (const [packageName, version] of Object.entries(updates)) {\n\t\tif (packageName.length === 0 || version.length === 0) {\n\t\t\tthrow invalidWorkspaceUpdate('Package update is malformed', packageName || 'package')\n\t\t}\n\t\tconst dependencies = workspace.findDefinedDependencies(packageName)\n\t\tif (!Array.isArray(dependencies) || !dependencies.every(value => isPlannedDependency(value, packageName))) {\n\t\t\tthrow invalidWorkspaceUpdate(`Package metadata for ${packageName} is malformed`, packageName)\n\t\t}\n\t}\n}\n\nconst isPlannedDependency = (value: unknown, packageName: string): boolean => {\n\tif (!isRecord(value) || typeof value.name !== 'string' || typeof value.version !== 'string' || typeof value.isDev !== 'boolean') {\n\t\treturn false\n\t}\n\treturn value.name === packageName\n\t\t&& value.version.length > 0\n\t\t&& isRecord(value.pckg)\n\t\t&& typeof value.pckg.dir === 'string'\n\t\t&& typeof value.pckg.isRoot === 'boolean'\n}\n\nconst isDockerComposeConfig = (value: unknown): value is DockerComposeDocument => {\n\tif (!isRecord(value)) {\n\t\treturn false\n\t}\n\tif (value.services === undefined) {\n\t\treturn true\n\t}\n\treturn isRecord(value.services) && Object.values(value.services).every(isDockerComposeServiceRecord)\n}\n\nconst isDockerComposeServiceRecord = (value: unknown): value is DockerComposeServiceRecord =>\n\tisRecord(value) && (value.image === undefined || typeof value.image === 'string')\n\nconst isRecord = (value: unknown): value is Record<string, unknown> => typeof value === 'object' && value !== null && !Array.isArray(value)\n\nconst getNewImage = (currentImage: string, version: string): string | null => {\n\tfor (const candidate of contemberDockerImages) {\n\t\tif (currentImage.startsWith(`${candidate}:`)) {\n\t\t\treturn `${candidate.replace(/-ee$/, '')}:${version}`\n\t\t}\n\t}\n\treturn null\n}\n\nconst invalidWorkspaceUpdate = (message: string, source: string): CliError =>\n\tnew CliError(message, {\n\t\tcode: 'INVALID_WORKSPACE_UPDATE',\n\t\texitCode: ExitCode.InputError,\n\t\tdetails: { source },\n\t})\n"],"names":[],"mappings":"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"}

package/dist/development/src/consts.cjs

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const cliCommon = require("@contember/cli-common");
-const node_path = require("node:path");
+const path = require("node:path");
 const node_url = require("node:url");
 var _documentCurrentScript = typeof document !== "undefined" ? document.currentScript : null;
-const currentFilePath = node_path.dirname(node_url.fileURLToPath(typeof document === "undefined" ? require("url").pathToFileURL(__filename).href : _documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === "SCRIPT" && _documentCurrentScript.src || new URL("cli/src/consts.cjs", document.baseURI).href));
+const currentFilePath = path.dirname(node_url.fileURLToPath(typeof document === "undefined" ? require("url").pathToFileURL(__filename).href : _documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === "SCRIPT" && _documentCurrentScript.src || new URL("cli/src/consts.cjs", document.baseURI).href));
 const packageRoot = process.env.CONTEMBER_CLI_PACKAGE_ROOT || cliCommon.findPackageRoot(currentFilePath);
 const contemberDockerImages = ["contember/engine", "contember/engine-ee", "contember/cli"];
 exports.contemberDockerImages = contemberDockerImages;

package/dist/development/src/consts.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"consts.cjs","sources":["../../../../packages/cli/src/consts.ts"],"sourcesContent":["import { findPackageRoot } from '@contember/cli-common'\nimport { dirname } from 'node:path'\nimport { fileURLToPath } from 'node:url'\n\nconst currentFilePath = dirname(fileURLToPath(import.meta.url))\nexport const packageRoot = process.env.CONTEMBER_CLI_PACKAGE_ROOT || findPackageRoot(currentFilePath)\nexport const contemberDockerImages = ['contember/engine', 'contember/engine-ee', 'contember/cli']\n"],"names":["dirname","fileURLToPath","findPackageRoot"],"mappings":";;;;;;AAIA,MAAM,kBAAkBA,UAAAA,QAAQC,uBAAc,OAAA,aAAA,cAAA,QAAA,KAAA,EAAA,cAAA,UAAA,EAAA,OAAA,0BAAA,uBAAA,QAAA,YAAA,MAAA,YAAA,uBAAA,OAAA,IAAA,IAAA,sBAAA,SAAA,OAAA,EAAA,IAAe,CAAC;AACvD,MAAM,cAAc,QAAQ,IAAI,8BAA8BC,UAAAA,gBAAgB,eAAe;AAC7F,MAAM,wBAAwB,CAAC,oBAAoB,uBAAuB,eAAe;;;"}
+{"version":3,"file":"consts.cjs","sources":["../../../../packages/cli/src/consts.ts"],"sourcesContent":["import { findPackageRoot } from '@contember/cli-common'\nimport { dirname } from 'node:path'\nimport { fileURLToPath } from 'node:url'\n\nconst currentFilePath = dirname(fileURLToPath(import.meta.url))\nexport const packageRoot = process.env.CONTEMBER_CLI_PACKAGE_ROOT || findPackageRoot(currentFilePath)\nexport const contemberDockerImages = ['contember/engine', 'contember/engine-ee', 'contember/cli']\n"],"names":["dirname","fileURLToPath","findPackageRoot"],"mappings":";;;;;;AAIA,MAAM,kBAAkBA,KAAAA,QAAQC,uBAAc,OAAA,aAAA,cAAA,QAAA,KAAA,EAAA,cAAA,UAAA,EAAA,OAAA,0BAAA,uBAAA,QAAA,YAAA,MAAA,YAAA,uBAAA,OAAA,IAAA,IAAA,sBAAA,SAAA,OAAA,EAAA,IAAe,CAAC;AACvD,MAAM,cAAc,QAAQ,IAAI,8BAA8BC,UAAAA,gBAAgB,eAAe;AAC7F,MAAM,wBAAwB,CAAC,oBAAoB,uBAAuB,eAAe;;;"}