@agilewallaby/c4-model 0.0.1 → 1.0.1

package/README.md

@@ -1,11 +1,27 @@
-# c4-model
+# `@agilewallaby/c4-model`
 
-This library was generated with [Nx](https://nx.dev).
+This is an opinionated Typescript library for generating C4 models in code, and then exporting the
+model to one or more supported formats for consumption by a rendering mechanism.
 
-## Building
+Currently supported output formats are:
 
-Run `nx build c4-model` to build the library.
+* [Structurizr DSL](https://github.com/structurizr/dsl/blob/master/docs/language-reference.md): only the
+static views are supported, e.g. system landscape, system context, container, and component diagrams.
+Deployment and dynamic diagrams may be supported in the future.
 
-## Running unit tests
+Other formats that may be supported in the future:
 
-Run `nx test c4-model` to execute the unit tests via [Jest](https://jestjs.io).
+* The [YAML format](https://backstage.io/docs/features/software-catalog/descriptor-format) specified by
+[Spotify Backstage](https://backstage.io/) for documenting systems in the [Software Catalog](https://backstage.io/docs/features/software-catalog/).
+
+## Usage
+
+The core of this library is the `Model` class. From here you can 'define' instances of `SoftwareSystem`
+and `Person`. They can also be defined through a `Group`;
+
+```
+import { Model } from '@agilewallaby/c4-model'
+
+const model = new Model("myModel")
+const system1 = model.defineSoftwareSystem("system1")
+```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agilewallaby/c4-model",
-  "version": "0.0.1",
+  "version": "1.0.1",
   "publishConfig": {
     "access": "public"
   },

package/src/index.d.ts

@@ -1 +1,3 @@
 export * from './lib/model';
+export * from './lib/views';
+export * from './lib/structurizrDslWriter';

package/src/index.js

@@ -2,4 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./lib/model"), exports);
+tslib_1.__exportStar(require("./lib/views"), exports);
+tslib_1.__exportStar(require("./lib/structurizrDslWriter"), exports);
 //# sourceMappingURL=index.js.map

package/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../libs/c4-model/src/index.ts"],"names":[],"mappings":";;;AAAA,sDAA4B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../libs/c4-model/src/index.ts"],"names":[],"mappings":";;;AAAA,sDAA2B;AAC3B,sDAA2B;AAC3B,qEAA0C"}

package/src/lib/component.d.ts

@@ -1,12 +1,10 @@
-import { Element, Reference, Relationship, RelationshipTarget, TechnologyDefinition } from "./core";
+import { Element, Reference, TechnicalElement, TechnologyDefinition } from "./core";
 export interface ComponentDefinition extends TechnologyDefinition {
 }
-export declare class Component extends Element {
+export declare class Component extends TechnicalElement {
     readonly name: string;
-    private _relationships;
     constructor(name: string, definition?: ComponentDefinition);
-    uses(otherElement: RelationshipTarget, definition?: TechnologyDefinition): void;
-    get relationships(): ReadonlyArray<Relationship>;
+    getChildElements(): ReadonlyArray<Element>;
 }
 export declare class ReferencedComponent extends Reference<undefined> {
 }

package/src/lib/component.js

@@ -2,18 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ReferencedComponent = exports.Component = void 0;
 const core_1 = require("./core");
-class Component extends core_1.Element {
+class Component extends core_1.TechnicalElement {
     constructor(name, definition) {
         super(name, ["Component"], definition);
         this.name = name;
-        this._relationships = [];
     }
-    uses(otherElement, definition) {
-        const relationship = new core_1.Relationship(this, otherElement, definition);
-        this._relationships.push(relationship);
-    }
-    get relationships() {
-        return this._relationships;
+    getChildElements() {
+        return [];
     }
 }
 exports.Component = Component;

package/src/lib/component.js.map

@@ -1 +1 @@
-{"version":3,"file":"component.js","sourceRoot":"","sources":["../../../../../libs/c4-model/src/lib/component.ts"],"names":[],"mappings":";;;AAAA,iCAAmG;AAKnG,MAAa,SAAU,SAAQ,cAAO;IAIpC,YAAqC,IAAY,EAAE,UAAgC;QACjF,KAAK,CAAC,IAAI,EAAE,CAAC,WAAW,CAAC,EAAE,UAAU,CAAC,CAAA;QADH,SAAI,GAAJ,IAAI,CAAQ;QAFzC,mBAAc,GAAmB,EAAE,CAAA;IAI3C,CAAC;IAEM,IAAI,CAAC,YAAgC,EAAE,UAAiC;QAC7E,MAAM,YAAY,GAAG,IAAI,mBAAY,CAAC,IAAI,EAAE,YAAY,EAAE,UAAU,CAAC,CAAA;QACrE,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;IACxC,CAAC;IAED,IAAW,aAAa;QACtB,OAAO,IAAI,CAAC,cAAc,CAAA;IAC5B,CAAC;CACF;AAhBD,8BAgBC;AAED,MAAa,mBAAoB,SAAQ,gBAAoB;CAC5D;AADD,kDACC"}
+{"version":3,"file":"component.js","sourceRoot":"","sources":["../../../../../libs/c4-model/src/lib/component.ts"],"names":[],"mappings":";;;AAAA,iCAAmF;AAKnF,MAAa,SAAU,SAAQ,uBAAgB;IAE7C,YAAqC,IAAY,EAAE,UAAgC;QACjF,KAAK,CAAC,IAAI,EAAE,CAAC,WAAW,CAAC,EAAE,UAAU,CAAC,CAAA;QADH,SAAI,GAAJ,IAAI,CAAQ;IAEjD,CAAC;IAEM,gBAAgB;QACrB,OAAO,EAAE,CAAA;IACX,CAAC;CACF;AATD,8BASC;AAED,MAAa,mBAAoB,SAAQ,gBAAoB;CAC5D;AADD,kDACC"}

package/src/lib/container.d.ts

@@ -1,16 +1,30 @@
-import { Element, Reference, Relationship, RelationshipTarget, TechnologyDefinition } from "./core";
+import { Element, Group, Reference, TechnicalElement, TechnologyDefinition } from "./core";
 import { Component, ComponentDefinition, ReferencedComponent } from "./component";
 export interface ContainerDefinition extends TechnologyDefinition {
 }
-export declare class Container extends Element {
+interface DefineComponent {
+    defineComponent(name: string, definition?: ComponentDefinition): Component;
+}
+export declare class ContainerGroup extends Group<Container> implements DefineComponent {
+    readonly name: string;
+    private readonly container;
+    private _components;
+    constructor(name: string, container: DefineComponent);
+    defineComponent(name: string, definition?: ComponentDefinition): Component;
+    getComponents(): ReadonlyArray<Component>;
+}
+export declare class Container extends TechnicalElement implements DefineComponent {
     readonly name: string;
-    private _relationships;
     private _components;
+    private _groups;
     constructor(name: string, definition?: ContainerDefinition);
-    uses(otherElement: RelationshipTarget, definition?: TechnologyDefinition): void;
-    get relationships(): ReadonlyArray<Relationship>;
     defineComponent(name: string, definition?: ComponentDefinition): Component;
+    addGroup(groupName: string): ContainerGroup;
+    getGroups(): ReadonlyArray<ContainerGroup>;
+    getComponentsNotInGroups(): ReadonlyArray<Component>;
+    getChildElements(): ReadonlyArray<Element>;
 }
 export declare class ReferencedContainer extends Reference<Component> {
     referenceComponent(name: string): ReferencedComponent;
 }
+export {};

package/src/lib/container.js

@@ -1,21 +1,31 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ReferencedContainer = exports.Container = void 0;
+exports.ReferencedContainer = exports.Container = exports.ContainerGroup = void 0;
 const core_1 = require("./core");
 const component_1 = require("./component");
-class Container extends core_1.Element {
-    constructor(name, definition) {
-        super(name, ["Container"], definition);
+class ContainerGroup extends core_1.Group {
+    constructor(name, container) {
+        super(name);
         this.name = name;
-        this._relationships = [];
+        this.container = container;
         this._components = new Map();
     }
-    uses(otherElement, definition) {
-        const relationship = new core_1.Relationship(this, otherElement, definition);
-        this._relationships.push(relationship);
+    defineComponent(name, definition) {
+        const component = this.container.defineComponent(name, definition);
+        this._components.set(name, component);
+        return component;
+    }
+    getComponents() {
+        return Array.from(this._components.values());
     }
-    get relationships() {
-        return this._relationships;
+}
+exports.ContainerGroup = ContainerGroup;
+class Container extends core_1.TechnicalElement {
+    constructor(name, definition) {
+        super(name, ["Container"], definition);
+        this.name = name;
+        this._components = new Map();
+        this._groups = new Map();
     }
     defineComponent(name, definition) {
         if (this._components.has(name)) {
@@ -25,6 +35,24 @@ class Container extends core_1.Element {
         this._components.set(name, component);
         return component;
     }
+    addGroup(groupName) {
+        let group = this._groups.get(groupName);
+        if (!group) {
+            group = new ContainerGroup(groupName, this);
+            this._groups.set(groupName, group);
+        }
+        return group;
+    }
+    getGroups() {
+        return Array.from(this._groups.values());
+    }
+    getComponentsNotInGroups() {
+        const componentsInGroups = this.getGroups().flatMap(group => group.getComponents());
+        return Array.from(this._components.values()).filter(component => !componentsInGroups.includes(component));
+    }
+    getChildElements() {
+        return Array.from(this._components.values());
+    }
 }
 exports.Container = Container;
 class ReferencedContainer extends core_1.Reference {

package/src/lib/container.js.map

@@ -1 +1 @@
-{"version":3,"file":"container.js","sourceRoot":"","sources":["../../../../../libs/c4-model/src/lib/container.ts"],"names":[],"mappings":";;;AAAA,iCAAmG;AACnG,2CAAiF;AAKjF,MAAa,SAAU,SAAQ,cAAO;IAKpC,YAAqC,IAAY,EAAE,UAAgC;QACjF,KAAK,CAAC,IAAI,EAAE,CAAC,WAAW,CAAC,EAAE,UAAU,CAAC,CAAA;QADH,SAAI,GAAJ,IAAI,CAAQ;QAHzC,mBAAc,GAAmB,EAAE,CAAA;QACnC,gBAAW,GAAG,IAAI,GAAG,EAAqB,CAAC;IAInD,CAAC;IAEM,IAAI,CAAC,YAAgC,EAAE,UAAiC;QAC7E,MAAM,YAAY,GAAG,IAAI,mBAAY,CAAC,IAAI,EAAE,YAAY,EAAE,UAAU,CAAC,CAAA;QACrE,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;IACxC,CAAC;IAED,IAAW,aAAa;QACtB,OAAO,IAAI,CAAC,cAAc,CAAA;IAC5B,CAAC;IAEM,eAAe,CAAC,IAAY,EAAE,UAAgC;QACnE,IAAI,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;YAC9B,MAAM,KAAK,CAAC,sBAAsB,IAAI,uHAAuH,CAAC,CAAA;SAC/J;QAED,MAAM,SAAS,GAAG,IAAI,qBAAS,CAAC,IAAI,EAAE,UAAU,CAAC,CAAA;QAEjD,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QAEtC,OAAO,SAAS,CAAA;IAClB,CAAC;CACF;AA7BD,8BA6BC;AAED,MAAa,mBAAoB,SAAQ,gBAAoB;IACpD,kBAAkB,CAAC,IAAY;QACpC,MAAM,kBAAkB,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,+BAAmB,CAAC,IAAI,CAAC,CAAC,CAAA;QACrG,OAAO,kBAAyC,CAAA;IAClD,CAAC;CACF;AALD,kDAKC"}
+{"version":3,"file":"container.js","sourceRoot":"","sources":["../../../../../libs/c4-model/src/lib/container.ts"],"names":[],"mappings":"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"}

package/src/lib/core.d.ts

@@ -13,7 +13,14 @@ export declare abstract class Element {
     readonly name: string;
     readonly description?: string;
     readonly tags: ReadonlyArray<string>;
+    private _relationships;
     constructor(name: string, defaultTags?: string[], definition?: Definition);
+    get canonicalName(): string;
+    uses(otherElement: RelationshipTarget, definition?: TechnologyDefinition): void;
+    get relationships(): ReadonlyArray<Relationship>;
+    abstract getChildElements(): ReadonlyArray<Element>;
+    getRelationshipsInHierarchy(): ReadonlyArray<Relationship>;
+    getChildElementNames(path?: string): ReadonlyArray<string>;
 }
 export declare abstract class TechnicalElement extends Element {
     readonly technology?: string;
@@ -31,8 +38,14 @@ export declare class Reference<T> {
     readonly name: string;
     private readonly _references;
     constructor(name: string);
+    get canonicalName(): string;
     protected referenceChild(name: string, createChild: (childName: string) => Reference<T>): Reference<T>;
     get references(): ReadonlyArray<Reference<T>>;
-    getChildElements(path?: string): ReadonlyArray<string>;
+    getChildElementNames(path?: string): ReadonlyArray<string>;
 }
 export type RelationshipTarget = Person | SoftwareSystem | ReferencedSoftwareSystem | Container | ReferencedContainer | Component | ReferencedComponent;
+export declare class Group<T> {
+    readonly name: string;
+    constructor(name: string);
+    addToGroup(groupCollection: string, groupMember: T): void;
+}

package/src/lib/core.js

@@ -1,13 +1,34 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Reference = exports.Relationship = exports.TechnicalElement = exports.Element = void 0;
+exports.Group = exports.Reference = exports.Relationship = exports.TechnicalElement = exports.Element = void 0;
 class Element {
     constructor(name, defaultTags = [], definition) {
         var _a;
         this.name = name;
+        this._relationships = [];
         this.description = definition === null || definition === void 0 ? void 0 : definition.description;
         this.tags = ((_a = definition === null || definition === void 0 ? void 0 : definition.tags) !== null && _a !== void 0 ? _a : []).concat(["Element"]).concat(defaultTags);
     }
+    get canonicalName() {
+        return this.name.toLowerCase();
+    }
+    uses(otherElement, definition) {
+        const relationship = new Relationship(this, otherElement, definition);
+        this._relationships.push(relationship);
+    }
+    get relationships() {
+        return this._relationships;
+    }
+    getRelationshipsInHierarchy() {
+        return this._relationships.concat(this.getChildElements().flatMap(element => element.getRelationshipsInHierarchy()));
+    }
+    getChildElementNames(path) {
+        const result = Array.from(this.getChildElements()).flatMap(reference => {
+            const currentPath = `${path ? path : '' + this.name}.${reference.name}`;
+            return [currentPath, ...reference.getChildElementNames(currentPath)];
+        });
+        return result;
+    }
 }
 exports.Element = Element;
 class TechnicalElement extends Element {
@@ -33,6 +54,9 @@ class Reference {
         this.name = name;
         this._references = new Map();
     }
+    get canonicalName() {
+        return this.name.toLowerCase();
+    }
     referenceChild(name, createChild) {
         let reference = this._references.get(name);
         if (!reference) {
@@ -44,13 +68,21 @@ class Reference {
     get references() {
         return Array.from(this._references.values());
     }
-    getChildElements(path) {
+    getChildElementNames(path) {
         const result = Array.from(this._references.values()).flatMap(reference => {
             const currentPath = `${path ? path : '' + this.name}.${reference.name}`;
-            return [currentPath, ...reference.getChildElements(currentPath)];
+            return [currentPath, ...reference.getChildElementNames(currentPath)];
         });
         return result;
     }
 }
 exports.Reference = Reference;
+class Group {
+    constructor(name) {
+        this.name = name;
+    }
+    addToGroup(groupCollection, groupMember) {
+    }
+}
+exports.Group = Group;
 //# sourceMappingURL=core.js.map

package/src/lib/core.js.map

@@ -1 +1 @@
-{"version":3,"file":"core.js","sourceRoot":"","sources":["../../../../../libs/c4-model/src/lib/core.ts"],"names":[],"mappings":";;;AAcA,MAAsB,OAAO;IAI3B,YAA4B,IAAY,EAAE,cAAwB,EAAE,EAAE,UAAuB;;QAAjE,SAAI,GAAJ,IAAI,CAAQ;QACtC,IAAI,CAAC,WAAW,GAAG,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,WAAW,CAAA;QAC1C,IAAI,CAAC,IAAI,GAAG,CAAC,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,IAAI,mCAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;IAC9E,CAAC;CACF;AARD,0BAQC;AAED,MAAsB,gBAAiB,SAAQ,OAAO;IAGpD,YAAY,IAAY,EAAE,cAAwB,EAAE,EAAE,UAAiC;QACrF,KAAK,CAAC,IAAI,EAAE,WAAW,EAAE,UAAU,CAAC,CAAA;QACpC,IAAI,CAAC,UAAU,GAAG,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,UAAU,CAAA;IAC1C,CAAC;CACF;AAPD,4CAOC;AAED,MAAa,YAAY;IAKvB,YAA4B,MAAe,EAAkB,WAAwE,EAAE,UAAiC;;QAA5I,WAAM,GAAN,MAAM,CAAS;QAAkB,gBAAW,GAAX,WAAW,CAA6D;QACnI,IAAI,CAAC,WAAW,GAAG,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,WAAW,CAAA;QAC1C,IAAI,CAAC,UAAU,GAAG,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,UAAU,CAAA;QACxC,IAAI,CAAC,IAAI,GAAG,CAAC,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,IAAI,mCAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,cAAc,CAAC,CAAC,CAAA;IAC/D,CAAC;CACF;AAVD,oCAUC;AAED,MAAa,SAAS;IAGpB,YAA4B,IAAY;QAAZ,SAAI,GAAJ,IAAI,CAAQ;QAFvB,gBAAW,GAAG,IAAI,GAAG,EAAwB,CAAA;IAG9D,CAAC;IAES,cAAc,CAAC,IAAY,EAAE,WAAgD;QACrF,IAAI,SAAS,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QAC1C,IAAI,CAAC,SAAS,EAAE;YACd,SAAS,GAAG,WAAW,CAAC,IAAI,CAAC,CAAA;YAC7B,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,EAAE,SAAS,CAAC,CAAA;SACtC;QACD,OAAO,SAAS,CAAA;IAClB,CAAC;IAED,IAAW,UAAU;QACnB,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,CAAA;IAC9C,CAAC;IAEM,gBAAgB,CAAC,IAAa;QACnC,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;YACvE,MAAM,WAAW,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,IAAI,IAAI,SAAS,CAAC,IAAI,EAAE,CAAA;YACvE,OAAO,CAAC,WAAW,EAAE,GAAG,SAAS,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC,CAAA;QAClE,CAAC,CAAC,CAAA;QACF,OAAO,MAAM,CAAA;IACf,CAAC;CACF;AA1BD,8BA0BC"}
+{"version":3,"file":"core.js","sourceRoot":"","sources":["../../../../../libs/c4-model/src/lib/core.ts"],"names":[],"mappings":"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"}

package/src/lib/model.d.ts

@@ -1,5 +1,27 @@
+import { Group } from './core';
 import { ReferencedSoftwareSystem, SoftwareSystem, SoftwareSystemDefinition } from './softwareSystem';
 import { Person, PersonDefinition, ReferencedPerson } from './person';
+interface DefineSoftwareSystem {
+    defineSoftwareSystem(name: string, definition?: SoftwareSystemDefinition): SoftwareSystem;
+}
+interface DefinePerson {
+    definePerson(name: string, definition?: PersonDefinition): Person;
+}
+export declare class ModelGroup extends Group<SoftwareSystem | Person> implements DefineSoftwareSystem, DefinePerson {
+    readonly name: string;
+    private readonly model;
+    private softwareSystems;
+    private people;
+    constructor(name: string, model: DefineSoftwareSystem & DefinePerson);
+    defineSoftwareSystem(name: string, definition?: SoftwareSystemDefinition): SoftwareSystem;
+    definePerson(name: string, definition?: PersonDefinition): Person;
+    getSoftwareSystems(): ReadonlyArray<SoftwareSystem>;
+    getPeople(): ReadonlyArray<Person>;
+}
+export interface ModelDefinitions {
+    defineSoftwareSystem(name: string, definition?: SoftwareSystemDefinition): SoftwareSystem;
+    definePerson(name: string, definition?: PersonDefinition): Person;
+}
 export declare class Model {
     name: string;
     constructor(name: string);
@@ -7,10 +29,18 @@ export declare class Model {
     private referencedSoftwareSystems;
     private people;
     private referencedPeople;
+    private groups;
     defineSoftwareSystem(name: string, definition?: SoftwareSystemDefinition): SoftwareSystem;
+    addGroup(groupName: string): Group<SoftwareSystem | Person> & ModelDefinitions;
     referenceSoftwareSystem(name: string): ReferencedSoftwareSystem;
     definePerson(name: string, definition?: PersonDefinition): Person;
     referencePerson(name: string): ReferencedPerson;
     validate(): void;
+    getPeople(): ReadonlyArray<Person>;
+    getSoftwareSystems(): ReadonlyArray<SoftwareSystem>;
+    getPeopleNotInGroups(): ReadonlyArray<Person>;
+    getSoftwareSystemsNotInGroups(): ReadonlyArray<SoftwareSystem>;
+    getGroups(): ReadonlyArray<ModelGroup>;
 }
 export declare function buildModel(modelName: string, globPath?: string): Promise<Model>;
+export {};

package/src/lib/model.js

@@ -1,11 +1,38 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildModel = exports.Model = void 0;
+exports.buildModel = exports.Model = exports.ModelGroup = void 0;
 const tslib_1 = require("tslib");
 const glob_1 = require("glob");
 const path_1 = require("path");
+const core_1 = require("./core");
 const softwareSystem_1 = require("./softwareSystem");
 const person_1 = require("./person");
+class ModelGroup extends core_1.Group {
+    constructor(name, model) {
+        super(name);
+        this.name = name;
+        this.model = model;
+        this.softwareSystems = new Map();
+        this.people = new Map();
+    }
+    defineSoftwareSystem(name, definition) {
+        const softwareSystem = this.model.defineSoftwareSystem(name, definition);
+        this.softwareSystems.set(name, softwareSystem);
+        return softwareSystem;
+    }
+    definePerson(name, definition) {
+        const person = this.model.definePerson(name, definition);
+        this.people.set(name, person);
+        return person;
+    }
+    getSoftwareSystems() {
+        return Array.from(this.softwareSystems.values());
+    }
+    getPeople() {
+        return Array.from(this.people.values());
+    }
+}
+exports.ModelGroup = ModelGroup;
 class Model {
     constructor(name) {
         this.name = name;
@@ -13,6 +40,7 @@ class Model {
         this.referencedSoftwareSystems = new Map();
         this.people = new Map();
         this.referencedPeople = new Map();
+        this.groups = new Map();
     }
     defineSoftwareSystem(name, definition) {
         if (this.softwareSystems.has(name)) {
@@ -22,6 +50,14 @@ class Model {
         this.softwareSystems.set(name, system);
         return system;
     }
+    addGroup(groupName) {
+        let group = this.groups.get(groupName);
+        if (!group) {
+            group = new ModelGroup(groupName, this);
+            this.groups.set(groupName, group);
+        }
+        return group;
+    }
     referenceSoftwareSystem(name) {
         let system = this.referencedSoftwareSystems.get(name);
         if (!system) {
@@ -55,13 +91,30 @@ class Model {
         if (undefinedPeople.length > 0) {
             throw Error(`People named '${undefinedPeople.join("', '")}' are referenced but not defined.`);
         }
-        const definedElements = Array.from(this.softwareSystems.values()).flatMap(system => system.getChildElements());
-        const referencedElements = Array.from(this.referencedSoftwareSystems.values()).flatMap(system => system.getChildElements());
+        const definedElements = Array.from(this.softwareSystems.values()).flatMap(system => system.getChildElementNames());
+        const referencedElements = Array.from(this.referencedSoftwareSystems.values()).flatMap(system => system.getChildElementNames());
         const undefinedElements = referencedElements.filter(name => !definedElements.includes(name));
         if (undefinedElements.length > 0) {
             throw Error(`Elements named '${undefinedElements.join("', '")}' are referenced but not defined.`);
         }
     }
+    getPeople() {
+        return Array.from(this.people.values());
+    }
+    getSoftwareSystems() {
+        return Array.from(this.softwareSystems.values());
+    }
+    getPeopleNotInGroups() {
+        const peopleInGroups = Array.from(this.groups.values()).flatMap(group => group.getPeople());
+        return Array.from(this.people.values()).filter(person => !peopleInGroups.includes(person));
+    }
+    getSoftwareSystemsNotInGroups() {
+        const systemsInGroups = Array.from(this.groups.values()).flatMap(group => group.getSoftwareSystems());
+        return Array.from(this.softwareSystems.values()).filter(system => !systemsInGroups.includes(system));
+    }
+    getGroups() {
+        return Array.from(this.groups.values());
+    }
 }
 exports.Model = Model;
 function buildModel(modelName, globPath = 'c4.dsl.ts') {

package/src/lib/model.js.map

@@ -1 +1 @@
-{"version":3,"file":"model.js","sourceRoot":"","sources":["../../../../../libs/c4-model/src/lib/model.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"model.js","sourceRoot":"","sources":["../../../../../libs/c4-model/src/lib/model.ts"],"names":[],"mappings":"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"}

package/src/lib/person.d.ts

@@ -1,9 +1,11 @@
-import { Definition, Element, Reference } from './core';
+import { Definition, Element, Reference, RelationshipTarget } from './core';
 export interface PersonDefinition extends Definition {
 }
 export declare class Person extends Element {
     readonly name: string;
     constructor(name: string, definition?: PersonDefinition);
+    getChildElements(): ReadonlyArray<Element>;
+    uses(otherElement: RelationshipTarget, definition?: Definition): void;
 }
 export declare class ReferencedPerson extends Reference<undefined> {
 }

package/src/lib/person.js

@@ -7,6 +7,15 @@ class Person extends core_1.Element {
         super(name, ["Person"], definition);
         this.name = name;
     }
+    getChildElements() {
+        return [];
+    }
+    uses(otherElement, definition) {
+        super.uses(otherElement, definition);
+        // base(this).uses(otherElement, definition)
+        // const relationship = new Relationship(this, otherElement, definition)
+        // this._relationships.push(relationship)
+    }
 }
 exports.Person = Person;
 class ReferencedPerson extends core_1.Reference {

package/src/lib/person.js.map

@@ -1 +1 @@
-{"version":3,"file":"person.js","sourceRoot":"","sources":["../../../../../libs/c4-model/src/lib/person.ts"],"names":[],"mappings":";;;AAAA,iCAAuD;AAKvD,MAAa,MAAO,SAAQ,cAAO;IACjC,YAAqC,IAAY,EAAE,UAA6B;QAC9E,KAAK,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,EAAE,UAAU,CAAC,CAAA;QADA,SAAI,GAAJ,IAAI,CAAQ;IAEjD,CAAC;CACF;AAJD,wBAIC;AAED,MAAa,gBAAiB,SAAQ,gBAAoB;CACzD;AADD,4CACC"}
+{"version":3,"file":"person.js","sourceRoot":"","sources":["../../../../../libs/c4-model/src/lib/person.ts"],"names":[],"mappings":";;;AAAA,iCAAyF;AAKzF,MAAa,MAAO,SAAQ,cAAO;IACjC,YAAqC,IAAY,EAAE,UAA6B;QAC9E,KAAK,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,EAAE,UAAU,CAAC,CAAA;QADA,SAAI,GAAJ,IAAI,CAAQ;IAEjD,CAAC;IAEM,gBAAgB;QACrB,OAAO,EAAE,CAAA;IACX,CAAC;IAEe,IAAI,CAAC,YAAgC,EAAE,UAAuB;QAC5E,KAAK,CAAC,IAAI,CAAC,YAAY,EAAE,UAAU,CAAC,CAAA;QACpC,4CAA4C;QAC5C,wEAAwE;QACxE,yCAAyC;IAC3C,CAAC;CACF;AAfD,wBAeC;AAED,MAAa,gBAAiB,SAAQ,gBAAoB;CACzD;AADD,4CACC"}

package/src/lib/softwareSystem.d.ts

@@ -1,20 +1,33 @@
-import { Definition, Element, Reference, Relationship, RelationshipTarget, TechnologyDefinition } from './core';
+import { Definition, Element, Group, Reference } from './core';
 import { Container, ContainerDefinition, ReferencedContainer } from './container';
 export interface SoftwareSystemDefinition extends Definition {
 }
+interface DefineContainer {
+    defineContainer(name: string, definition?: ContainerDefinition): Container;
+}
 export interface SoftwareSystemReference {
     name: string;
 }
-export declare class SoftwareSystem extends Element {
+export declare class SoftwareSystemGroup extends Group<Container> implements DefineContainer {
+    readonly name: string;
+    private readonly softwareSystem;
+    private _containers;
+    constructor(name: string, softwareSystem: DefineContainer);
+    defineContainer(name: string, definition?: ContainerDefinition): Container;
+    getContainers(): ReadonlyArray<Container>;
+}
+export declare class SoftwareSystem extends Element implements DefineContainer {
     readonly name: string;
-    private _relationships;
     private _containers;
+    private _groups;
     constructor(name: string, definition?: SoftwareSystemDefinition);
-    uses(otherElement: RelationshipTarget, definition?: TechnologyDefinition): void;
-    get relationships(): ReadonlyArray<Relationship>;
     defineContainer(name: string, definition?: ContainerDefinition): Container;
-    getChildElements(): ReadonlyArray<string>;
+    addGroup(groupName: string): SoftwareSystemGroup;
+    getGroups(): ReadonlyArray<SoftwareSystemGroup>;
+    getChildElements(): ReadonlyArray<Element>;
+    getContainersNotInGroups(): ReadonlyArray<Container>;
 }
 export declare class ReferencedSoftwareSystem extends Reference<Container> {
     referenceContainer(name: string): ReferencedContainer;
 }
+export {};

package/src/lib/softwareSystem.js

@@ -1,21 +1,31 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ReferencedSoftwareSystem = exports.SoftwareSystem = void 0;
+exports.ReferencedSoftwareSystem = exports.SoftwareSystem = exports.SoftwareSystemGroup = void 0;
 const core_1 = require("./core");
 const container_1 = require("./container");
+class SoftwareSystemGroup extends core_1.Group {
+    constructor(name, softwareSystem) {
+        super(name);
+        this.name = name;
+        this.softwareSystem = softwareSystem;
+        this._containers = new Map();
+    }
+    defineContainer(name, definition) {
+        const container = this.softwareSystem.defineContainer(name, definition);
+        this._containers.set(name, container);
+        return container;
+    }
+    getContainers() {
+        return Array.from(this._containers.values());
+    }
+}
+exports.SoftwareSystemGroup = SoftwareSystemGroup;
 class SoftwareSystem extends core_1.Element {
     constructor(name, definition) {
         super(name, ["Software System"], definition);
         this.name = name;
-        this._relationships = [];
         this._containers = new Map();
-    }
-    uses(otherElement, definition) {
-        const relationship = new core_1.Relationship(this, otherElement, definition);
-        this._relationships.push(relationship);
-    }
-    get relationships() {
-        return this._relationships;
+        this._groups = new Map();
     }
     defineContainer(name, definition) {
         if (this._containers.has(name)) {
@@ -25,9 +35,23 @@ class SoftwareSystem extends core_1.Element {
         this._containers.set(name, container);
         return container;
     }
+    addGroup(groupName) {
+        let group = this._groups.get(groupName);
+        if (!group) {
+            group = new SoftwareSystemGroup(groupName, this);
+            this._groups.set(groupName, group);
+        }
+        return group;
+    }
+    getGroups() {
+        return Array.from(this._groups.values());
+    }
     getChildElements() {
-        const result = Array.from(this._containers.values()).map(container => `${this.name}.${container.name}`);
-        return result;
+        return Array.from(this._containers.values());
+    }
+    getContainersNotInGroups() {
+        const containersInGroups = Array.from(this._groups.values()).flatMap((group) => group.getContainers());
+        return Array.from(this._containers.values()).filter((container) => !containersInGroups.includes(container));
     }
 }
 exports.SoftwareSystem = SoftwareSystem;

package/src/lib/softwareSystem.js.map

@@ -1 +1 @@
-{"version":3,"file":"softwareSystem.js","sourceRoot":"","sources":["../../../../../libs/c4-model/src/lib/softwareSystem.ts"],"names":[],"mappings":";;;AAAA,iCAA+G;AAC/G,2CAAiF;AASjF,MAAa,cAAe,SAAQ,cAAO;IAKzC,YAAqC,IAAY,EAAE,UAAqC;QACtF,KAAK,CAAC,IAAI,EAAE,CAAC,iBAAiB,CAAC,EAAE,UAAU,CAAC,CAAA;QADT,SAAI,GAAJ,IAAI,CAAQ;QAHzC,mBAAc,GAAmB,EAAE,CAAA;QACnC,gBAAW,GAAG,IAAI,GAAG,EAAqB,CAAC;IAInD,CAAC;IAEM,IAAI,CAAC,YAAgC,EAAE,UAAiC;QAC7E,MAAM,YAAY,GAAG,IAAI,mBAAY,CAAC,IAAI,EAAE,YAAY,EAAE,UAAU,CAAC,CAAA;QACrE,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;IACxC,CAAC;IAED,IAAW,aAAa;QACtB,OAAO,IAAI,CAAC,cAAc,CAAA;IAC5B,CAAC;IAEM,eAAe,CAAC,IAAY,EAAE,UAAgC;QACnE,IAAI,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;YAC9B,MAAM,KAAK,CAAC,sBAAsB,IAAI,4HAA4H,CAAC,CAAA;SACpK;QAED,MAAM,SAAS,GAAG,IAAI,qBAAS,CAAC,IAAI,EAAE,UAAU,CAAC,CAAA;QAEjD,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QAEtC,OAAO,SAAS,CAAA;IAClB,CAAC;IAEM,gBAAgB;QACrB,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,IAAI,IAAI,SAAS,CAAC,IAAI,EAAE,CAAC,CAAA;QACvG,OAAO,MAAM,CAAA;IACf,CAAC;CACF;AAlCD,wCAkCC;AAED,MAAa,wBAAyB,SAAQ,gBAAoB;IAEzD,kBAAkB,CAAC,IAAY;QACpC,MAAM,kBAAkB,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,+BAAmB,CAAC,IAAI,CAAC,CAAC,CAAA;QACrG,OAAO,kBAAyC,CAAA;IAClD,CAAC;CACF;AAND,4DAMC"}
+{"version":3,"file":"softwareSystem.js","sourceRoot":"","sources":["../../../../../libs/c4-model/src/lib/softwareSystem.ts"],"names":[],"mappings":"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"}

package/src/lib/structurizrDslWriter.d.ts

@@ -0,0 +1,20 @@
+import { Model } from "./model";
+import { Views } from './views';
+export declare class StructurizrDSLWriter {
+    private readonly model;
+    private readonly views;
+    constructor(model: Model, views: Views);
+    private writeElement;
+    private writeComponent;
+    private writeContainerGroup;
+    private writeContainer;
+    private writeSoftwareSystemGroup;
+    private writeSoftwareSystem;
+    private writeRelationships;
+    private writeModelGroup;
+    private writeModel;
+    private writeView;
+    private writeViews;
+    write(): string;
+    private writeLine;
+}

package/src/lib/structurizrDslWriter.js

@@ -0,0 +1,166 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.StructurizrDSLWriter = void 0;
+const INDENT_SIZE = 2;
+class StructurizrDSLWriter {
+    constructor(model, views) {
+        this.model = model;
+        this.views = views;
+    }
+    writeElement(elementType, element, level, closeElement = true) {
+        let elementDsl = "";
+        elementDsl += this.writeLine(`${element.canonicalName} = ${elementType} "${element.name}" {`, level);
+        if (element.description) {
+            elementDsl += this.writeLine(`description "${element.description}"`, level + 1);
+        }
+        elementDsl += this.writeLine(`tags ${element.tags.map(tag => `"${tag}"`).join(" ")}`, level + 1);
+        if (closeElement) {
+            elementDsl += this.writeLine(`}`, level);
+        }
+        return elementDsl;
+    }
+    writeComponent(component, level) {
+        let componentDsl = "";
+        componentDsl += this.writeElement("component", component, level, false);
+        componentDsl += this.writeLine(`technology "${component.technology}"`, level + 1);
+        componentDsl += this.writeLine(`}`, level);
+        return componentDsl;
+    }
+    writeContainerGroup(group, level) {
+        let containerGroupDsl = "";
+        containerGroupDsl += this.writeLine(`${group.name} = group "${group.name}" {`, level);
+        group.getComponents().forEach(component => {
+            containerGroupDsl += this.writeComponent(component, level + 1);
+        });
+        containerGroupDsl += this.writeLine(`}`, level);
+        return containerGroupDsl;
+    }
+    writeContainer(container, level) {
+        let containerDsl = "";
+        containerDsl += this.writeElement("container", container, level, false);
+        containerDsl += this.writeLine(`technology "${container.technology}"`, level + 1);
+        container.getComponentsNotInGroups().forEach((component) => {
+            containerDsl += this.writeComponent(component, level + 1);
+        });
+        container.getGroups().forEach((group) => {
+            containerDsl += this.writeContainerGroup(group, level + 1);
+        });
+        containerDsl += this.writeLine(`}`, level);
+        return containerDsl;
+    }
+    writeSoftwareSystemGroup(group, level) {
+        let softwareSystemGroupDsl = "";
+        softwareSystemGroupDsl += this.writeLine(`${group.name} = group "${group.name}" {`, level);
+        group.getContainers().forEach(container => {
+            softwareSystemGroupDsl += this.writeContainer(container, level + 1);
+        });
+        softwareSystemGroupDsl += this.writeLine(`}`, level);
+        return softwareSystemGroupDsl;
+    }
+    writeSoftwareSystem(softwareSystem, level) {
+        let softwareSystemDsl = "";
+        softwareSystemDsl += this.writeElement("softwareSystem", softwareSystem, level, false);
+        softwareSystem.getContainersNotInGroups().forEach((container) => {
+            softwareSystemDsl += this.writeContainer(container, level + 1);
+        });
+        softwareSystem.getGroups().forEach((group) => {
+            softwareSystemDsl += this.writeSoftwareSystemGroup(group, level + 1);
+        });
+        softwareSystemDsl += this.writeLine(`}`, level);
+        return softwareSystemDsl;
+    }
+    writeRelationships(elements, level) {
+        let relationshipsDsl = "";
+        elements.forEach(element => {
+            element.getRelationshipsInHierarchy().forEach(relationship => {
+                var _a;
+                relationshipsDsl += this.writeLine(`${relationship.source.canonicalName} -> ${relationship.destination.canonicalName} "${(_a = relationship.description) !== null && _a !== void 0 ? _a : "uses"}" {`, level);
+                if (relationship.technology) {
+                    relationshipsDsl += this.writeLine(`technology "${relationship.technology}"`, level + 1);
+                }
+                relationshipsDsl += this.writeLine(`tags ${relationship.tags.map(tag => `"${tag}"`).join(" ")}`, level + 1);
+                relationshipsDsl += this.writeLine(`}`, level);
+            });
+        });
+        return relationshipsDsl;
+    }
+    writeModelGroup(group, level) {
+        let modelGroupDsl = "";
+        modelGroupDsl += this.writeLine(`${group.name} = group "${group.name}" {`, level);
+        group.getPeople().forEach(person => {
+            modelGroupDsl += this.writeElement("person", person, level + 1);
+        });
+        group.getSoftwareSystems().forEach(softwareSystem => {
+            modelGroupDsl += this.writeSoftwareSystem(softwareSystem, level + 1);
+        });
+        modelGroupDsl += this.writeLine(`}`, level);
+        return modelGroupDsl;
+    }
+    writeModel(model, level) {
+        let modelDsl = "";
+        modelDsl += this.writeLine(`model {`, level);
+        modelDsl += this.writeLine('// Elements', level + 1);
+        model.getPeopleNotInGroups().forEach(person => {
+            modelDsl += this.writeElement("person", person, level + 1);
+        });
+        model.getSoftwareSystemsNotInGroups().forEach(softwareSystem => {
+            modelDsl += this.writeSoftwareSystem(softwareSystem, level + 1);
+        });
+        model.getGroups().forEach(group => {
+            modelDsl += this.writeModelGroup(group, level + 1);
+        });
+        modelDsl += this.writeLine('// Relationships', level + 1);
+        modelDsl += this.writeRelationships(model.getPeople().concat(model.getSoftwareSystems()), level + 1);
+        modelDsl += this.writeLine(`}`, level);
+        return modelDsl;
+    }
+    writeView(view, viewType, level) {
+        let viewDsl = this.writeLine(`${viewType}${view.subject ? ' "' + view.subject.canonicalName + '"' : ""} "${view.key}" "${view.description}" {`, level);
+        if (view.title) {
+            viewDsl += this.writeLine(`title "${view.title}"`, level + 1);
+        }
+        view.scopes.forEach(scope => {
+            viewDsl += this.writeLine(`${scope}`, level + 1);
+        });
+        viewDsl += this.writeLine(`}`, level);
+        return viewDsl;
+    }
+    writeViews(views, level) {
+        let viewDsl = "";
+        viewDsl += this.writeLine(`views {`, level);
+        viewDsl += this.writeLine('// System Landscape Views', level + 1);
+        views.systemLandscapeViews.forEach(view => {
+            viewDsl += this.writeView(view, "systemLandscape", level + 1);
+        });
+        viewDsl += this.writeLine('// System Context Views', level + 1);
+        views.systemContextViews.forEach(view => {
+            viewDsl += this.writeView(view, "systemContext", level + 1);
+        });
+        viewDsl += this.writeLine('// Container Views', level + 1);
+        views.containerViews.forEach(view => {
+            viewDsl += this.writeView(view, "container", level + 1);
+        });
+        viewDsl += this.writeLine('// Component Views', level + 1);
+        views.componentViews.forEach(view => {
+            viewDsl += this.writeView(view, "component", level + 1);
+        });
+        viewDsl += this.writeLine(`theme default`, level + 1);
+        viewDsl += this.writeLine(`}`, level);
+        return viewDsl;
+    }
+    write() {
+        let dsl = "";
+        this.model.validate();
+        dsl += this.writeLine(`workspace "${this.model.name}" {`, 0);
+        dsl += this.writeModel(this.model, 1);
+        dsl += this.writeViews(this.views, 1);
+        dsl += this.writeLine(`}`, 0);
+        return dsl;
+    }
+    writeLine(line, level) {
+        const indent = " ".repeat(level * INDENT_SIZE);
+        return `${indent}${line}\n`;
+    }
+}
+exports.StructurizrDSLWriter = StructurizrDSLWriter;
+//# sourceMappingURL=structurizrDslWriter.js.map

package/src/lib/structurizrDslWriter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"structurizrDslWriter.js","sourceRoot":"","sources":["../../../../../libs/c4-model/src/lib/structurizrDslWriter.ts"],"names":[],"mappings":"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"}

package/src/lib/views.d.ts

@@ -0,0 +1,38 @@
+import { Container } from './container';
+import { Element } from './core';
+import { SoftwareSystem } from './softwareSystem';
+interface ViewDefinition<T extends Element> {
+    subject?: T;
+    description: string;
+    title?: string;
+}
+export declare class View<T extends Element> {
+    readonly key: string;
+    readonly subject?: T;
+    readonly description: string;
+    readonly title?: string;
+    private _scopes;
+    constructor(key: string, viewDefinition: ViewDefinition<T>);
+    includeAll(): void;
+    includeElement(element: T): void;
+    includeExpression(expression: string): void;
+    excludeAll(): void;
+    excludeElement(element: T): void;
+    excludeExpression(expression: string): void;
+    get scopes(): ReadonlyArray<string>;
+}
+export declare class Views {
+    private readonly _systemLandscapeViews;
+    private readonly _systemContextViews;
+    private readonly _containerViews;
+    private readonly _componentViews;
+    addSystemLandscapeView(key: string, definition: ViewDefinition<Element>): View<Element>;
+    addSystemContextView(key: string, definition: ViewDefinition<SoftwareSystem>): View<SoftwareSystem>;
+    addContainerView(key: string, definition: ViewDefinition<SoftwareSystem>): View<SoftwareSystem>;
+    addComponentView(key: string, definition: ViewDefinition<Container>): View<Container>;
+    get systemLandscapeViews(): ReadonlyArray<View<Element>>;
+    get systemContextViews(): ReadonlyArray<View<SoftwareSystem>>;
+    get containerViews(): ReadonlyArray<View<SoftwareSystem>>;
+    get componentViews(): ReadonlyArray<View<Container>>;
+}
+export {};

package/src/lib/views.js

@@ -0,0 +1,76 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Views = exports.View = void 0;
+class View {
+    constructor(key, viewDefinition) {
+        this.key = key;
+        this._scopes = [];
+        this.description = viewDefinition.description;
+        this.subject = viewDefinition.subject;
+        this.title = viewDefinition.title;
+    }
+    includeAll() {
+        this._scopes.push("include *");
+    }
+    includeElement(element) {
+        this._scopes.push(`include ${element.canonicalName}`);
+    }
+    includeExpression(expression) {
+        this._scopes.push(`include ${expression}`);
+    }
+    excludeAll() {
+        this._scopes.push("exclude *");
+    }
+    excludeElement(element) {
+        this._scopes.push(`exclude ${element.canonicalName}`);
+    }
+    excludeExpression(expression) {
+        this._scopes.push(`exclude ${expression}`);
+    }
+    get scopes() {
+        return this._scopes;
+    }
+}
+exports.View = View;
+class Views {
+    constructor() {
+        this._systemLandscapeViews = new Map();
+        this._systemContextViews = new Map();
+        this._containerViews = new Map();
+        this._componentViews = new Map();
+    }
+    addSystemLandscapeView(key, definition) {
+        const view = new View(key, { subject: undefined, description: definition.description, title: definition.title });
+        this._systemLandscapeViews.set(key, view);
+        return view;
+    }
+    addSystemContextView(key, definition) {
+        const view = new View(key, definition);
+        this._systemContextViews.set(key, view);
+        return view;
+    }
+    addContainerView(key, definition) {
+        const view = new View(key, definition);
+        this._containerViews.set(key, view);
+        return view;
+    }
+    addComponentView(key, definition) {
+        const view = new View(key, definition);
+        this._componentViews.set(key, view);
+        return view;
+    }
+    get systemLandscapeViews() {
+        return Array.from(this._systemLandscapeViews.values());
+    }
+    get systemContextViews() {
+        return Array.from(this._systemContextViews.values());
+    }
+    get containerViews() {
+        return Array.from(this._containerViews.values());
+    }
+    get componentViews() {
+        return Array.from(this._componentViews.values());
+    }
+}
+exports.Views = Views;
+//# sourceMappingURL=views.js.map

package/src/lib/views.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"views.js","sourceRoot":"","sources":["../../../../../libs/c4-model/src/lib/views.ts"],"names":[],"mappings":"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"}