aact 3.0.0-beta.2 → 3.0.0-beta.4

package/dist/chunks/index.mjs

@@ -209,7 +209,23 @@ const filterElements = (elements) => {
 const TAGS_MARKER = "__aact_tags__:";
 const LINK_MARKER = "__aact_link__:";
 const SPRITE_MARKER = "__aact_sprite__:";
-const preTransformNamedArgs = (raw) => raw.replaceAll(/, \$tags="(.+?)"/g, `, "${TAGS_MARKER}$1"`).replaceAll(/, \$link="(.+?)"/g, `, "${LINK_MARKER}$1"`).replaceAll(/, \$sprite="(.+?)"/g, `, "${SPRITE_MARKER}$1"`).replaceAll('""', '" "');
+const INDEX_MARKER = "__aact_index__:";
+const preTransformNamedArgs = (raw) => raw.replaceAll(/, \$tags="(.+?)"/g, `, "${TAGS_MARKER}$1"`).replaceAll(/, \$link="(.+?)"/g, `, "${LINK_MARKER}$1"`).replaceAll(/, \$sprite="(.+?)"/g, `, "${SPRITE_MARKER}$1"`).replaceAll(
+  /, \$index=(?:"([^"]+)"|([^,)\s]+))/g,
+  (_match, quoted, bare) => `, "${INDEX_MARKER}${quoted ?? bare ?? ""}"`
+).replaceAll('""', '" "');
+const COMPONENT_BOUNDARY_ALIAS_RE = /\bComponent_Boundary\(\s*([A-Za-z0-9_.]+)/g;
+const preTransform = (raw) => {
+  const componentBoundaryAliases = /* @__PURE__ */ new Set();
+  for (const match of raw.matchAll(COMPONENT_BOUNDARY_ALIAS_RE)) {
+    componentBoundaryAliases.add(match[1]);
+  }
+  const source = preTransformNamedArgs(raw).replaceAll(
+    /\bComponent_Boundary\(/g,
+    "Container_Boundary("
+  );
+  return { source, componentBoundaryAliases };
+};
 const stripMarker = (value, marker) => value && value.startsWith(marker) ? value.slice(marker.length) : void 0;
 const extractMarked = (marker, ...slots) => {
   for (const slot of slots) {
@@ -234,7 +250,7 @@ const normalizeRelBack = (elements) => {
     }
   }
 };
-const ALL_MARKERS = [TAGS_MARKER, LINK_MARKER, SPRITE_MARKER];
+const ALL_MARKERS = [TAGS_MARKER, LINK_MARKER, SPRITE_MARKER, INDEX_MARKER];
 const buildContainer = (el) => {
   const macroKind = parseC4MacroKind(el.type_.name);
   const kind = macroKind?.kind ?? "Container";
@@ -278,30 +294,18 @@ const buildContainer = (el) => {
   };
 };
 const buildRelation = (rel) => {
-  const taggedValue = extractMarked(
-    TAGS_MARKER,
-    rel.techn,
-    rel.descr,
-    rel.sprite,
-    rel.tags,
-    rel.link
-  );
-  const linkValue = extractMarked(
-    LINK_MARKER,
-    rel.techn,
-    rel.descr,
-    rel.sprite,
-    rel.tags,
-    rel.link
-  );
-  const spriteNamedValue = extractMarked(
-    SPRITE_MARKER,
+  const relSlots = [
     rel.techn,
     rel.descr,
     rel.sprite,
     rel.tags,
     rel.link
-  );
+  ];
+  const taggedValue = extractMarked(TAGS_MARKER, ...relSlots);
+  const linkValue = extractMarked(LINK_MARKER, ...relSlots);
+  const spriteNamedValue = extractMarked(SPRITE_MARKER, ...relSlots);
+  const indexValue = extractMarked(INDEX_MARKER, ...relSlots);
+  const order = indexValue !== void 0 && Number.isFinite(Number(indexValue)) ? Number(indexValue) : void 0;
   return {
     to: rel.to,
     description: cleanSlot(rel.label, ...ALL_MARKERS) || void 0,
@@ -310,16 +314,18 @@ const buildRelation = (rel) => {
       cleanSlot(rel.descr, ...ALL_MARKERS) || cleanSlot(rel.tags, ...ALL_MARKERS)
     ) : parseCsvTags(taggedValue),
     sprite: spriteNamedValue ?? cleanSlot(rel.sprite, ...ALL_MARKERS),
-    link: linkValue ?? cleanSlot(rel.link, ...ALL_MARKERS)
+    link: linkValue ?? cleanSlot(rel.link, ...ALL_MARKERS),
+    order
   };
 };
-const buildBoundary = (el, childContainers, childBoundaries) => {
+const buildBoundary = (el, childContainers, childBoundaries, componentBoundaryAliases) => {
   const taggedValue = extractMarked(TAGS_MARKER, el.tags, el.link);
   const linkValue = extractMarked(LINK_MARKER, el.tags, el.link);
+  const kind = componentBoundaryAliases.has(el.alias) ? "Component" : parseBoundaryMacro(el.type_.name);
   return {
     name: el.alias,
     label: el.label,
-    kind: parseBoundaryMacro(el.type_.name),
+    kind,
     tags: taggedValue === void 0 ? parseCsvTags(cleanSlot(el.tags, ...ALL_MARKERS)) : parseCsvTags(taggedValue),
     containerNames: childContainers,
     boundaryNames: childBoundaries,
@@ -371,7 +377,7 @@ const collectChildBoundaryNames = (boundaryElements) => {
 const load = async (filePath) => {
   const filepath = path.resolve(filePath);
   const raw = await fs.readFile(filepath, "utf8");
-  const transformed = preTransformNamedArgs(raw);
+  const { source: transformed, componentBoundaryAliases } = preTransform(raw);
   const [{ elements: rawElements }] = parse(transformed);
   const elements = filterElements(rawElements);
   normalizeRelBack(elements);
@@ -388,7 +394,12 @@ const load = async (filePath) => {
   const childOfBoundary = collectChildBoundaryNames(boundaryElements);
   const boundaries = boundaryElements.map((b) => {
     const { containers, boundaries: childBoundaries } = collectBoundaryChildren(b);
-    return buildBoundary(b, containers, childBoundaries);
+    return buildBoundary(
+      b,
+      containers,
+      childBoundaries,
+      componentBoundaryAliases
+    );
   });
   const rootBoundaryNames = boundaries.map((b) => b.name).filter((name) => !childOfBoundary.has(name));
   return buildModel({

package/dist/cli/index.mjs

@@ -8,7 +8,7 @@ import * as v from 'valibot';
 import fs, { readFile, writeFile } from 'node:fs/promises';
 import { colors, box } from 'consola/utils';
 
-const version = "3.0.0-beta.2";
+const version = "3.0.0-beta.4";
 
 const matchesPattern = (filePath, pattern) => {
   if (pattern.startsWith("*")) {
@@ -540,6 +540,32 @@ const config: AactConfig = {
     commonReuse: true, // Reuse all of a context's public API or none
   },
 
+  // -----------------------------------------------------------------------
+  // Project-specific (custom) rules
+  //
+  // After \`npm install aact\` locally, switch from this type-only import to
+  // \`defineConfig\` to register your own checks alongside the built-ins:
+  //
+  //   import { defineConfig } from "aact";
+  //   import { bcIsolationRule } from "./rules/bcIsolation";
+  //
+  //   export default defineConfig({
+  //     source: { type: "plantuml", path: "./architecture.puml" },
+  //
+  //     customRules: [bcIsolationRule],
+  //
+  //     rules: {
+  //       acl: true,
+  //       // Configure custom rules with the same syntax as built-ins.
+  //       // TypeScript autocompletes options based on the rule definition.
+  //       bcIsolation: { apiSuffix: "_api" },
+  //     },
+  //   });
+  //
+  // Worked example with two rules and tests:
+  //   https://github.com/Byndyusoft/aact/tree/main/examples/custom-rules
+  // -----------------------------------------------------------------------
+
   // PlantUML generation from Kubernetes configs (aact generate)
   // generate: {
   //   kubernetes: { path: "./fixtures/kubernetes" },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aact",
-  "version": "3.0.0-beta.2",
+  "version": "3.0.0-beta.4",
   "type": "module",
   "description": "Architecture analysis and compliance tool",
   "keywords": [