@likec4/core 1.19.0 → 1.19.2

package/src/model/DeploymentElementModel.ts

@@ -11,6 +11,7 @@ import {
   type ElementShape as C4ElementShape,
   type IteratorLike,
   type Link,
+  type RelationshipKind,
   type Tag,
   type Tag as C4Tag,
   type ThemeColor,
@@ -62,6 +63,10 @@ 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
   }
@@ -223,7 +228,7 @@ export class DeploymentNodeModel<M extends AnyAux = AnyAux> extends AbstractDepl
     return this.$model.parent(this)
   }
 
-  get kind(): DeploymentNodeKind {
+  override get kind(): DeploymentNodeKind {
     return this.$node.kind
   }
 
@@ -367,6 +372,10 @@ 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 description(): string | null {
     return this.$instance.description ?? this.element.description
   }
@@ -514,6 +523,10 @@ export class DeploymentRelationModel<M extends AnyAux = AnyAux> {
     return this.$relationship.tags ?? []
   }
 
+  get kind(): RelationshipKind | null {
+    return this.$relationship.kind ?? null
+  }
+
   get navigateTo(): LikeC4ViewModel<M> | null {
     return this.$relationship.navigateTo ? this.$model.$model.view(this.$relationship.navigateTo) : null
   }

package/src/model/RelationModel.ts

@@ -67,6 +67,10 @@ export class RelationshipModel<M extends AnyAux = AnyAux> {
     return this.$relationship.tags ?? []
   }
 
+  get kind(): string | null {
+    return this.$relationship.kind ?? null
+  }
+
   get links(): ReadonlyArray<Link> {
     return this.$relationship.links ?? []
   }

package/src/model/connection/deployment/DeploymentConnectionModel.ts

@@ -110,11 +110,21 @@ export class DeploymentConnectionModel<M extends AnyAux = AnyAux>
     yield* this.relations.deployment
   }
 
+  /**
+   * Merge with another connections, if it has the same source and target.
+   * Returns new connection with union of relationships.
+   */
+  public mergeWith(others: DeploymentConnectionModel<M>[]): DeploymentConnectionModel<M>
   /**
    * Merge with another connection, if it has the same source and target.
    * Returns new connection with union of relationships.
    */
-  public mergeWith(other: DeploymentConnectionModel<M>) {
+  public mergeWith(other: DeploymentConnectionModel<M>): DeploymentConnectionModel<M>
+  public mergeWith(other: DeploymentConnectionModel<M> | DeploymentConnectionModel<M>[]): DeploymentConnectionModel<M> {
+    if (Array.isArray(other)) {
+      return other.reduce((acc, o) => acc.mergeWith(o), this)
+    }
+
     invariant(this.source.id === other.source.id, 'Cannot merge connections with different sources')
     invariant(this.target.id === other.target.id, 'Cannot merge connections with different targets')
     return new DeploymentConnectionModel(

package/src/types/deployments.ts

@@ -42,6 +42,7 @@ 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/expression-v2.ts

@@ -2,6 +2,7 @@ import { invariant } from '../errors'
 import type { ExclusiveUnion } from './_common'
 import type { DeploymentRef as DeploymentModelRef, PredicateSelector } from './deployments'
 import type { Fqn } from './element'
+import type { WhereOperator } from './operators'
 
 export namespace FqnRef {
   /**
@@ -131,6 +132,15 @@ export namespace RelationExpr {
   export const isInOut = (expr: ExpressionV2): expr is InOut => {
     return 'inout' in expr
   }
+  export type Where<D = Fqn, M = Fqn> = {
+    where: {
+      expr: ExpressionV2<D, M>
+      condition: WhereOperator<string, string>
+    }
+  }
+  export const isWhere = (expr: ExpressionV2): expr is Where => {
+    return 'where' in expr
+  }
 }
 
 export type RelationExpr<D = Fqn, M = Fqn> = ExclusiveUnion<{
@@ -138,6 +148,7 @@ export type RelationExpr<D = Fqn, M = Fqn> = ExclusiveUnion<{
   Incoming: RelationExpr.Incoming<D, M>
   Outgoing: RelationExpr.Outgoing<D, M>
   InOut: RelationExpr.InOut<D, M>
+  Where: RelationExpr.Where<D, M>
 }>
 
 /**
@@ -154,6 +165,7 @@ export type ExpressionV2<D = Fqn, M = Fqn> = ExclusiveUnion<{
   Incoming: RelationExpr.Incoming<D, M>
   Outgoing: RelationExpr.Outgoing<D, M>
   InOut: RelationExpr.InOut<D, M>
+  RelationPredicateOrWhere: RelationExpr.Where<D, M>
 }>
 
 export namespace ExpressionV2 {

package/src/types/index.ts

@@ -121,6 +121,7 @@ export type {
   Filterable,
   KindEqual,
   NotOperator,
+  OperatorPredicate,
   OrOperator,
   TagEqual,
   WhereOperator,

package/src/types/operators.ts

@@ -61,19 +61,19 @@ export type WhereOperator<Tag, Kind> =
   | OrOperator<Tag, Kind>
 
 export type Filterable<
-  FTag extends string = string,
-  FKind extends string = string
+  FTag extends string | null = string | null,
+  FKind extends string | null = string | null,
 > = {
   tags?: readonly FTag[] | null
   kind?: FKind
 }
 
-type OperatorPredicate<V extends Filterable> = (value: V) => boolean
+export type OperatorPredicate<V extends Filterable> = (value: V) => boolean
 
 export function whereOperatorAsPredicate<
   FTag extends string = string,
-  FKind extends string = string
->(operator: WhereOperator<FTag, FKind>): OperatorPredicate<Filterable<FTag, FKind>> {
+  FKind extends string = string,
+>(operator: WhereOperator<FTag, FKind>): OperatorPredicate<Filterable> {
   switch (true) {
     case isTagEqual(operator): {
       if ('eq' in operator.tag) {

package/src/utils/index.ts

@@ -40,6 +40,7 @@ export {
 } from './guards'
 export {
   ifilter,
+  ifind,
   iflat,
   imap,
   ireduce,

package/src/utils/iterable/find.ts

@@ -0,0 +1,36 @@
+import { isFunction } from 'remeda'
+import { invariant } from '../../errors'
+
+/**
+ * Finds the first element in the iterable that satisfies the predicate.
+ * Composable first version of `find`.
+ * @signature
+ *   ifind(predicate)(data)
+ */
+export function ifind<T>(predicate: (item: T) => boolean): (iterable: Iterable<T>) => T | undefined
+/**
+ * Finds the first element in the iterable that satisfies the predicate.
+ * Data first version of `find`.
+ * @signature
+ *  ifind(data, predicate)
+ */
+export function ifind<T>(iterable: Iterable<T>, predicate: (item: T) => boolean): T | undefined
+
+export function ifind(arg1: unknown, arg2?: unknown) {
+  const pred = (arg2 ?? arg1) as (v: any) => boolean
+  invariant(isFunction(pred))
+
+  function _find(iter: Iterable<unknown>) {
+    for (const value of iter) {
+      if (pred(value)) {
+        return value
+      }
+    }
+    return
+  }
+
+  if (!arg2) {
+    return _find
+  }
+  return _find(arg1 as Iterable<unknown>)
+}

package/src/utils/iterable/index.ts

@@ -4,6 +4,7 @@ export { isIterable } from './_types'
  * operators
  */
 export { ifilter } from './filter'
+export { ifind } from './find'
 export { iflat } from './flat'
 export { imap } from './map'
 export { ireduce } from './reduce'