@likec4/core 1.20.1 → 1.20.3

package/src/compute-view/relationships-view/layout.ts

@@ -1,5 +1,5 @@
 import dagre, { type EdgeConfig, type GraphLabel } from '@dagrejs/dagre'
-import DefaultMap from 'mnemonist/default-map'
+import { DefaultMap } from 'mnemonist'
 import { concat, filter, forEachObj, groupBy, map, mapToObj, pipe, prop, reduce, tap } from 'remeda'
 import { invariant } from '../../errors'
 import type { ElementModel } from '../../model/ElementModel'

package/src/compute-view/relationships-view/utils.ts

@@ -1,4 +1,4 @@
-import DefaultMap from 'mnemonist/default-map'
+import { DefaultMap } from 'mnemonist'
 import { nonNullable } from '../../errors'
 import type { ElementModel } from '../../model/ElementModel'
 import type { Fqn } from '../../types'

package/src/compute-view/utils/applyCustomElementProperties.ts

@@ -1,5 +1,5 @@
 import { isEmpty, isNullish, omitBy } from 'remeda'
-import { ComputedNode, isCustomElement, isViewRuleGroup, isViewRulePredicate, type ViewRule } from '../../types'
+import { type ViewRule, ComputedNode, isCustomElement, isViewRuleGroup, isViewRulePredicate } from '../../types'
 import type { Expression } from '../../types/expression'
 import { elementExprToPredicate } from './elementExpressionToPredicate'
 
@@ -24,10 +24,10 @@ export function applyCustomElementProperties(_rules: ViewRule[], _nodes: Compute
   const nodes = [..._nodes]
   for (
     const {
-      custom: { expr, ...props }
+      custom: { expr, ...props },
     } of rules
   ) {
-    const { border, opacity, ...rest } = omitBy(props, isNullish)
+    const { border, opacity, multiple, ...rest } = omitBy(props, isNullish)
     const notEmpty = !isEmpty(rest)
     const satisfies = elementExprToPredicate(expr)
     nodes.forEach((node, i) => {
@@ -38,7 +38,7 @@ export function applyCustomElementProperties(_rules: ViewRule[], _nodes: Compute
         node = {
           ...node,
           isCustomized: true,
-          ...rest
+          ...rest,
         }
       }
 
@@ -49,14 +49,17 @@ export function applyCustomElementProperties(_rules: ViewRule[], _nodes: Compute
       if (opacity !== undefined) {
         styleOverride = { ...styleOverride, opacity }
       }
+      if (multiple !== undefined) {
+        styleOverride = { ...styleOverride, multiple }
+      }
       if (styleOverride) {
         node = {
           ...node,
           isCustomized: true,
           style: {
             ...node.style,
-            ...styleOverride
-          }
+            ...styleOverride,
+          },
         }
       }
       nodes[i] = node

package/src/compute-view/utils/applyViewRuleStyles.ts

@@ -1,5 +1,5 @@
 import { anyPass, filter, forEach, isDefined, isNot, pipe } from 'remeda'
-import { ComputedNode, isViewRuleStyle, type ViewRule, type ViewRuleStyle } from '../../types'
+import { type ViewRule, type ViewRuleStyle, ComputedNode, isViewRuleStyle } from '../../types'
 import { elementExprToPredicate } from './elementExpressionToPredicate'
 
 type Predicate<T> = (x: T) => boolean
@@ -9,7 +9,7 @@ type CommonViewRuleStyle = Pick<ViewRuleStyle, 'style' | 'notation'>
 export function applyViewRuleStyle<Rule extends CommonViewRuleStyle>(
   rule: Rule,
   predicates: Predicate<ComputedNode>[],
-  nodes: ComputedNode[]
+  nodes: ComputedNode[],
 ) {
   pipe(
     nodes,
@@ -31,13 +31,16 @@ export function applyViewRuleStyle<Rule extends CommonViewRuleStyle>(
       if (isDefined(rule.style.opacity)) {
         styleOverride = { ...styleOverride, opacity: rule.style.opacity }
       }
+      if (isDefined(rule.style.multiple)) {
+        styleOverride = { ...styleOverride, multiple: rule.style.multiple }
+      }
       if (styleOverride) {
         n.style = {
           ...n.style,
-          ...styleOverride
+          ...styleOverride,
         }
       }
-    })
+    }),
   )
 }
 

package/src/index.ts

@@ -1,11 +1,3 @@
-import DefaultMap from 'mnemonist/default-map'
-import LinkedList from 'mnemonist/linked-list'
-import Queue from 'mnemonist/queue'
-import Stack from 'mnemonist/stack'
-// import dagre from '@dagrejs/dagre'
-
-export { DefaultMap, LinkedList, Queue, Stack }
-
 export {
   computeColorValues,
   defaultTheme,

package/src/model/DeploymentModel.ts

@@ -1,4 +1,4 @@
-import DefaultMap from 'mnemonist/default-map'
+import { DefaultMap } from 'mnemonist'
 import { values } from 'remeda'
 import type { LiteralUnion } from 'type-fest'
 import { invariant, nonNullable } from '../errors'

package/src/model/LikeC4Model.ts

@@ -1,4 +1,4 @@
-import DefaultMap from 'mnemonist/default-map'
+import { DefaultMap } from 'mnemonist'
 import { mapValues, pipe, sort, values } from 'remeda'
 import type { LiteralUnion } from 'type-fest'
 import { computeView, unsafeComputeView } from '../compute-view'
@@ -27,9 +27,9 @@ import { NodeModel } from './view/NodeModel'
 
 export class LikeC4Model<M extends AnyAux = LikeC4Model.Any> {
   /**
-   * Only available in compile tim
+   * Don't use in runtime, only for type inference
    */
-  readonly Aux!: M
+  readonly Aux: M = {} as M
 
   readonly #elements = new Map<M['Element'], ElementModel<M>>()
   // Parent element for given FQN

package/src/types/element.ts

@@ -24,7 +24,7 @@ export const ElementShapes = [
   'mobile',
   'cylinder',
   'storage',
-  'queue'
+  'queue',
 ] as const
 
 export type ElementShape = TupleToUnion<typeof ElementShapes>
@@ -39,6 +39,11 @@ export interface ElementStyle {
    * @default 100
    */
   readonly opacity?: number
+  /**
+   * If true, the element is rendered as multiple shapes
+   * @default false
+   */
+  readonly multiple?: boolean
 }
 
 export type Tag<Tags extends string = string> = Tagged<Tags, 'Tag'>
@@ -60,7 +65,7 @@ export interface TypedElement<
   Ids extends string,
   Kinds extends string,
   Tags extends string,
-  MetadataKeys extends string = never
+  MetadataKeys extends string = never,
 > {
   readonly id: Fqn<Ids>
   readonly kind: ElementKind<Kinds>

package/src/types/expression.ts

@@ -53,6 +53,7 @@ export interface CustomElementExpr extends Omit<BaseExpr, 'custom'> {
     border?: BorderStyle
     opacity?: number
     navigateTo?: ViewId
+    multiple?: boolean
   }
 }
 

package/src/utils/index.ts

@@ -1,3 +1,5 @@
+export { DefaultMap, LinkedList, Queue, Stack } from 'mnemonist'
+
 export {
   commonHead,
 } from './common-head'

package/src/utils/set.ts

@@ -1,6 +1,9 @@
-import { intersection as _intersection, symmetricDifference as _symmetricDifference } from 'mnemonist/set'
+import { set } from 'mnemonist'
+import { hasAtLeast } from 'remeda'
 import type { NonEmptyArray } from '../types/_common'
 
+const { intersection: _intersection, symmetricDifference: _symmetricDifference } = set
+
 /**
  * Returns new set as a union of given sets
  * Keeps order of elements
@@ -25,7 +28,7 @@ export function intersection<T>(first: ReadonlySet<T>, ...sets: NonEmptyArray<Re
   if (first.size === 0) {
     return result
   }
-  let other = sets.length > 1 ? _intersection(...sets as any) : sets[0]
+  let other = hasAtLeast(sets, 2) ? _intersection(...sets) : sets[0]
   if (other.size === 0) {
     return result
   }