@likec4/core 1.20.1 → 1.20.3

package/dist/utils/index.d.mts

@@ -1,7 +1,133 @@
-export { I as IterableContainer, R as ReorderedArray, a as ancestorsFqn, c as commonAncestor, b as compareByFqnHierarchically, d as compareFqnHierarchically, h as hierarchyDistance, e as hierarchyLevel, i as isAncestor, f as isDescendantOf, g as isSameHierarchy, n as nameFromFqn, p as parentFqn, s as sortByFqnHierarchically, j as sortNaturalByFqn, k as sortParentsFirst } from '../shared/core.sLaWHBjR.mjs';
-import { N as NonEmptyArray, a as IteratorLike } from '../shared/core.D74xkKkG.mjs';
+export { I as IterableContainer, R as ReorderedArray, a as ancestorsFqn, c as commonAncestor, b as compareByFqnHierarchically, d as compareFqnHierarchically, h as hierarchyDistance, e as hierarchyLevel, i as isAncestor, f as isDescendantOf, g as isSameHierarchy, n as nameFromFqn, p as parentFqn, s as sortByFqnHierarchically, j as sortNaturalByFqn, k as sortParentsFirst } from '../shared/core.CajOK_t3.mjs';
+import { N as NonEmptyArray, a as IteratorLike } from '../shared/core.BJfn72tj.mjs';
+export { default as objectHash } from '/home/runner/work/likec4/likec4/node_modules/@types/object-hash/index.d.ts';
 import { IsNumericLiteral } from 'type-fest';
 
+/**
+ * Mnemonist DefaultMap Typings
+ * =============================
+ */
+declare class DefaultMap<K, V> implements Iterable<[K, V]> {
+
+  // Members
+  size: number;
+
+  // Constructor
+  constructor(factory: (key: K, index: number) => V);
+
+  // Methods
+  clear(): void;
+  set(key: K, value: V): this;
+  delete(key: K): boolean;
+  has(key: K): boolean;
+  get(key: K): V;
+  peek(key: K): V | undefined;
+  forEach(callback: (value: V, key: K, map: this) => void, scope?: any): void;
+  keys(): IterableIterator<K>;
+  values(): IterableIterator<V>;
+  entries(): IterableIterator<[K, V]>;
+  [Symbol.iterator](): IterableIterator<[K, V]>;
+  inspect(): any;
+
+  // Statics
+  static autoIncrement(): number;
+}
+
+/**
+ * Mnemonist LinkedList Typings
+ * =============================
+ */
+declare class LinkedList<T> implements Iterable<T> {
+
+  // Members
+  size: number;
+
+  // Constructor
+  constructor();
+
+  // Methods
+  clear(): void;
+  first(): T | undefined;
+  last(): T | undefined;
+  peek(): T | undefined;
+  push(value: T): number;
+  shift(): T | undefined;
+  unshift(value: T): number;
+  forEach(callback: (value: T, index: number, list: this) => void, scope?: any): void;
+  toArray(): Array<T>;
+  values(): IterableIterator<T>;
+  entries(): IterableIterator<[number, T]>;
+  [Symbol.iterator](): IterableIterator<T>;
+  toString(): string;
+  toJSON(): Array<T>;
+  inspect(): any;
+
+  // Statics
+  static from<I>(iterable: Iterable<I> | {[key: string]: I}): LinkedList<I>;
+}
+
+/**
+ * Mnemonist Queue Typings
+ * ========================
+ */
+declare class Queue<T> implements Iterable<T> {
+
+  // Members
+  size: number;
+
+  // Constructor
+  constructor();
+
+  // Methods
+  clear(): void;
+  enqueue(item: T): number;
+  dequeue(): T | undefined;
+  peek(): T | undefined;
+  forEach(callback: (item: T, index: number, queue: this) => void, scope?: any): void;
+  toArray(): Array<T>;
+  values(): IterableIterator<T>;
+  entries(): IterableIterator<[number, T]>;
+  [Symbol.iterator](): IterableIterator<T>;
+  toString(): string;
+  toJSON(): Array<T>;
+  inspect(): any;
+
+  // Statics
+  static from<I>(iterable: Iterable<I> | {[key: string]: I}): Queue<I>;
+  static of<I>(...items: Array<I>): Queue<I>;
+}
+
+/**
+ * Mnemonist Stack Typings
+ * ========================
+ */
+declare class Stack<T> implements Iterable<T> {
+
+  // Members
+  size: number;
+
+  // Constructor
+  constructor();
+
+  // Methods
+  clear(): void;
+  push(item: T): number;
+  pop(): T | undefined;
+  peek(): T | undefined;
+  forEach(callback: (item: T, index: number, stack: this) => void, scope?: any): void;
+  toArray(): Array<T>;
+  values(): IterableIterator<T>;
+  entries(): IterableIterator<[number, T]>;
+  [Symbol.iterator](): IterableIterator<T>;
+  toString(): string;
+  toJSON(): Array<T>;
+  inspect(): any;
+
+  // Statics
+  static from<I>(iterable: Iterable<I> | {[key: string]: I}): Stack<I>;
+  static of<I>(...items: Array<I>): Stack<I>;
+}
+
 /**
  * Common head of two arrays
  *
@@ -211,146 +337,4 @@ declare function symmetricDifference<T>(a: ReadonlySet<T>, b: ReadonlySet<T>): S
  */
 declare function stringHash(str: string): string;
 
-declare namespace objectHash {
-    type NotUndefined = object | string | number | boolean | null | NotUndefined[];
-
-    /**
-     * @see https://github.com/puleos/object-hash#hashsha1value
-     */
-    function sha1(object: NotUndefined): string;
-    /**
-     * @see https://github.com/puleos/object-hash#hashkeysvalue
-     */
-    function keys(object: NotUndefined): string;
-    /**
-     * @see https://github.com/puleos/object-hash#hashmd5value
-     */
-    function MD5(object: NotUndefined): string;
-    /**
-     * @see https://github.com/puleos/object-hash#hashkeysmd5value
-     */
-    function keysMD5(object: NotUndefined): string;
-    /**
-     * @see https://github.com/puleos/object-hash#hashwritetostreamvalue-options-stream
-     */
-    function writeToStream(value: any, stream: Stream): void;
-    function writeToStream(value: any, options: Options, stream: Stream): void;
-
-    type BufferEncoding =
-        | "ascii"
-        | "base64"
-        | "binary"
-        | "hex"
-        | "latin1"
-        | "ucs-2"
-        | "ucs2"
-        | "utf-8"
-        | "utf16le"
-        | "utf8";
-
-    interface Stream {
-        update?(chunk: any, encoding: BufferEncoding, callback: (error?: Error | null) => void): void;
-        write?(chunk: any, encoding: BufferEncoding, callback: (error?: Error | null) => void): void;
-    }
-
-    type HashName =
-        | "md4"
-        | "md4WithRSAEncryption"
-        | "md5"
-        | "md5WithRSAEncryption"
-        | "ripemd"
-        | "ripemd160"
-        | "ripemd160WithRSA"
-        | "rmd160"
-        | "rsa-md4"
-        | "rsa-md5"
-        | "rsa-ripemd160"
-        | "rsa-sha1"
-        | "rsa-sha1-2"
-        | "rsa-sha224"
-        | "rsa-sha256"
-        | "rsa-sha3-224"
-        | "rsa-sha3-256"
-        | "rsa-sha3-384"
-        | "rsa-sha3-512"
-        | "rsa-sha384"
-        | "rsa-sha512"
-        | "sha1"
-        | "sha1WithRSAEncryption"
-        | "sha224"
-        | "sha224WithRSAEncryption"
-        | "sha256"
-        | "sha256WithRSAEncryption"
-        | "sha3-224"
-        | "sha3-256"
-        | "sha3-384"
-        | "sha3-512"
-        | "sha384"
-        | "sha384WithRSAEncryption"
-        | "sha512"
-        | "sha512WithRSAEncryption";
-
-    interface BaseOptions {
-        /**
-         * @default 'sha1'
-         */
-        algorithm?: HashName | "passthrough" | undefined;
-
-        excludeKeys?: ((key: string) => boolean) | undefined;
-        /**
-         * @default false
-         */
-        excludeValues?: boolean | undefined;
-        /**
-         * @default false
-         */
-        ignoreUnknown?: boolean | undefined;
-
-        replacer?: ((value: any) => any) | undefined;
-        /**
-         * @default true
-         */
-        respectFunctionNames?: boolean | undefined;
-        /**
-         * @default true
-         */
-        respectFunctionProperties?: boolean | undefined;
-        /**
-         * @default true
-         */
-        respectType?: boolean | undefined;
-        /**
-         * @default false
-         */
-        unorderedArrays?: boolean | undefined;
-        /**
-         * @default true
-         */
-        unorderedObjects?: boolean | undefined;
-        /**
-         * @default true
-         */
-        unorderedSets?: boolean | undefined;
-    }
-
-    interface NormalOption extends BaseOptions {
-        /**
-         * @default 'hex'
-         */
-        encoding?: "hex" | "binary" | "base64" | undefined;
-    }
-
-    interface WithBufferOption extends BaseOptions {
-        encoding: "buffer";
-    }
-
-    type Options = NormalOption | WithBufferOption;
-}
-
-/**
- * @see https://github.com/puleos/object-hash#hashvalue-options
- */
-declare function objectHash(object: objectHash.NotUndefined, options?: objectHash.NormalOption): string;
-declare function objectHash(object: objectHash.NotUndefined, options?: objectHash.WithBufferOption): Buffer;
-
-export { commonHead, compareNatural, compareRelations, delay, difference, equals as equalsSet, getOrCreate, hasAtLeast, ifilter, ifind, iflat, imap, intersection, ireduce, isIterable, isNonEmptyArray, isString, isome, iunique, objectHash, stringHash, symmetricDifference, toArray, toSet, union };
+export { DefaultMap, LinkedList, Queue, Stack, commonHead, compareNatural, compareRelations, delay, difference, equals as equalsSet, getOrCreate, hasAtLeast, ifilter, ifind, iflat, imap, intersection, ireduce, isIterable, isNonEmptyArray, isString, isome, iunique, stringHash, symmetricDifference, toArray, toSet, union };

package/dist/utils/index.d.ts

@@ -1,7 +1,133 @@
-export { I as IterableContainer, R as ReorderedArray, a as ancestorsFqn, c as commonAncestor, b as compareByFqnHierarchically, d as compareFqnHierarchically, h as hierarchyDistance, e as hierarchyLevel, i as isAncestor, f as isDescendantOf, g as isSameHierarchy, n as nameFromFqn, p as parentFqn, s as sortByFqnHierarchically, j as sortNaturalByFqn, k as sortParentsFirst } from '../shared/core.D6-fWbM3.js';
-import { N as NonEmptyArray, a as IteratorLike } from '../shared/core.D74xkKkG.js';
+export { I as IterableContainer, R as ReorderedArray, a as ancestorsFqn, c as commonAncestor, b as compareByFqnHierarchically, d as compareFqnHierarchically, h as hierarchyDistance, e as hierarchyLevel, i as isAncestor, f as isDescendantOf, g as isSameHierarchy, n as nameFromFqn, p as parentFqn, s as sortByFqnHierarchically, j as sortNaturalByFqn, k as sortParentsFirst } from '../shared/core.BtISRjMA.js';
+import { N as NonEmptyArray, a as IteratorLike } from '../shared/core.BJfn72tj.js';
+export { default as objectHash } from '/home/runner/work/likec4/likec4/node_modules/@types/object-hash/index.d.ts';
 import { IsNumericLiteral } from 'type-fest';
 
+/**
+ * Mnemonist DefaultMap Typings
+ * =============================
+ */
+declare class DefaultMap<K, V> implements Iterable<[K, V]> {
+
+  // Members
+  size: number;
+
+  // Constructor
+  constructor(factory: (key: K, index: number) => V);
+
+  // Methods
+  clear(): void;
+  set(key: K, value: V): this;
+  delete(key: K): boolean;
+  has(key: K): boolean;
+  get(key: K): V;
+  peek(key: K): V | undefined;
+  forEach(callback: (value: V, key: K, map: this) => void, scope?: any): void;
+  keys(): IterableIterator<K>;
+  values(): IterableIterator<V>;
+  entries(): IterableIterator<[K, V]>;
+  [Symbol.iterator](): IterableIterator<[K, V]>;
+  inspect(): any;
+
+  // Statics
+  static autoIncrement(): number;
+}
+
+/**
+ * Mnemonist LinkedList Typings
+ * =============================
+ */
+declare class LinkedList<T> implements Iterable<T> {
+
+  // Members
+  size: number;
+
+  // Constructor
+  constructor();
+
+  // Methods
+  clear(): void;
+  first(): T | undefined;
+  last(): T | undefined;
+  peek(): T | undefined;
+  push(value: T): number;
+  shift(): T | undefined;
+  unshift(value: T): number;
+  forEach(callback: (value: T, index: number, list: this) => void, scope?: any): void;
+  toArray(): Array<T>;
+  values(): IterableIterator<T>;
+  entries(): IterableIterator<[number, T]>;
+  [Symbol.iterator](): IterableIterator<T>;
+  toString(): string;
+  toJSON(): Array<T>;
+  inspect(): any;
+
+  // Statics
+  static from<I>(iterable: Iterable<I> | {[key: string]: I}): LinkedList<I>;
+}
+
+/**
+ * Mnemonist Queue Typings
+ * ========================
+ */
+declare class Queue<T> implements Iterable<T> {
+
+  // Members
+  size: number;
+
+  // Constructor
+  constructor();
+
+  // Methods
+  clear(): void;
+  enqueue(item: T): number;
+  dequeue(): T | undefined;
+  peek(): T | undefined;
+  forEach(callback: (item: T, index: number, queue: this) => void, scope?: any): void;
+  toArray(): Array<T>;
+  values(): IterableIterator<T>;
+  entries(): IterableIterator<[number, T]>;
+  [Symbol.iterator](): IterableIterator<T>;
+  toString(): string;
+  toJSON(): Array<T>;
+  inspect(): any;
+
+  // Statics
+  static from<I>(iterable: Iterable<I> | {[key: string]: I}): Queue<I>;
+  static of<I>(...items: Array<I>): Queue<I>;
+}
+
+/**
+ * Mnemonist Stack Typings
+ * ========================
+ */
+declare class Stack<T> implements Iterable<T> {
+
+  // Members
+  size: number;
+
+  // Constructor
+  constructor();
+
+  // Methods
+  clear(): void;
+  push(item: T): number;
+  pop(): T | undefined;
+  peek(): T | undefined;
+  forEach(callback: (item: T, index: number, stack: this) => void, scope?: any): void;
+  toArray(): Array<T>;
+  values(): IterableIterator<T>;
+  entries(): IterableIterator<[number, T]>;
+  [Symbol.iterator](): IterableIterator<T>;
+  toString(): string;
+  toJSON(): Array<T>;
+  inspect(): any;
+
+  // Statics
+  static from<I>(iterable: Iterable<I> | {[key: string]: I}): Stack<I>;
+  static of<I>(...items: Array<I>): Stack<I>;
+}
+
 /**
  * Common head of two arrays
  *
@@ -211,146 +337,4 @@ declare function symmetricDifference<T>(a: ReadonlySet<T>, b: ReadonlySet<T>): S
  */
 declare function stringHash(str: string): string;
 
-declare namespace objectHash {
-    type NotUndefined = object | string | number | boolean | null | NotUndefined[];
-
-    /**
-     * @see https://github.com/puleos/object-hash#hashsha1value
-     */
-    function sha1(object: NotUndefined): string;
-    /**
-     * @see https://github.com/puleos/object-hash#hashkeysvalue
-     */
-    function keys(object: NotUndefined): string;
-    /**
-     * @see https://github.com/puleos/object-hash#hashmd5value
-     */
-    function MD5(object: NotUndefined): string;
-    /**
-     * @see https://github.com/puleos/object-hash#hashkeysmd5value
-     */
-    function keysMD5(object: NotUndefined): string;
-    /**
-     * @see https://github.com/puleos/object-hash#hashwritetostreamvalue-options-stream
-     */
-    function writeToStream(value: any, stream: Stream): void;
-    function writeToStream(value: any, options: Options, stream: Stream): void;
-
-    type BufferEncoding =
-        | "ascii"
-        | "base64"
-        | "binary"
-        | "hex"
-        | "latin1"
-        | "ucs-2"
-        | "ucs2"
-        | "utf-8"
-        | "utf16le"
-        | "utf8";
-
-    interface Stream {
-        update?(chunk: any, encoding: BufferEncoding, callback: (error?: Error | null) => void): void;
-        write?(chunk: any, encoding: BufferEncoding, callback: (error?: Error | null) => void): void;
-    }
-
-    type HashName =
-        | "md4"
-        | "md4WithRSAEncryption"
-        | "md5"
-        | "md5WithRSAEncryption"
-        | "ripemd"
-        | "ripemd160"
-        | "ripemd160WithRSA"
-        | "rmd160"
-        | "rsa-md4"
-        | "rsa-md5"
-        | "rsa-ripemd160"
-        | "rsa-sha1"
-        | "rsa-sha1-2"
-        | "rsa-sha224"
-        | "rsa-sha256"
-        | "rsa-sha3-224"
-        | "rsa-sha3-256"
-        | "rsa-sha3-384"
-        | "rsa-sha3-512"
-        | "rsa-sha384"
-        | "rsa-sha512"
-        | "sha1"
-        | "sha1WithRSAEncryption"
-        | "sha224"
-        | "sha224WithRSAEncryption"
-        | "sha256"
-        | "sha256WithRSAEncryption"
-        | "sha3-224"
-        | "sha3-256"
-        | "sha3-384"
-        | "sha3-512"
-        | "sha384"
-        | "sha384WithRSAEncryption"
-        | "sha512"
-        | "sha512WithRSAEncryption";
-
-    interface BaseOptions {
-        /**
-         * @default 'sha1'
-         */
-        algorithm?: HashName | "passthrough" | undefined;
-
-        excludeKeys?: ((key: string) => boolean) | undefined;
-        /**
-         * @default false
-         */
-        excludeValues?: boolean | undefined;
-        /**
-         * @default false
-         */
-        ignoreUnknown?: boolean | undefined;
-
-        replacer?: ((value: any) => any) | undefined;
-        /**
-         * @default true
-         */
-        respectFunctionNames?: boolean | undefined;
-        /**
-         * @default true
-         */
-        respectFunctionProperties?: boolean | undefined;
-        /**
-         * @default true
-         */
-        respectType?: boolean | undefined;
-        /**
-         * @default false
-         */
-        unorderedArrays?: boolean | undefined;
-        /**
-         * @default true
-         */
-        unorderedObjects?: boolean | undefined;
-        /**
-         * @default true
-         */
-        unorderedSets?: boolean | undefined;
-    }
-
-    interface NormalOption extends BaseOptions {
-        /**
-         * @default 'hex'
-         */
-        encoding?: "hex" | "binary" | "base64" | undefined;
-    }
-
-    interface WithBufferOption extends BaseOptions {
-        encoding: "buffer";
-    }
-
-    type Options = NormalOption | WithBufferOption;
-}
-
-/**
- * @see https://github.com/puleos/object-hash#hashvalue-options
- */
-declare function objectHash(object: objectHash.NotUndefined, options?: objectHash.NormalOption): string;
-declare function objectHash(object: objectHash.NotUndefined, options?: objectHash.WithBufferOption): Buffer;
-
-export { commonHead, compareNatural, compareRelations, delay, difference, equals as equalsSet, getOrCreate, hasAtLeast, ifilter, ifind, iflat, imap, intersection, ireduce, isIterable, isNonEmptyArray, isString, isome, iunique, objectHash, stringHash, symmetricDifference, toArray, toSet, union };
+export { DefaultMap, LinkedList, Queue, Stack, commonHead, compareNatural, compareRelations, delay, difference, equals as equalsSet, getOrCreate, hasAtLeast, ifilter, ifind, iflat, imap, intersection, ireduce, isIterable, isNonEmptyArray, isString, isome, iunique, stringHash, symmetricDifference, toArray, toSet, union };

package/dist/utils/index.mjs

@@ -1,6 +1,6 @@
-import { d as t, U as n, j as commonAncestor, o as compareFqnHierarchically } from '../shared/core.BxvDITEI.mjs';
-export { h as ancestorsFqn, e as commonHead, k as compareByFqnHierarchically, f as compareNatural, I as difference, J as equalsSet, y as getOrCreate, a as hasAtLeast, q as hierarchyDistance, r as hierarchyLevel, B as ifilter, i as ifind, C as iflat, D as imap, K as intersection, s as isAncestor, u as isDescendantOf, E as isIterable, z as isNonEmptyArray, c as isSameHierarchy, A as isString, F as isome, G as iunique, n as nameFromFqn, O as objectHash, p as parentFqn, v as sortByFqnHierarchically, w as sortNaturalByFqn, x as sortParentsFirst, N as stringHash, L as symmetricDifference, H as toArray, t as toSet, M as union } from '../shared/core.BxvDITEI.mjs';
-import { i as invariant } from '../shared/core.M-JWF7SS.mjs';
+import { d as t, _ as n, j as commonAncestor, o as compareFqnHierarchically } from '../shared/core.CCyhaU-4.mjs';
+export { D as DefaultMap, e as LinkedList, q as Queue, S as Stack, h as ancestorsFqn, f as commonHead, k as compareByFqnHierarchically, g as compareNatural, K as difference, L as equalsSet, z as getOrCreate, a as hasAtLeast, r as hierarchyDistance, s as hierarchyLevel, C as ifilter, i as ifind, E as iflat, F as imap, M as intersection, u as isAncestor, v as isDescendantOf, G as isIterable, A as isNonEmptyArray, c as isSameHierarchy, B as isString, H as isome, I as iunique, n as nameFromFqn, Q as objectHash, p as parentFqn, w as sortByFqnHierarchically, x as sortNaturalByFqn, y as sortParentsFirst, P as stringHash, N as symmetricDifference, J as toArray, t as toSet, O as union } from '../shared/core.CCyhaU-4.mjs';
+import { i as invariant } from '../shared/core.Bezy7K65.mjs';
 
 function o(r,n){let e=Math.ceil(r),t=Math.floor(n);if(t<e)throw new RangeError(`randomInteger: The range [${r.toString()},${n.toString()}] contains no integer`);return Math.floor(Math.random()*(t-e+1)+e)}
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@likec4/core",
-  "version": "1.20.1",
+  "version": "1.20.3",
   "license": "MIT",
   "homepage": "https://likec4.dev",
   "author": "Denis Davydkov <denis@davydkov.com>",
@@ -23,6 +23,7 @@
     "dist",
     "src",
     "!**/*.spec.ts",
+    "!**/*.test-d.ts",
     "!**/__tests__/*",
     "!**/*.map"
   ],
@@ -111,7 +112,7 @@
   },
   "devDependencies": {
     "@dagrejs/dagre": "1.1.4",
-    "@likec4/tsconfig": "1.20.1",
+    "@likec4/tsconfig": "1.20.3",
     "@mantine/colors-generator": "7.15.2",
     "@types/natural-compare-lite": "^1.4.2",
     "@types/object-hash": "^3.0.6",
@@ -120,14 +121,14 @@
     "graphology": "^0.25.4",
     "graphology-dag": "^0.4.1",
     "graphology-types": "^0.24.8",
-    "mnemonist": "^0.39.8",
+    "mnemonist": "^0.40.0",
     "natural-compare-lite": "^1.4.0",
     "object-hash": "^3.0.0",
-    "obliterator": "^2.0.4",
+    "obliterator": "^2.0.5",
     "remeda": "^2.19.0",
-    "turbo": "^2.3.3",
+    "turbo": "^2.3.4",
     "typescript": "^5.7.3",
-    "unbuild": "^3.2.0",
+    "unbuild": "^3.3.1",
     "vitest": "^2.1.8"
   },
   "packageManager": "yarn@4.6.0"

package/src/compute-view/deployment-view/clean-connections.ts

@@ -1,4 +1,4 @@
-import DefaultMap from 'mnemonist/default-map'
+import { DefaultMap } from 'mnemonist'
 import {
   dropWhile,
   filter,

package/src/compute-view/deployment-view/stages/stage-final.ts

@@ -1,4 +1,4 @@
-import DefaultMap from 'mnemonist/default-map'
+import { DefaultMap } from 'mnemonist'
 import { forEach, only, pipe } from 'remeda'
 import { differenceConnections } from '../../../model/connection'
 import type { RelationshipModel } from '../../../model/RelationModel'

package/src/compute-view/element-view/__test__/fixture.ts

@@ -451,6 +451,7 @@ export function $custom(
     icon?: string
     opacity?: number
     navigateTo?: string
+    multiple?: boolean
   },
 ): C4CustomElementExpr {
   return {
@@ -588,6 +589,7 @@ type CustomProps = {
     icon?: string
     opacity?: number
     navigateTo?: string
+    multiple?: boolean
   } & Omit<C4CustomRelationExpr['customRelation'], 'relation' | 'navigateTo'>
 }
 export function $include(expr: Expression | C4Expression, props?: CustomProps): ViewRulePredicate {

package/src/compute-view/element-view/compute.ts

@@ -1,4 +1,4 @@
-import DefaultMap from 'mnemonist/default-map'
+import { DefaultMap } from 'mnemonist'
 import { filter, findLast, forEach, map, pipe } from 'remeda'
 import { invariant, nonexhaustive, nonNullable } from '../../errors'
 import { ConnectionModel } from '../../model/connection/model/ConnectionModel'

package/src/compute-view/element-view/memory/memory.ts

@@ -1,9 +1,9 @@
-import Stack from 'mnemonist/stack'
+import { Stack } from 'mnemonist'
 import { nonNullable } from '../../../errors'
 import type { ConnectionModel } from '../../../model/connection'
 import type { ElementModel } from '../../../model/ElementModel'
 import type { Expression, NodeId, ViewRuleGroup } from '../../../types'
-import { AbstractMemory, type ComputeCtx, type CtxElement, type MutableState, type StageExpression } from '../../memory'
+import { type ComputeCtx, type CtxElement, type MutableState, type StageExpression, AbstractMemory } from '../../memory'
 import { NodesGroup } from './NodeGroup'
 import { ActiveGroupStageExclude, StageExclude } from './stage-exclude'
 import { ActiveGroupStageInclude, StageInclude } from './stage-include'
@@ -111,7 +111,7 @@ export class ActiveGroupMemory extends Memory<ActiveGroupCtx> {
   ): ActiveGroupMemory {
     const groupId = `@gr${memory.groups.length + 1}` as NodeId
     if (memory instanceof ActiveGroupMemory) {
-      const stack = Stack.from(memory.stack)
+      const stack = Stack.from([...memory.stack].reverse())
       const state = memory.mutableState()
       state.groups.push(new NodesGroup(groupId, rule, memory.activeGroupId))
       stack.push(groupId)

package/src/compute-view/memory/ops.ts

@@ -1,4 +1,4 @@
-import DefaultMap from 'mnemonist/default-map'
+import { DefaultMap } from 'mnemonist'
 import { Connection } from '../../model'
 import { isAncestor, sortParentsFirst } from '../../utils'
 import { toArray } from '../../utils/iterable'