aact 2.1.3 → 2.1.5

package/README.md

@@ -19,6 +19,8 @@ CLI и библиотека для валидации, анализа и ген
 
 <img src="https://github.com/Byndyusoft/aact/assets/1096954/a3c3b3b0-a09b-4da7-aca4-5538159b371c" width="15"/> Телеграм-канал: [Архитектура распределённых систем](https://t.me/rsa_enc)
 
+aact можно использовать двумя способами: как **CLI** (`npx aact check`, авто-фикс, генерация артефактов) или как **библиотеку** (импортировать `checkAcl`, `analyzeArchitecture` и пр. в свои тесты на vitest/jest). CLI — ниже, library-режим — в [соответствующем разделе](#использование-как-библиотеки).
+
 ## Quick Start (CLI)
 
 В пустой папке:

package/dist/cli/index.mjs

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { defineCommand, runMain } from 'citty';
 import consola from 'consola';
-import { A as AactConfigSchema, H as loadStructurizrElements, G as loadPlantumlElements, J as mapContainersFromPlantumlElements, q as analyzeArchitecture, E as EXTERNAL_SYSTEM_TYPE, b as CONTAINER_DB_TYPE, r as checkAcl, s as checkAcyclic, t as checkApiGateway, w as checkCrud, x as checkDbPerService, u as checkCohesion, y as checkStableDependencies, v as checkCommonReuse, L as structurizrDslSyntax, D as generateKubernetes, F as generatePlantumlFromModel } from '../shared/aact.BzhD7c9t.mjs';
+import { A as AactConfigSchema, H as loadStructurizrElements, G as loadPlantumlElements, J as mapContainersFromPlantumlElements, q as analyzeArchitecture, E as EXTERNAL_SYSTEM_TYPE, b as CONTAINER_DB_TYPE, r as checkAcl, s as checkAcyclic, t as checkApiGateway, w as checkCrud, x as checkDbPerService, u as checkCohesion, y as checkStableDependencies, v as checkCommonReuse, L as structurizrDslSyntax, D as generateKubernetes, F as generatePlantumlFromModel } from '../shared/aact.CJGFUdeF.mjs';
 import { loadConfig } from 'c12';
 import * as v from 'valibot';
 import path from 'node:path';
@@ -10,7 +10,7 @@ import pc from 'picocolors';
 import 'yaml';
 import 'plantuml-parser';
 
-const version = "2.1.3";
+const version = "2.1.5";
 
 const loadAndValidateConfig = async (configPath) => {
   const { config } = await loadConfig({
@@ -715,7 +715,12 @@ const handleFixMode = async (model, results, config, dryRun) => {
     consola.info("No auto-fixes available for these violations");
     exitWithViolations();
   }
+  console.log(
+    pc.bold(dryRun ? "Suggested fixes (dry run):" : "Applying fixes:")
+  );
+  console.log();
   formatFixes(fixes);
+  console.log();
   if (!dryRun) {
     await writeFixes(config, fixes);
   }

package/dist/index.mjs

@@ -1,4 +1,4 @@
-export { A as AactConfigSchema, B as BOUNDARY_TYPE, C as COMPONENT_TYPE, a as CONTAINER_BOUNDARY_TYPE, b as CONTAINER_DB_TYPE, c as CONTAINER_TYPE, E as EXTERNAL_SYSTEM_TYPE, P as PERSON_TYPE, d as PLANTUML_BOUNDARY, e as PLANTUML_COMPONENT, f as PLANTUML_CONTAINER, g as PLANTUML_CONTAINER_BOUNDARY, h as PLANTUML_CONTAINER_DB, i as PLANTUML_PERSON, j as PLANTUML_SYSTEM, k as PLANTUML_SYSTEM_BOUNDARY, l as PLANTUML_SYSTEM_EXT, S as STRUCTURIZR_INTERACTION_ASYNC, m as STRUCTURIZR_LOCATION_EXTERNAL, n as STRUCTURIZR_TAG_ASYNC, o as SYSTEM_BOUNDARY_TYPE, p as SYSTEM_TYPE, q as analyzeArchitecture, r as checkAcl, s as checkAcyclic, t as checkApiGateway, u as checkCohesion, v as checkCommonReuse, w as checkCrud, x as checkDbPerService, y as checkStableDependencies, z as defineConfig, D as generateKubernetes, F as generatePlantumlFromModel, G as loadPlantumlElements, H as loadStructurizrElements, I as loadStructurizrWorkspace, J as mapContainersFromPlantumlElements, K as mapContainersFromStructurizr, L as structurizrDslSyntax } from './shared/aact.BzhD7c9t.mjs';
+export { A as AactConfigSchema, B as BOUNDARY_TYPE, C as COMPONENT_TYPE, a as CONTAINER_BOUNDARY_TYPE, b as CONTAINER_DB_TYPE, c as CONTAINER_TYPE, E as EXTERNAL_SYSTEM_TYPE, P as PERSON_TYPE, d as PLANTUML_BOUNDARY, e as PLANTUML_COMPONENT, f as PLANTUML_CONTAINER, g as PLANTUML_CONTAINER_BOUNDARY, h as PLANTUML_CONTAINER_DB, i as PLANTUML_PERSON, j as PLANTUML_SYSTEM, k as PLANTUML_SYSTEM_BOUNDARY, l as PLANTUML_SYSTEM_EXT, S as STRUCTURIZR_INTERACTION_ASYNC, m as STRUCTURIZR_LOCATION_EXTERNAL, n as STRUCTURIZR_TAG_ASYNC, o as SYSTEM_BOUNDARY_TYPE, p as SYSTEM_TYPE, q as analyzeArchitecture, r as checkAcl, s as checkAcyclic, t as checkApiGateway, u as checkCohesion, v as checkCommonReuse, w as checkCrud, x as checkDbPerService, y as checkStableDependencies, z as defineConfig, D as generateKubernetes, F as generatePlantumlFromModel, G as loadPlantumlElements, H as loadStructurizrElements, I as loadStructurizrWorkspace, J as mapContainersFromPlantumlElements, K as mapContainersFromStructurizr, L as structurizrDslSyntax } from './shared/aact.CJGFUdeF.mjs';
 import fs from 'node:fs/promises';
 import path from 'node:path';
 import YAML from 'yaml';

package/dist/shared/{aact.BzhD7c9t.mjs → aact.CJGFUdeF.mjs}

@@ -221,7 +221,7 @@ const generateKubernetes = (model, options) => {
   const dbConnectionTemplate = options?.dbConnectionTemplate ?? "postgresql://{name}:pass-{name}@postgresql:5432/{name}";
   const resolvedOptions = { defaultPort, dbConnectionTemplate };
   const containers = model.allContainers.filter(
-    (c) => c.type !== CONTAINER_DB_TYPE && c.type !== EXTERNAL_SYSTEM_TYPE && c.type !== PERSON_TYPE
+    (c) => (c.type ?? CONTAINER_TYPE) === CONTAINER_TYPE
   );
   return containers.map((container) => {
     const kebabName = toKebab(container.name);
@@ -262,7 +262,9 @@ const containerTypeMap = {
   [CONTAINER_TYPE]: PLANTUML_CONTAINER,
   [CONTAINER_DB_TYPE]: PLANTUML_CONTAINER_DB,
   [EXTERNAL_SYSTEM_TYPE]: PLANTUML_SYSTEM_EXT,
-  [PERSON_TYPE]: PLANTUML_PERSON
+  [PERSON_TYPE]: PLANTUML_PERSON,
+  [SYSTEM_TYPE]: PLANTUML_SYSTEM,
+  [COMPONENT_TYPE]: PLANTUML_COMPONENT
 };
 const renderContainer = (container) => {
   const type = containerTypeMap[container.type ?? CONTAINER_TYPE] ?? PLANTUML_CONTAINER;
@@ -677,18 +679,18 @@ const checkApiGateway = (containers, options) => {
   return violations;
 };
 
-const getBoundaryCohesion = (boundary) => {
+const getBoundaryCohesion = (boundary, externalType, internalType) => {
   const names = new Set(boundary.containers.map((c) => c.name));
   let result = 0;
   for (const container of boundary.containers) {
     result += container.relations.filter((r) => names.has(r.to.name)).length;
   }
   for (const innerBoundary of boundary.boundaries) {
-    result += getBoundaryCoupling(innerBoundary);
+    result += getBoundaryCoupling(innerBoundary, externalType, internalType);
   }
   return result;
 };
-const getBoundaryCoupling = (boundary, externalType = EXTERNAL_SYSTEM_TYPE, internalType = CONTAINER_TYPE) => {
+const getBoundaryCoupling = (boundary, externalType, internalType) => {
   const names = new Set(boundary.containers.map((c) => c.name));
   let result = 0;
   for (const container of boundary.containers) {
@@ -710,7 +712,7 @@ const checkCohesion = (model, options) => {
   const internalType = options?.internalType ?? CONTAINER_TYPE;
   const violations = [];
   for (const boundary of model.boundaries) {
-    const cohesion = getBoundaryCohesion(boundary);
+    const cohesion = getBoundaryCohesion(boundary, externalType, internalType);
     const coupling = getBoundaryCoupling(boundary, externalType, internalType);
     if (cohesion <= coupling) {
       violations.push({
@@ -720,7 +722,7 @@ const checkCohesion = (model, options) => {
     }
     if (boundary.boundaries.length > 0) {
       const innerCohesionSum = boundary.boundaries.reduce(
-        (sum, current) => sum + getBoundaryCohesion(current),
+        (sum, current) => sum + getBoundaryCohesion(current, externalType, internalType),
         0
       );
       if (cohesion >= innerCohesionSum) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aact",
-  "version": "2.1.3",
+  "version": "2.1.5",
   "type": "module",
   "description": "Architecture analysis and compliance tool",
   "keywords": [