likec4 1.23.0 → 1.24.0

package/dist/index.d.ts

@@ -1,9 +1,11 @@
 import * as c4 from '@likec4/core';
-import { Fqn, EdgeId, ComputedView, DiagramView, OverviewGraph, ViewId, invariant, ViewChange } from '@likec4/core';
+import { Fqn, EdgeId, ComputedView, DiagramView, OverviewGraph, LikeC4Model, ViewId, invariant, ViewChange } from '@likec4/core';
 export { AbstractRelation, AutoLayoutDirection, BBox, Color, ComputedDeploymentView, ComputedDynamicView, ComputedEdge, ComputedElementView, ComputedLikeC4Model, ComputedNode, ComputedView, DeployedInstance, DeploymentElement, DeploymentNode, DeploymentNodeKind, DeploymentRelation, DeploymentView, DiagramEdge, DiagramNode, DiagramView, DynamicView, EdgeId, Element, ElementKind, ElementView, Fqn, HexColorLiteral, LayoutedLikeC4Model, LikeC4View, NodeId, ParsedLikeC4Model, Point, RelationExpr, RelationId, StepEdgeId, Tag, ThemeColor, ViewId, XYPoint } from '@likec4/core';
-import { LikeC4Model } from '@likec4/core/model';
+import { LikeC4Model as LikeC4Model$1 } from '@likec4/core/model';
 export { AnyAux, Aux, LikeC4DeploymentModel, LikeC4Model, LikeC4ViewModel } from '@likec4/core/model';
 import { Tagged, ValueOf, ConditionalPick, Writable } from 'type-fest';
+import { Fqn as Fqn$1 } from '@likec4/core/types';
+import { DefaultWeakMap } from '@likec4/core/utils';
 
 /**
  * A tagging type for string properties that are actually document URIs.
@@ -6208,38 +6210,6 @@ declare class SimpleCache<K, V> extends DisposableCache {
     delete(key: K): boolean;
     clear(): void;
 }
-declare class ContextCache<Context, Key, Value, ContextKey = Context> extends DisposableCache {
-    private readonly cache;
-    private readonly converter;
-    constructor(converter?: (input: Context) => ContextKey);
-    has(contextKey: Context, key: Key): boolean;
-    set(contextKey: Context, key: Key, value: Value): void;
-    get(contextKey: Context, key: Key): Value | undefined;
-    get(contextKey: Context, key: Key, provider: () => Value): Value;
-    delete(contextKey: Context, key: Key): boolean;
-    clear(): void;
-    clear(contextKey: Context): void;
-    protected cacheForContext(contextKey: Context): Map<Key, Value>;
-}
-/**
- * Every key/value pair in this cache is scoped to a document.
- * If this document is changed or deleted, all associated key/value pairs are deleted.
- */
-declare class DocumentCache<K, V> extends ContextCache<URI | string, K, V, string> {
-    /**
-     * Creates a new document cache.
-     *
-     * @param sharedServices Service container instance to hook into document lifecycle events.
-     * @param state Optional document state on which the cache should evict.
-     * If not provided, the cache will evict on `DocumentBuilder#onUpdate`.
-     * *Deleted* documents are considered in both cases.
-     *
-     * Providing a state here will use `DocumentBuilder#onDocumentPhase` instead,
-     * which triggers on all documents that have been affected by this change, assuming that the
-     * state is `DocumentState.Linked` or a later state.
-     */
-    constructor(sharedServices: LangiumSharedCoreServices, state?: DocumentState);
-}
 /**
  * Every key/value pair in this cache is scoped to the whole workspace.
  * If any document in the workspace is added, changed or deleted, the whole cache is evicted.
@@ -14050,7 +14020,7 @@ declare class LikeC4DocumentHighlightProvider extends DefaultDocumentHighlightPr
 declare class LikeC4DocumentLinkProvider implements DocumentLinkProvider {
     private services;
     constructor(services: LikeC4Services);
-    getDocumentLinks(doc: LangiumDocument, _params: DocumentLinkParams): MaybePromise<DocumentLink[]>;
+    getDocumentLinks(doc: LangiumDocument, _params: DocumentLinkParams, cancelToken?: CancellationToken): Promise<DocumentLink[]>;
     resolveLink(doc: LangiumDocument, link: string): string;
     relativeLink(doc: LangiumDocument, link: string): string | null;
 }
@@ -14090,7 +14060,7 @@ type ExtendElementProperty = LinkProperty | MetadataProperty;
 declare const ExtendElementProperty = "ExtendElementProperty";
 type FqnExpr = FqnRefExpr | WildcardExpression;
 declare const FqnExpr = "FqnExpr";
-type FqnReferenceable = Element | ExtendElement | Referenceable;
+type FqnReferenceable = Element | ExtendDeployment | ExtendElement | Referenceable;
 declare const FqnReferenceable = "FqnReferenceable";
 type IconId = string;
 type Id = 'deployment' | 'element' | 'group' | 'instance' | 'model' | 'node' | ArrowType | ElementShape | LineOptions | Participant | SizeValue | ThemeColor | string;
@@ -14191,7 +14161,7 @@ interface CustomRelationProperties extends AstNode {
 }
 declare const CustomRelationProperties = "CustomRelationProperties";
 interface DeployedInstance extends AstNode {
-    readonly $container: DeploymentNodeBody;
+    readonly $container: DeploymentNodeBody | ExtendDeploymentBody;
     readonly $type: 'DeployedInstance';
     body?: DeployedInstanceBody;
     element: ElementRef;
@@ -14207,7 +14177,7 @@ interface DeployedInstanceBody extends AstNode {
 }
 declare const DeployedInstanceBody = "DeployedInstanceBody";
 interface DeploymentNode extends AstNode {
-    readonly $container: DeploymentNodeBody | ModelDeployments;
+    readonly $container: DeploymentNodeBody | ExtendDeploymentBody | ModelDeployments;
     readonly $type: 'DeploymentNode';
     body?: DeploymentNodeBody;
     kind: Reference<DeploymentNodeKind>;
@@ -14230,7 +14200,7 @@ interface DeploymentNodeKind extends AstNode {
 }
 declare const DeploymentNodeKind = "DeploymentNodeKind";
 interface DeploymentRelation extends AstNode {
-    readonly $container: DeploymentNodeBody | ModelDeployments;
+    readonly $container: DeploymentNodeBody | ExtendDeploymentBody | ModelDeployments;
     readonly $type: 'DeploymentRelation';
     body?: DeploymentRelationBody;
     kind?: Reference<RelationshipKind>;
@@ -14484,6 +14454,21 @@ interface ExpandElementExpression extends AstNode {
     expand: ElementRef;
 }
 declare const ExpandElementExpression = "ExpandElementExpression";
+interface ExtendDeployment extends AstNode {
+    readonly $container: ModelDeployments;
+    readonly $type: 'ExtendDeployment';
+    body: ExtendDeploymentBody;
+    deploymentNode: StrictFqnRef;
+}
+declare const ExtendDeployment = "ExtendDeployment";
+interface ExtendDeploymentBody extends AstNode {
+    readonly $container: ExtendDeployment;
+    readonly $type: 'ExtendDeploymentBody';
+    elements: Array<DeployedInstance | DeploymentNode | DeploymentRelation>;
+    props: Array<ExtendElementProperty>;
+    tags?: Tags;
+}
+declare const ExtendDeploymentBody = "ExtendDeploymentBody";
 interface ExtendElement extends AstNode {
     readonly $container: Model;
     readonly $type: 'ExtendElement';
@@ -14631,7 +14616,7 @@ interface LineProperty extends AstNode {
 }
 declare const LineProperty = "LineProperty";
 interface LinkProperty extends AstNode {
-    readonly $container: DeployedInstanceBody | DeploymentNodeBody | DeploymentRelationBody | DeploymentViewBody | DynamicViewBody | ElementBody | ElementViewBody | ExtendElementBody | RelationBody;
+    readonly $container: DeployedInstanceBody | DeploymentNodeBody | DeploymentRelationBody | DeploymentViewBody | DynamicViewBody | ElementBody | ElementViewBody | ExtendDeploymentBody | ExtendElementBody | RelationBody;
     readonly $type: 'LinkProperty';
     key: 'link';
     title?: string;
@@ -14646,7 +14631,7 @@ interface MetadataAttribute extends AstNode {
 }
 declare const MetadataAttribute = "MetadataAttribute";
 interface MetadataBody extends AstNode {
-    readonly $container: DeployedInstanceBody | DeploymentNodeBody | DeploymentRelationBody | ElementBody | ExtendElementBody | RelationBody;
+    readonly $container: DeployedInstanceBody | DeploymentNodeBody | DeploymentRelationBody | ElementBody | ExtendDeploymentBody | ExtendElementBody | RelationBody;
     readonly $type: 'MetadataBody';
     props: Array<MetadataAttribute>;
 }
@@ -14661,7 +14646,7 @@ declare const Model = "Model";
 interface ModelDeployments extends AstNode {
     readonly $container: LikeC4Grammar;
     readonly $type: 'ModelDeployments';
-    elements: Array<DeploymentNode | DeploymentRelation>;
+    elements: Array<DeploymentNode | DeploymentRelation | ExtendDeployment>;
     name: 'deployment';
 }
 declare const ModelDeployments = "ModelDeployments";
@@ -14885,6 +14870,13 @@ interface StrictFqnElementRef extends AstNode {
     parent?: StrictFqnElementRef;
 }
 declare const StrictFqnElementRef = "StrictFqnElementRef";
+interface StrictFqnRef extends AstNode {
+    readonly $container: ExtendDeployment | StrictFqnRef;
+    readonly $type: 'StrictFqnRef';
+    parent?: StrictFqnRef;
+    value: Reference<Referenceable>;
+}
+declare const StrictFqnRef = "StrictFqnRef";
 interface Tag extends AstNode {
     readonly $container: SpecificationTag;
     readonly $type: 'Tag';
@@ -14892,7 +14884,7 @@ interface Tag extends AstNode {
 }
 declare const Tag = "Tag";
 interface Tags extends AstNode {
-    readonly $container: DeployedInstanceBody | DeploymentNodeBody | DeploymentRelation | DeploymentRelationBody | DeploymentViewBody | DynamicViewBody | ElementBody | ElementViewBody | ExtendElementBody | Relation | RelationBody | Tags;
+    readonly $container: DeployedInstanceBody | DeploymentNodeBody | DeploymentRelation | DeploymentRelationBody | DeploymentViewBody | DynamicViewBody | ElementBody | ElementViewBody | ExtendDeploymentBody | ExtendElementBody | Relation | RelationBody | Tags;
     readonly $type: 'Tags';
     prev?: Tags;
     values: Array<Reference<Tag>>;
@@ -15086,6 +15078,8 @@ type LikeC4AstType = {
     ExcludePredicate: ExcludePredicate;
     ExpandElementExpression: ExpandElementExpression;
     ExpressionV2: ExpressionV2;
+    ExtendDeployment: ExtendDeployment;
+    ExtendDeploymentBody: ExtendDeploymentBody;
     ExtendElement: ExtendElement;
     ExtendElementBody: ExtendElementBody;
     ExtendElementProperty: ExtendElementProperty;
@@ -15157,6 +15151,7 @@ type LikeC4AstType = {
     SpecificationRule: SpecificationRule;
     SpecificationTag: SpecificationTag;
     StrictFqnElementRef: StrictFqnElementRef;
+    StrictFqnRef: StrictFqnRef;
     StringProperty: StringProperty;
     StyleProperty: StyleProperty;
     Tag: Tag;
@@ -15194,7 +15189,7 @@ type LikeC4AstType = {
 
 type Guard<N extends AstNode> = (n: AstNode) => n is N;
 type Guarded<G> = G extends Guard<infer N> ? N : never;
-declare const isValidatableAstNode: (n: AstNode) => n is DeployedInstance | DeploymentNode | DeploymentViewRulePredicate | DeploymentViewRuleStyle | ViewRuleAutoLayout | DynamicViewGlobalPredicateRef | DynamicViewIncludePredicate | ViewRuleGlobalStyle | ViewRuleStyle | ElementDescedantsExpression | ElementKindExpression | ElementRef | ElementTagExpression | ExpandElementExpression | WildcardExpression | ElementPredicateWhere | ElementPredicateWith | ElementPredicateWhereV2 | FqnRefExpr | ElementStringProperty | ElementStyleProperty | IconProperty | LinkProperty | MetadataBody | DirectedRelationExpr | InOutRelationExpr | IncomingRelationExpr | OutgoingRelationExpr | RelationPredicateWhereV2 | Element | ExtendElement | DeploymentView | DynamicView | ElementView | DirectedRelationExpression | InOutRelationExpression | IncomingRelationExpression | OutgoingRelationExpression | RelationPredicateWhere | RelationPredicateWith | RelationStringProperty | ArrowProperty | ColorProperty | LineProperty | PaddingSizeProperty | ShapeSizeProperty | TextSizeProperty | MetadataAttribute | NotationProperty | NotesProperty | SpecificationElementStringProperty | SpecificationRelationshipStringProperty | ViewStringProperty | BorderProperty | MultipleProperty | OpacityProperty | ShapeProperty | ViewRuleGlobalPredicateRef | ViewRuleGroup | ExcludePredicate | IncludePredicate | SpecificationRelationshipKind | GlobalStyle | SpecificationColor | NavigateToProperty | DynamicViewStep | Tags | DeploymentRelation | SpecificationDeploymentNodeKind | DynamicViewParallelSteps | GlobalDynamicPredicateGroup | DynamicViewPredicateIterator | Relation | SpecificationElementKind | GlobalPredicateGroup | Globals | GlobalStyleGroup | SpecificationRule | SpecificationTag;
+declare const isValidatableAstNode: (n: AstNode) => n is DeployedInstance | DeploymentNode | DeploymentViewRulePredicate | DeploymentViewRuleStyle | ViewRuleAutoLayout | DynamicViewGlobalPredicateRef | DynamicViewIncludePredicate | ViewRuleGlobalStyle | ViewRuleStyle | ElementDescedantsExpression | ElementKindExpression | ElementRef | ElementTagExpression | ExpandElementExpression | WildcardExpression | ElementPredicateWhere | ElementPredicateWith | ElementPredicateWhereV2 | FqnRefExpr | ElementStringProperty | ElementStyleProperty | IconProperty | LinkProperty | MetadataBody | DirectedRelationExpr | InOutRelationExpr | IncomingRelationExpr | OutgoingRelationExpr | RelationPredicateWhereV2 | Element | ExtendDeployment | ExtendElement | DeploymentView | DynamicView | ElementView | DirectedRelationExpression | InOutRelationExpression | IncomingRelationExpression | OutgoingRelationExpression | RelationPredicateWhere | RelationPredicateWith | RelationStringProperty | ArrowProperty | ColorProperty | LineProperty | PaddingSizeProperty | ShapeSizeProperty | TextSizeProperty | MetadataAttribute | NotationProperty | NotesProperty | SpecificationElementStringProperty | SpecificationRelationshipStringProperty | ViewStringProperty | BorderProperty | MultipleProperty | OpacityProperty | ShapeProperty | ViewRuleGlobalPredicateRef | ViewRuleGroup | ExcludePredicate | IncludePredicate | SpecificationRelationshipKind | GlobalStyle | SpecificationColor | NavigateToProperty | DynamicViewStep | Tags | DeploymentRelation | SpecificationDeploymentNodeKind | DynamicViewParallelSteps | GlobalDynamicPredicateGroup | DynamicViewPredicateIterator | Relation | SpecificationElementKind | GlobalPredicateGroup | Globals | GlobalStyleGroup | SpecificationRule | SpecificationTag;
 type ValidatableAstNode = Guarded<typeof isValidatableAstNode>;
 declare function checksFromDiagnostics(doc: LikeC4LangiumDocument): {
     isValid: (n: ValidatableAstNode) => boolean;
@@ -15263,17 +15258,17 @@ interface ParsedAstElement {
     description?: string;
     technology?: string;
     tags?: c4.NonEmptyArray<c4.Tag>;
-    links?: c4.NonEmptyArray<ParsedLink>;
+    links?: c4.NonEmptyArray<c4.Link>;
     style: ParsedElementStyle;
     metadata?: {
         [key: string]: string;
     };
 }
-interface ParsedAstExtendElement {
+interface ParsedAstExtend {
     id: c4.Fqn;
     astPath: string;
     tags?: c4.NonEmptyArray<c4.Tag>;
-    links?: c4.NonEmptyArray<ParsedLink>;
+    links?: c4.NonEmptyArray<c4.Link>;
     metadata?: {
         [key: string]: string;
     };
@@ -15292,7 +15287,7 @@ interface ParsedAstRelation {
     line?: c4.RelationshipLineType;
     head?: c4.RelationshipArrowType;
     tail?: c4.RelationshipArrowType;
-    links?: c4.NonEmptyArray<ParsedLink>;
+    links?: c4.NonEmptyArray<c4.Link>;
     navigateTo?: c4.ViewId;
     metadata?: {
         [key: string]: string;
@@ -15316,7 +15311,7 @@ interface ParsedAstElementView {
     title: string | null;
     description: string | null;
     tags: c4.NonEmptyArray<c4.Tag> | null;
-    links: c4.NonEmptyArray<ParsedLink> | null;
+    links: c4.NonEmptyArray<c4.Link> | null;
     rules: c4.ViewRule[];
     manualLayout?: c4.ViewManualLayout;
 }
@@ -15327,7 +15322,7 @@ interface ParsedAstDynamicView {
     title: string | null;
     description: string | null;
     tags: c4.NonEmptyArray<c4.Tag> | null;
-    links: c4.NonEmptyArray<ParsedLink> | null;
+    links: c4.NonEmptyArray<c4.Link> | null;
     steps: c4.DynamicViewStepOrParallel[];
     rules: Array<c4.DynamicViewRule>;
     manualLayout?: c4.ViewManualLayout;
@@ -15339,19 +15334,12 @@ interface ParsedAstDeploymentView {
     title: string | null;
     description: string | null;
     tags: c4.NonEmptyArray<c4.Tag> | null;
-    links: c4.NonEmptyArray<ParsedLink> | null;
+    links: c4.NonEmptyArray<c4.Link> | null;
     rules: Array<c4.DeploymentViewRule>;
 }
 type ParsedAstView = ParsedAstElementView | ParsedAstDynamicView | ParsedAstDeploymentView;
-interface ParsedLink {
-    title?: string;
-    url: string;
-}
-interface DocFqnIndexAstNodeDescription extends AstNodeDescription {
-    fqn: c4.Fqn;
-}
-interface DeploymentAstNodeDescription extends AstNodeDescription {
-    fqn: string;
+interface AstNodeDescriptionWithFqn extends AstNodeDescription {
+    id: c4.Fqn;
 }
 type LikeC4AstNode = ValueOf<ConditionalPick<LikeC4AstType, AstNode>>;
 type LikeC4DocumentDiagnostic = Diagnostic & DiagnosticInfo<LikeC4AstNode>;
@@ -15359,13 +15347,13 @@ interface LikeC4DocumentProps {
     diagnostics?: Array<LikeC4DocumentDiagnostic>;
     c4Specification?: ParsedAstSpecification;
     c4Elements?: ParsedAstElement[];
-    c4ExtendElements?: ParsedAstExtendElement[];
+    c4ExtendElements?: ParsedAstExtend[];
+    c4ExtendDeployments?: ParsedAstExtend[];
     c4Relations?: ParsedAstRelation[];
     c4Globals?: ParsedAstGlobals;
     c4Views?: ParsedAstView[];
     c4Deployments?: ParsedAstDeployment[];
     c4DeploymentRelations?: ParsedAstDeploymentRelation[];
-    c4fqnIndex?: MultiMap<c4.Fqn, DocFqnIndexAstNodeDescription>;
 }
 type LikeC4GrammarDocument = Omit<LangiumDocument<LikeC4Grammar>, 'diagnostics'>;
 interface LikeC4LangiumDocument extends LikeC4GrammarDocument, LikeC4DocumentProps {
@@ -15382,7 +15370,7 @@ declare class LikeC4NameProvider extends DefaultNameProvider {
 }
 
 type ElementsContainer = Model | ElementBody | ExtendElementBody;
-type DeploymentsContainer = ModelDeployments | DeploymentNodeBody;
+type DeploymentsContainer = ModelDeployments | DeploymentNodeBody | ExtendDeploymentBody;
 declare class LikeC4ScopeComputation extends DefaultScopeComputation {
     constructor(services: LikeC4Services);
     computeExports(document: LikeC4LangiumDocument, _cancelToken?: CancellationToken): Promise<AstNodeDescription[]>;
@@ -15401,116 +15389,121 @@ declare class LikeC4ScopeProvider extends DefaultScopeProvider {
     private deploymentsIndex;
     private fqnIndex;
     constructor(services: LikeC4Services);
-    private directChildrenOf;
     private uniqueDescedants;
-    private scopeElementRef;
-    private scopeExtendElement;
-    private scopeElementView;
     getScope(context: ReferenceInfo): Scope;
+    private getScopeElementRef;
+    private getScopeExtendElement;
+    private getScopeElementView;
+    private getScopeForStrictFqnRef;
+    private getScopeExtendDeployment;
     protected getScopeForFqnRef(container: FqnRef, context: ReferenceInfo): any;
+    /**
+     * Computes the scope for a given reference context.
+     *
+     * @param context - The reference information containing the context for which the scope is being computed.
+     * @param referenceType - The type of reference being resolved. Defaults to the reference type derived from the context.
+     * @returns A scope containing the relevant AST node descriptions for the given reference context.
+     *
+     * This method first checks if there are precomputed scopes available in the document. If not, it falls back to the global scope.
+     * It then iterates through the container hierarchy, collecting relevant scopes based on the reference type and container type.
+     * Finally, it combines the collected scopes with the global scope to produce the final scope.
+     */
     protected computeScope(context: ReferenceInfo, referenceType?: any): any;
 }
 
-declare class DeploymentsIndex {
-    private services;
-    protected Names: LikeC4NameProvider;
+declare abstract class ADisposable implements Disposable {
+    protected toDispose: Disposable[];
+    protected isDisposed: boolean;
+    onDispose(...disposable: Disposable[]): void;
+    dispose(): void;
+    protected throwIfDisposed(): void;
+}
+
+declare class FqnIndex extends ADisposable {
+    protected services: LikeC4Services;
     protected langiumDocuments: LangiumDocuments;
-    protected documentCache: DocumentCache<string, DocumentDeploymentsIndex>;
+    protected documentCache: DefaultWeakMap<LikeC4LangiumDocument, DocumentFqnIndex>;
+    protected cachePrefix: string;
     constructor(services: LikeC4Services);
     private documents;
-    get(document: LikeC4LangiumDocument): DocumentDeploymentsIndex;
+    get(document: LikeC4LangiumDocument): DocumentFqnIndex;
+    getFqn(el: Element | DeploymentElement): Fqn$1;
+    byFqn(fqn: Fqn$1): Stream<AstNodeDescriptionWithFqn>;
+    directChildrenOf(parent: Fqn$1): Stream<AstNodeDescriptionWithFqn>;
     /**
-     * Nested elements (nodes/artifacts) of the node
-     * @param nodeName Name of the deployment node
-     * @returns Stream of artifacts
+     * Returns descedant elements with unique names in the scope
      */
-    nested(node: DeploymentNode): Stream<DeploymentAstNodeDescription>;
-    byFqn(fqnName: string): Stream<DeploymentAstNodeDescription>;
-    getFqn(node: DeploymentElement): Fqn;
-    createDocumentIndex(document: LikeC4LangiumDocument): DocumentDeploymentsIndex;
+    uniqueDescedants(parent: Fqn$1): Stream<AstNodeDescriptionWithFqn>;
+    protected createDocumentIndex(document: LikeC4LangiumDocument): DocumentFqnIndex;
 }
-/**
- * Index of deployment elements in the document
- */
-declare class DocumentDeploymentsIndex {
-    private _rootNodes;
+declare class DocumentFqnIndex {
+    private _rootElements;
     /**
-     * Nested of a deployment node
+     * direct children of elements
      */
-    private _nested;
+    private _children;
     /**
-     * All elements by FQN
+     * All descendants of an element (unique by name)
      */
-    private _byfqn;
-    static readonly EMPTY: DocumentDeploymentsIndex;
-    constructor(_rootNodes: Array<DeploymentAstNodeDescription>, 
+    private _descendants;
     /**
-     * Nested of a deployment node
+     * All elements by FQN
      */
-    _nested: MultiMap<string, DeploymentAstNodeDescription>, 
+    private _byfqn;
+    static readonly EMPTY: DocumentFqnIndex;
+    constructor(_rootElements: Array<AstNodeDescriptionWithFqn>, 
     /**
-     * All elements by FQN
+     * direct children of elements
      */
-    _byfqn: MultiMap<string, DeploymentAstNodeDescription>);
-    rootNodes(): readonly DeploymentAstNodeDescription[];
-    byFqn(fqnName: string): readonly DeploymentAstNodeDescription[];
+    _children: MultiMap<Fqn$1, AstNodeDescriptionWithFqn>, 
     /**
-     * Returns artifacts of a deployment node
-     * @param nodeName Name of the deployment node
-     * @returns Stream of artifacts
+     * All descendants of an element (unique by name)
      */
-    nested(nodeName: string): readonly DeploymentAstNodeDescription[];
+    _descendants: MultiMap<Fqn$1, AstNodeDescriptionWithFqn>, 
     /**
-     * Returns all deployment elements in the document,
-     * with unique combination "type and name"
+     * All elements by FQN
      */
-    unique(): readonly DeploymentAstNodeDescription[];
-}
-
-declare abstract class ADisposable implements Disposable {
-    protected toDispose: Disposable[];
-    protected isDisposed: boolean;
-    onDispose(...disposable: Disposable[]): void;
-    dispose(): void;
-    protected throwIfDisposed(): void;
+    _byfqn: MultiMap<Fqn$1, AstNodeDescriptionWithFqn>);
+    rootElements(): readonly AstNodeDescriptionWithFqn[];
+    byFqn(fqn: Fqn$1): readonly AstNodeDescriptionWithFqn[];
+    children(parent: Fqn$1): readonly AstNodeDescriptionWithFqn[];
+    descendants(nodeName: Fqn$1): readonly AstNodeDescriptionWithFqn[];
 }
 
-declare class FqnIndex extends ADisposable {
-    private services;
-    protected langiumDocuments: LangiumDocuments;
+declare class DeploymentsIndex extends FqnIndex {
+    protected services: LikeC4Services;
+    protected Names: LikeC4NameProvider;
+    protected cachePrefix: string;
     constructor(services: LikeC4Services);
-    get documents(): any;
-    private entries;
-    getFqn(el: Element): Fqn | null;
-    byFqn(fqn: Fqn): Stream<AstNodeDescription>;
-    directChildrenOf(parent: Fqn): Stream<AstNodeDescription>;
-    /**
-     * Returns descedant elements with unique names in the scope
-     */
-    uniqueDescedants(parent: Fqn): Stream<AstNodeDescription>;
+    protected createDocumentIndex(document: LikeC4LangiumDocument): DocumentFqnIndex;
 }
 
 type ModelParsedListener = (docs: URI[]) => void;
+type ParseModelResult = {
+    model: c4.ParsedLikeC4Model;
+    computeView: (view: c4.LikeC4View) => c4.ComputeViewResult;
+};
 declare class LikeC4ModelBuilder extends ADisposable {
-    private services;
-    private langiumDocuments;
+    private parser;
     private listeners;
+    private cache;
+    private DocumentBuilder;
     constructor(services: LikeC4Services);
     /**
      * WARNING:
      * This method is internal and should to be called only when all documents are known to be parsed.
      * Otherwise, the model may be incomplete.
      */
-    unsafeSyncBuildModel(): c4.ParsedLikeC4Model | null;
-    buildModel(cancelToken?: CancellationToken): Promise<c4.ParsedLikeC4Model | null>;
+    private unsafeSyncParseModel;
+    parseModel(cancelToken?: CancellationToken): Promise<ParseModelResult | null>;
     private previousViews;
     /**
      * WARNING:
      * This method is internal and should to be called only when all documents are known to be parsed.
      * Otherwise, the model may be incomplete.
      */
-    unsafeSyncBuildComputedModel(model: c4.ParsedLikeC4Model): c4.ComputedLikeC4Model;
-    buildComputedModel(cancelToken?: CancellationToken): Promise<c4.ComputedLikeC4Model | null>;
+    unsafeSyncBuildModel(): LikeC4Model.Computed;
+    buildLikeC4Model(cancelToken?: CancellationToken): Promise<LikeC4Model.Computed>;
     computeView(viewId: ViewId, cancelToken?: CancellationToken): Promise<c4.ComputedView | null>;
     onModelParsed(callback: ModelParsedListener): Disposable;
     private documents;
@@ -15522,6 +15515,7 @@ declare class LikeC4ModelLocator {
     private fqnIndex;
     private deploymentsIndex;
     private langiumDocuments;
+    private parser;
     constructor(services: LikeC4Services);
     private documents;
     getParsedElement(astNodeOrFqn: Element | c4.Fqn): ParsedAstElement | null;
@@ -15552,8 +15546,8 @@ declare class BaseParser {
     parseTags<E extends {
         tags?: Tags;
     }>(withTags?: E): c4.NonEmptyArray<c4.Tag> | null;
-    convertLinks(source?: LinkProperty['$container']): ParsedLink[] | undefined;
-    parseLinks(source?: LinkProperty['$container']): ParsedLink[] | undefined;
+    convertLinks(source?: LinkProperty['$container']): c4.Link[] | undefined;
+    parseLinks(source?: LinkProperty['$container']): c4.Link[] | undefined;
 }
 
 declare const DocumentParserFromMixins: {
@@ -15602,8 +15596,8 @@ declare const DocumentParserFromMixins: {
         parseTags<E extends {
             tags?: Tags;
         }>(withTags?: E): invariant<invariant> | null;
-        convertLinks(source?: LinkProperty["$container"]): ParsedLink[] | undefined;
-        parseLinks(source?: LinkProperty["$container"]): ParsedLink[] | undefined;
+        convertLinks(source?: LinkProperty["$container"]): invariant[] | undefined;
+        parseLinks(source?: LinkProperty["$container"]): invariant[] | undefined;
         parseDeploymentView(astNode: DeploymentView): ParsedAstDeploymentView;
         parseDeploymentViewRule(astRule: DeploymentViewRule): invariant;
         parseDeploymentViewRulePredicate(astRule: DeploymentViewRulePredicate): invariant;
@@ -15618,6 +15612,7 @@ declare const DocumentParserFromMixins: {
         parseDeployment(): void;
         parseDeploymentNode(astNode: DeploymentNode): ParsedAstDeployment.Node;
         parseDeployedInstance(astNode: DeployedInstance): ParsedAstDeployment.Instance;
+        parseExtendDeployment(astNode: ExtendDeployment): ParsedAstExtend | null;
         parseDeploymentRelation(astNode: DeploymentRelation): ParsedAstDeploymentRelation;
     };
 } & {
@@ -15661,8 +15656,8 @@ declare const DocumentParserFromMixins: {
         parseTags<E extends {
             tags?: Tags;
         }>(withTags?: E): invariant<invariant> | null;
-        convertLinks(source?: LinkProperty["$container"]): ParsedLink[] | undefined;
-        parseLinks(source?: LinkProperty["$container"]): ParsedLink[] | undefined;
+        convertLinks(source?: LinkProperty["$container"]): invariant[] | undefined;
+        parseLinks(source?: LinkProperty["$container"]): invariant[] | undefined;
         parseDeploymentView(astNode: DeploymentView): ParsedAstDeploymentView;
         parseDeploymentViewRule(astRule: DeploymentViewRule): invariant;
         parseDeploymentViewRulePredicate(astRule: DeploymentViewRulePredicate): invariant;
@@ -15677,6 +15672,7 @@ declare const DocumentParserFromMixins: {
         parseDeployment(): void;
         parseDeploymentNode(astNode: DeploymentNode): ParsedAstDeployment.Node;
         parseDeployedInstance(astNode: DeployedInstance): ParsedAstDeployment.Instance;
+        parseExtendDeployment(astNode: ExtendDeployment): ParsedAstExtend | null;
         parseDeploymentRelation(astNode: DeploymentRelation): ParsedAstDeploymentRelation;
     };
 } & {
@@ -15697,8 +15693,8 @@ declare const DocumentParserFromMixins: {
         parseTags<E extends {
             tags?: Tags;
         }>(withTags?: E): invariant<invariant> | null;
-        convertLinks(source?: LinkProperty["$container"]): ParsedLink[] | undefined;
-        parseLinks(source?: LinkProperty["$container"]): ParsedLink[] | undefined;
+        convertLinks(source?: LinkProperty["$container"]): invariant[] | undefined;
+        parseLinks(source?: LinkProperty["$container"]): invariant[] | undefined;
     };
 } & {
     new (...args: any[]): {
@@ -15726,8 +15722,8 @@ declare const DocumentParserFromMixins: {
         parseTags<E extends {
             tags?: Tags;
         }>(withTags?: E): invariant<invariant> | null;
-        convertLinks(source?: LinkProperty["$container"]): ParsedLink[] | undefined;
-        parseLinks(source?: LinkProperty["$container"]): ParsedLink[] | undefined;
+        convertLinks(source?: LinkProperty["$container"]): invariant[] | undefined;
+        parseLinks(source?: LinkProperty["$container"]): invariant[] | undefined;
     };
 } & {
     new (...args: any[]): {
@@ -15756,11 +15752,12 @@ declare const DocumentParserFromMixins: {
         parseTags<E extends {
             tags?: Tags;
         }>(withTags?: E): invariant<invariant> | null;
-        convertLinks(source?: LinkProperty["$container"]): ParsedLink[] | undefined;
-        parseLinks(source?: LinkProperty["$container"]): ParsedLink[] | undefined;
+        convertLinks(source?: LinkProperty["$container"]): invariant[] | undefined;
+        parseLinks(source?: LinkProperty["$container"]): invariant[] | undefined;
         parseDeployment(): void;
         parseDeploymentNode(astNode: DeploymentNode): ParsedAstDeployment.Node;
         parseDeployedInstance(astNode: DeployedInstance): ParsedAstDeployment.Instance;
+        parseExtendDeployment(astNode: ExtendDeployment): ParsedAstExtend | null;
         parseDeploymentRelation(astNode: DeploymentRelation): ParsedAstDeploymentRelation;
     };
 } & {
@@ -15768,6 +15765,7 @@ declare const DocumentParserFromMixins: {
         parseDeployment(): void;
         parseDeploymentNode(astNode: DeploymentNode): ParsedAstDeployment.Node;
         parseDeployedInstance(astNode: DeployedInstance): ParsedAstDeployment.Instance;
+        parseExtendDeployment(astNode: ExtendDeployment): ParsedAstExtend | null;
         parseDeploymentRelation(astNode: DeploymentRelation): ParsedAstDeploymentRelation;
         parseFqnRef(astNode: FqnRef): invariant;
         parseFqnExpr(astNode: FqnExpr): invariant;
@@ -15790,14 +15788,14 @@ declare const DocumentParserFromMixins: {
         parseTags<E extends {
             tags?: Tags;
         }>(withTags?: E): invariant<invariant> | null;
-        convertLinks(source?: LinkProperty["$container"]): ParsedLink[] | undefined;
-        parseLinks(source?: LinkProperty["$container"]): ParsedLink[] | undefined;
+        convertLinks(source?: LinkProperty["$container"]): invariant[] | undefined;
+        parseLinks(source?: LinkProperty["$container"]): invariant[] | undefined;
     };
 } & {
     new (...args: any[]): {
         parseModel(): void;
         parseElement(astNode: Element): ParsedAstElement;
-        parseExtendElement(astNode: ExtendElement): ParsedAstExtendElement | null;
+        parseExtendElement(astNode: ExtendElement): ParsedAstExtend | null;
         parseRelation(astNode: Relation): ParsedAstRelation;
         isValid: IsValidFn;
         readonly services: LikeC4Services;
@@ -15813,8 +15811,8 @@ declare const DocumentParserFromMixins: {
         parseTags<E extends {
             tags?: Tags;
         }>(withTags?: E): invariant<invariant> | null;
-        convertLinks(source?: LinkProperty["$container"]): ParsedLink[] | undefined;
-        parseLinks(source?: LinkProperty["$container"]): ParsedLink[] | undefined;
+        convertLinks(source?: LinkProperty["$container"]): invariant[] | undefined;
+        parseLinks(source?: LinkProperty["$container"]): invariant[] | undefined;
     };
 } & {
     new (...args: any[]): {
@@ -15839,8 +15837,8 @@ declare const DocumentParserFromMixins: {
         parseTags<E extends {
             tags?: Tags;
         }>(withTags?: E): invariant<invariant> | null;
-        convertLinks(source?: LinkProperty["$container"]): ParsedLink[] | undefined;
-        parseLinks(source?: LinkProperty["$container"]): ParsedLink[] | undefined;
+        convertLinks(source?: LinkProperty["$container"]): invariant[] | undefined;
+        parseLinks(source?: LinkProperty["$container"]): invariant[] | undefined;
     };
 } & typeof BaseParser;
 declare class DocumentParser extends DocumentParserFromMixins {
@@ -15849,8 +15847,10 @@ declare class LikeC4ModelParser {
     private services;
     private cachedParsers;
     constructor(services: LikeC4Services);
+    documents(): Stream<ParsedLikeC4LangiumDocument>;
     parse(doc: LangiumDocument): ParsedLikeC4LangiumDocument;
     forDocument(doc: LangiumDocument): DocumentParser;
+    private createParser;
 }
 
 declare class LikeC4DocumentSymbolProvider implements DocumentSymbolProvider {
@@ -15873,7 +15873,7 @@ declare class LikeC4DocumentSymbolProvider implements DocumentSymbolProvider {
     protected getTagSymbol(astTag: SpecificationTag): DocumentSymbol | null;
     protected getLibIconSymbol(astTag: LibIcon): DocumentSymbol | null;
     protected getViewSymbol(astView: LikeC4View): DocumentSymbol[];
-    protected getDeploymentElementSymbol(el: DeploymentElement | DeploymentRelation): DocumentSymbol[];
+    protected getDeploymentElementSymbol(el: DeploymentElement | DeploymentRelation | ExtendDeployment): DocumentSymbol[];
     protected getDeploymentNodeSymbol(astElement: DeploymentNode): DocumentSymbol[];
     protected getDeployedInstanceSymbol(astElement: DeployedInstance): DocumentSymbol[];
     protected symbolKind(node: AstNode): SymbolKind;
@@ -15958,6 +15958,7 @@ declare class LikeC4Views {
     private services;
     private cache;
     private viewsWithReportedErrors;
+    private ModelBuilder;
     constructor(services: LikeC4Services);
     get layouter(): GraphvizLayouter;
     computedViews(cancelToken?: CancellationToken): Promise<ComputedView[]>;
@@ -15985,8 +15986,7 @@ interface LikeC4AddedServices {
     documentation: {
         DocumentationProvider: LikeC4DocumentationProvider;
     };
-    WorkspaceCache: WorkspaceCache<string, any>;
-    DocumentCache: DocumentCache<string, any>;
+    ValidatedWorkspaceCache: WorkspaceCache<string, any>;
     Rpc: Rpc;
     likec4: {
         Views: LikeC4Views;
@@ -16062,7 +16062,6 @@ declare class LikeC4 {
      * By default in current folder
      */
     static fromWorkspace(path?: string, opts?: LikeC4Options): Promise<LikeC4>;
-    private modelComputedRef;
     private modelLayoutedRef;
     private logger;
     private constructor();
@@ -16074,16 +16073,16 @@ declare class LikeC4 {
      */
     diagrams(): Promise<DiagramView[]>;
     /**
-     * Synchronously builds architecture model
-     * Only compute views predicates {@link ComputedView} - i.e. no layout
+     * Builds LikeC4Model from all documents
+     * Only computes view predicates {@link ComputedView} - i.e. no layout
      * Not ready for rendering, but enough to traverse
      */
-    computedModel(): LikeC4Model.Computed;
+    computedModel(): LikeC4Model$1.Computed;
     /**
-     * Same as {@link computedModel()}, after applies layout
+     * Same as {@link computedModel()}, but also applies layout
      * Ready for rendering
      */
-    layoutedModel(): Promise<LikeC4Model.Layouted>;
+    layoutedModel(): Promise<LikeC4Model$1.Layouted>;
     getErrors(): {
         message: string;
         line: number;