@likec4/core 1.23.1 → 1.24.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@likec4/core",
-  "version": "1.23.1",
+  "version": "1.24.0",
   "license": "MIT",
   "homepage": "https://likec4.dev",
   "author": "Denis Davydkov <denis@davydkov.com>",
@@ -23,10 +23,6 @@
   "exports": {
     ".": {
       "sources": "./src/index.ts",
-      "require": {
-        "types": "./dist/index.d.cts",
-        "default": "./dist/index.cjs"
-      },
       "default": {
         "types": "./dist/index.d.mts",
         "import": "./dist/index.mjs",
@@ -35,10 +31,6 @@
     },
     "./builder": {
       "sources": "./src/builder/index.ts",
-      "require": {
-        "types": "./dist/builder/index.d.cts",
-        "default": "./dist/builder/index.cjs"
-      },
       "default": {
         "types": "./dist/builder/index.d.mts",
         "import": "./dist/builder/index.mjs",
@@ -47,10 +39,6 @@
     },
     "./compute-view": {
       "sources": "./src/compute-view/index.ts",
-      "require": {
-        "types": "./dist/compute-view/index.d.cts",
-        "default": "./dist/compute-view/index.cjs"
-      },
       "default": {
         "types": "./dist/compute-view/index.d.mts",
         "import": "./dist/compute-view/index.mjs",
@@ -59,10 +47,6 @@
     },
     "./model": {
       "sources": "./src/model/index.ts",
-      "require": {
-        "types": "./dist/model/index.d.cts",
-        "default": "./dist/model/index.cjs"
-      },
       "default": {
         "types": "./dist/model/index.d.mts",
         "import": "./dist/model/index.mjs",
@@ -71,10 +55,6 @@
     },
     "./utils": {
       "sources": "./src/utils/index.ts",
-      "require": {
-        "types": "./dist/utils/index.d.cts",
-        "default": "./dist/utils/index.cjs"
-      },
       "default": {
         "types": "./dist/utils/index.d.mts",
         "import": "./dist/utils/index.mjs",
@@ -83,10 +63,6 @@
     },
     "./types": {
       "sources": "./src/types/index.ts",
-      "require": {
-        "types": "./dist/types/index.d.cts",
-        "default": "./dist/types/index.cjs"
-      },
       "default": {
         "types": "./dist/types/index.d.mts",
         "import": "./dist/types/index.mjs",
@@ -111,7 +87,7 @@
     "graphology": "^0.25.4",
     "graphology-dag": "^0.4.1",
     "graphology-types": "^0.24.8",
-    "mnemonist": "^0.40.2",
+    "mnemonist": "0.40.2",
     "natural-compare-lite": "^1.4.0",
     "object-hash": "^3.0.0",
     "obliterator": "^2.0.5",
@@ -120,7 +96,7 @@
     "typescript": "5.7.3",
     "unbuild": "^3.3.1",
     "vitest": "^3.0.4",
-    "@likec4/tsconfig": "1.23.1"
+    "@likec4/tsconfig": "1.24.0"
   },
   "scripts": {
     "typecheck": "tsc --noEmit",

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

@@ -1,4 +1,3 @@
-import { DefaultMap } from 'mnemonist'
 import {
   dropWhile,
   filter,
@@ -25,6 +24,7 @@ import { findConnection } from '../../model/connection/deployment'
 import { RelationshipsAccum } from '../../model/DeploymentElementModel'
 import type { RelationshipModel } from '../../model/RelationModel'
 import { imap, toArray } from '../../utils/iterable'
+import { DefaultMap } from '../../utils/mnemonist'
 import { intersection, union } from '../../utils/set'
 import type { Connection, Connections } from './_types'
 

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

@@ -1,9 +1,9 @@
-import { DefaultMap } from 'mnemonist'
 import { forEach, only, pipe } from 'remeda'
 import { differenceConnections } from '../../../model/connection'
 import type { RelationshipModel } from '../../../model/RelationModel'
 import { isAncestor, sortByFqnHierarchically } from '../../../utils/fqn'
 import { ifilter, isome, toArray } from '../../../utils/iterable'
+import { DefaultMap } from '../../../utils/mnemonist'
 import { difference, union } from '../../../utils/set'
 import { treeFromMemoryState } from '../../memory'
 import { cleanCrossBoundary, cleanRedundantRelationships } from '../clean-connections'

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

@@ -1,4 +1,3 @@
-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'
@@ -17,6 +16,7 @@ import type {
 import { isViewRuleAutoLayout, isViewRuleGroup, isViewRulePredicate, whereOperatorAsPredicate } from '../../types'
 import * as Expr from '../../types/expression'
 import { sortParentsFirst } from '../../utils'
+import { DefaultMap } from '../../utils/mnemonist'
 import { applyCustomElementProperties } from '../utils/applyCustomElementProperties'
 import { applyCustomRelationProperties } from '../utils/applyCustomRelationProperties'
 import { applyViewRuleStyles } from '../utils/applyViewRuleStyles'

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

@@ -1,8 +1,8 @@
-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 { Stack } from '../../../utils/mnemonist'
 import { type ComputeCtx, type CtxElement, type MutableState, type StageExpression, AbstractMemory } from '../../memory'
 import { NodesGroup } from './NodeGroup'
 import { ActiveGroupStageExclude, StageExclude } from './stage-exclude'

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

@@ -1,7 +1,7 @@
-import { DefaultMap } from 'mnemonist'
 import { Connection } from '../../model'
 import { isAncestor, sortParentsFirst } from '../../utils'
 import { toArray } from '../../utils/iterable'
+import { DefaultMap } from '../../utils/mnemonist'
 import type { AnyCtx, ComputeMemory, CtxElement } from './_types'
 
 export function treeFromMemoryState<T extends AnyCtx, M extends ComputeMemory<T> = ComputeMemory<T>>(

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

@@ -1,5 +1,4 @@
 import dagre, { type EdgeConfig, type GraphLabel } from '@dagrejs/dagre'
-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'
@@ -7,6 +6,7 @@ import type { RelationshipModel } from '../../model/RelationModel'
 import type { DiagramNode, DiagramView, Fqn, NodeId } from '../../types'
 import { sortParentsFirst } from '../../utils'
 import { toArray } from '../../utils/iterable'
+import { DefaultMap } from '../../utils/mnemonist'
 import type { RelationshipsViewData } from './_types'
 import { treeFromElements } from './utils'
 

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

@@ -1,8 +1,8 @@
-import { DefaultMap } from 'mnemonist'
 import { nonNullable } from '../../errors'
 import type { ElementModel } from '../../model/ElementModel'
 import type { Fqn } from '../../types'
 import { isAncestor, isDescendantOf, sortParentsFirst } from '../../utils/fqn'
+import { DefaultMap } from '../../utils/mnemonist'
 
 export function treeFromElements(elements: Iterable<ElementModel>) {
   const sorted = sortParentsFirst([...elements]) as ReadonlyArray<ElementModel>

package/src/model/DeploymentElementModel.ts

@@ -8,6 +8,7 @@ import {
   type DeploymentNode,
   type DeploymentNodeKind,
   type DeploymentRelation,
+  type ElementKind,
   type ElementShape as C4ElementShape,
   type IteratorLike,
   type Link,
@@ -43,6 +44,7 @@ abstract class AbstractDeploymentElementModel<M extends AnyAux = AnyAux> {
 
   abstract readonly $model: LikeC4DeploymentModel<M>
   abstract readonly $node: DeploymentNode | DeployedInstance
+  abstract readonly kind: DeploymentNodeKind | ElementKind
 
   get style(): SetRequired<DeploymentElementStyle, 'shape' | 'color' | 'size'> {
     return {
@@ -65,10 +67,6 @@ abstract class AbstractDeploymentElementModel<M extends AnyAux = AnyAux> {
     return this.$node.tags ?? []
   }
 
-  get kind(): DeploymentNodeKind | string | null {
-    return this.$node.kind ?? null
-  }
-
   get description(): string | null {
     return this.$node.description ?? null
   }
@@ -375,8 +373,8 @@ export class DeployedInstanceModel<M extends AnyAux = AnyAux> extends AbstractDe
     return this.$instance.tags ?? []
   }
 
-  override get kind(): string | null {
-    return this.$instance.kind ?? null
+  override get kind(): ElementKind {
+    return this.element.kind
   }
 
   override get description(): string | null {

package/src/model/DeploymentModel.ts

@@ -1,4 +1,3 @@
-import { DefaultMap } from 'mnemonist'
 import { values } from 'remeda'
 import type { LiteralUnion } from 'type-fest'
 import { invariant, nonNullable } from '../errors'
@@ -14,6 +13,7 @@ import {
 import { ancestorsFqn, parentFqn, sortParentsFirst } from '../utils/fqn'
 import { getOrCreate } from '../utils/getOrCreate'
 import { isString } from '../utils/guards'
+import { DefaultMap } from '../utils/mnemonist'
 import {
   type DeployedInstancesIterator,
   type DeploymentElementModel,

package/src/model/LikeC4Model.ts

@@ -1,4 +1,3 @@
-import { DefaultMap } from 'mnemonist'
 import { mapValues, pipe, sort, values } from 'remeda'
 import type { LiteralUnion } from 'type-fest'
 import { computeView, unsafeComputeView } from '../compute-view'
@@ -11,6 +10,7 @@ import type { AnyParsedLikeC4Model, GenericLikeC4Model, LikeC4ModelDump } from '
 import type { ModelRelation } from '../types/relation'
 import { compareNatural } from '../utils'
 import { ancestorsFqn, commonAncestor, parentFqn } from '../utils/fqn'
+import { DefaultMap } from '../utils/mnemonist'
 import type {
   DeployedInstanceModel,
   DeploymentElementModel,
@@ -417,6 +417,27 @@ export class LikeC4Model<M extends AnyAux = LikeC4Model.Any> {
 }
 
 export namespace LikeC4Model {
+  export const EMPTY = LikeC4Model.create({
+    specification: {
+      elements: {},
+      relationships: {},
+      deployments: {},
+      tags: [],
+    },
+    globals: {
+      predicates: {},
+      dynamicPredicates: {},
+      styles: {},
+    },
+    deployments: {
+      elements: {},
+      relations: {},
+    },
+    elements: {},
+    relations: {},
+    views: {},
+  }) as LikeC4Model<AnyAux>
+
   export type Any = Aux<
     string,
     string,

package/src/model/view/LikeC4ViewModel.ts

@@ -1,4 +1,3 @@
-import { sort } from 'remeda'
 import { nonNullable } from '../../errors'
 import type { IteratorLike } from '../../types'
 import type { Link, Tag } from '../../types/element'
@@ -16,7 +15,7 @@ import {
   isElementView,
   isScopedElementView,
 } from '../../types/view'
-import { compareByFqnHierarchically, getOrCreate, ifind } from '../../utils'
+import { DefaultMap, ifind } from '../../utils'
 import type { ElementModel } from '../ElementModel'
 import type { LikeC4Model } from '../LikeC4Model'
 import { type AnyAux, getId } from '../types'
@@ -32,13 +31,13 @@ export class LikeC4ViewModel<M extends AnyAux, V extends ComputedView | DiagramV
   readonly #includeElements = new Set<M['Element']>()
   readonly #includeDeployments = new Set<M['Deployment']>()
   readonly #includeRelations = new Set<M['RelationId']>()
-  readonly #allTags = new Map<Tag, Set<NodeModel<M, V> | EdgeModel<M, V>>>()
+  readonly #allTags = new DefaultMap((_key: Tag) => new Set<NodeModel<M, V> | EdgeModel<M, V>>())
 
   constructor(
     public readonly $model: LikeC4Model<M>,
     public readonly $view: V,
   ) {
-    for (const node of sort($view.nodes, compareByFqnHierarchically)) {
+    for (const node of $view.nodes) {
       const el = new NodeModel(this, Object.freeze(node))
       this.#nodes.set(node.id, el)
       if (!node.parent) {
@@ -51,7 +50,7 @@ export class LikeC4ViewModel<M extends AnyAux, V extends ComputedView | DiagramV
         this.#includeElements.add(el.element.id)
       }
       for (const tag of el.tags) {
-        getOrCreate(this.#allTags, tag, () => new Set()).add(el)
+        this.#allTags.get(tag).add(el)
       }
     }
 
@@ -63,7 +62,7 @@ export class LikeC4ViewModel<M extends AnyAux, V extends ComputedView | DiagramV
         this.node(edge.target),
       )
       for (const tag of edgeModel.tags) {
-        getOrCreate(this.#allTags, tag, () => new Set()).add(edgeModel)
+        this.#allTags.get(tag).add(edgeModel)
       }
       for (const rel of edge.relations) {
         this.#includeRelations.add(rel)

package/src/types/deployments.ts

@@ -42,7 +42,6 @@ export interface DeployedInstance {
   readonly title?: string
   readonly description?: string | null
   readonly technology?: string | null
-  readonly kind?: string | null // TODO: ensure the property is set
   readonly tags?: NonEmptyArray<Tag> | null
   readonly links?: NonEmptyArray<Link> | null
   readonly style?: DeploymentElementStyle

package/src/types/index.ts

@@ -140,7 +140,7 @@ export type {
   RelationshipKindSpecification,
   RelationshipLineType,
 } from './relation'
-export { isThemeColor } from './theme'
+export { isThemeColor, ThemeColors } from './theme'
 export type {
   Color,
   ColorLiteral,

package/src/types/theme.ts

@@ -1,6 +1,6 @@
 import type { LiteralUnion } from 'type-fest'
 
-const ThemeColors = [
+export const ThemeColors = [
   'amber',
   'blue',
   'gray',

package/src/utils/index.ts

@@ -1,4 +1,10 @@
-export { DefaultMap, LinkedList, Queue, Stack } from 'mnemonist'
+export {
+  DefaultMap,
+  DefaultWeakMap,
+  LinkedList,
+  Queue,
+  Stack,
+} from './mnemonist'
 
 export {
   commonHead,

package/src/utils/mnemonist.ts

@@ -0,0 +1,7 @@
+export {
+  DefaultMap,
+  DefaultWeakMap,
+  LinkedList,
+  Queue,
+  Stack,
+} from 'mnemonist/patch'

package/src/utils/set.ts

@@ -1,9 +1,11 @@
-import { set } from 'mnemonist'
+import {
+  intersection as _intersection,
+  symmetricDifference as _symmetricDifference,
+} from 'mnemonist/patch'
+
 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