@likec4/core 1.38.1 → 1.39.1

package/dist/utils/iterable/index.d.mts

@@ -1,8 +1,7 @@
+export { i as isIterable } from '../../shared/core.DXhDWKFZ.mjs';
 import { I as IteratorLike } from '../../shared/core.DuSLYTG6.mjs';
 import 'type-fest';
 
-declare function isIterable<T, I extends Iterable<T>>(something: I | unknown): something is Iterable<T>;
-
 /**
  * Filters an iterable based on a predicate.
  * Composabel first version of `ifilter`.
@@ -114,4 +113,4 @@ declare function toSet<T>(iterable: Iterable<T>): Set<T>;
 declare function iunique(): <T>(iterable: Iterable<T>) => IteratorLike<T>;
 declare function iunique<T>(iterable: Iterable<T>): IteratorLike<T>;
 
-export { ifilter, ifind, ifirst, iflat, ihead, imap, ireduce, isIterable, isome, iunique, toArray, toSet };
+export { ifilter, ifind, ifirst, iflat, ihead, imap, ireduce, isome, iunique, toArray, toSet };

package/dist/utils/iterable/index.mjs

@@ -1,44 +1,9 @@
-import { n } from '../../shared/core.8KM0D6va.mjs';
-export { i as iflat, a as isIterable, b as iunique } from '../../shared/core.8KM0D6va.mjs';
-import { t } from '../../shared/core.BH9nN-_I.mjs';
-export { i as ifilter } from '../../shared/core.BH9nN-_I.mjs';
-export { i as ifind, a as ihead } from '../../shared/core.DsMrjY2q.mjs';
-import { i as invariant } from '../../shared/core.D4npX2q8.mjs';
-export { i as imap, t as toArray, a as toSet } from '../../shared/core.Btl47GOn.mjs';
-export { i as isome } from '../../shared/core.BoyJPEen.mjs';
-
-function ifirst(arg1, arg2) {
-  const count = arg2 ?? arg1;
-  invariant(typeof count === "number" && count >= 0, "Count must be a non-negative number");
-  function* _first(iter) {
-    let taken = 0;
-    for (const value of iter) {
-      if (taken >= count) {
-        break;
-      }
-      yield value;
-      taken++;
-    }
-    return;
-  }
-  if (arg2 === void 0) {
-    return (iterable) => _first(iterable);
-  }
-  return _first(arg1);
-}
-
-function ireduce(arg1, arg2, arg3) {
-  const reducer = n(arg3) ? arg2 : arg1;
-  const initialValue = arg3 ?? arg2;
-  invariant(t(reducer));
-  function _reduce(iter) {
-    let acc = initialValue;
-    for (const value of iter) {
-      acc = reducer(acc, value);
-    }
-    return acc;
-  }
-  return n(arg3) ? _reduce(arg1) : _reduce;
-}
-
-export { ifirst, ireduce };
+export { i as isIterable } from '../../shared/core.DoM6aM9N.mjs';
+export { i as ifilter } from '../../shared/core.CCD1ID81.mjs';
+export { i as ifind, a as ihead } from '../../shared/core.GTgsmXS_.mjs';
+export { i as ifirst, a as ireduce } from '../../shared/core.ILwny7BV.mjs';
+export { i as iflat, a as iunique } from '../../shared/core.CNGyqkJh.mjs';
+export { i as imap, t as toArray, a as toSet } from '../../shared/core.DLpidoWc.mjs';
+export { i as isome } from '../../shared/core.Be4Jy9Qx.mjs';
+import 'remeda';
+import '../../shared/core.D4npX2q8.mjs';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@likec4/core",
-  "version": "1.38.1",
+  "version": "1.39.1",
   "license": "MIT",
   "homepage": "https://likec4.dev",
   "author": "Denis Davydkov <denis@davydkov.com>",
@@ -16,7 +16,8 @@
     "src",
     "!**/*.spec.ts",
     "!**/*.test-d.ts",
-    "!**/__tests__/*",
+    "!**/__test__/*",
+    "!**/__snapshots__/*",
     "!**/*.map"
   ],
   "type": "module",
@@ -99,6 +100,8 @@
     "type-fest": "^4.41.0",
     "unified": "11.0.5",
     "chroma-js": "^3.1.2",
+    "remeda": "^2.23.1",
+    "defu": "^6.1.4",
     "@mantine/colors-generator": "8.2.4"
   },
   "devDependencies": {
@@ -110,9 +113,7 @@
     "@types/natural-compare-lite": "^1.4.2",
     "@types/object-hash": "^3.0.6",
     "@types/unist": "3.0.3",
-    "@types/node": "~20.19.2",
-    "defu": "^6.1.4",
-    "fdir": "6.4.6",
+    "@types/node": "~20.19.11",
     "graphology": "^0.25.4",
     "graphology-dag": "^0.4.1",
     "graphology-types": "^0.24.8",
@@ -120,12 +121,12 @@
     "natural-compare-lite": "^1.4.0",
     "object-hash": "^3.0.0",
     "obliterator": "^2.0.5",
-    "remeda": "^2.23.1",
+    "fdir": "6.4.6",
     "turbo": "2.5.6",
     "typescript": "5.9.2",
     "unbuild": "3.5.0",
     "vitest": "3.2.4",
-    "@likec4/tsconfig": "1.38.1"
+    "@likec4/tsconfig": "1.39.1"
   },
   "scripts": {
     "typecheck": "tsc -b --verbose",

package/src/index.ts

@@ -7,4 +7,27 @@ export {
 
 export * from './types'
 
-export * from './utils'
+export {
+  ancestorsFqn,
+  BiMap,
+  DefaultMap,
+  DefaultWeakMap,
+  invariant,
+  isAncestor,
+  isDescendantOf,
+  isIterable,
+  isNonEmptyArray,
+  isSameHierarchy,
+  isString,
+  type IterableContainer,
+  LinkedList,
+  memoizeProp,
+  MultiMap,
+  nameFromFqn,
+  nonexhaustive,
+  nonNullable,
+  parentFqn,
+  Queue,
+  sortNaturalByFqn,
+  sortParentsFirst,
+} from './utils'

package/src/model/RelationModel.ts

@@ -24,7 +24,7 @@ export type RelationshipsIterator<A extends AnyAux> = IteratorLike<RelationshipM
  * A relationship between two elements (in logical or deployment model)
  * use {@link isDeploymentRelationModel} guard to check if the relationship is a deployment relationship
  */
-export interface AnyRelationshipModel<A extends AnyAux> extends WithTags<A>, WithMetadata<A> {
+export interface AnyRelationshipModel<A extends AnyAux = AnyAux> extends WithTags<A>, WithMetadata<A> {
   readonly id: scalar.RelationId
   readonly expression: string
   readonly title: string | null

package/src/model/index.ts

@@ -1,6 +1,6 @@
 export { ElementModel } from './ElementModel'
 export { type AnyLikeC4Model, LikeC4Model } from './LikeC4Model'
-export { RelationshipModel } from './RelationModel'
+export { type AnyRelationshipModel, RelationshipModel } from './RelationModel'
 
 export {
   Connection,

package/src/theme/element.ts

@@ -21,7 +21,7 @@ const slate = {
   loContrast: '#cbd5e1',
 } satisfies ElementThemeColorValues
 
-export const ElementColors = {
+export const ElementColors: ElementThemeColors = {
   primary: blue,
   blue,
   secondary: sky,
@@ -58,4 +58,4 @@ export const ElementColors = {
     hiContrast: '#eef2ff',
     loContrast: '#c7d2fe',
   },
-} as const satisfies ElementThemeColors
+}

package/src/theme/relationships.ts

@@ -23,7 +23,7 @@ const sky = {
   labelColor: '#38bdf8', // 400
 } satisfies RelationshipThemeColorValues
 
-export const RelationshipColors = {
+export const RelationshipColors: RelationshipThemeColors = {
   amber: {
     lineColor: '#b45309',
     labelBgColor: '#78350f',
@@ -51,4 +51,4 @@ export const RelationshipColors = {
   secondary: sky,
   sky,
   slate,
-} satisfies RelationshipThemeColors
+}

package/src/types/RichText.ts

@@ -1,5 +1,5 @@
-import type { MarkdownOrString } from '../types'
 import { markdownToHtml, markdownToText, memoizeProp, nonexhaustive } from '../utils'
+import type { MarkdownOrString } from './scalar'
 
 const richtxt = Symbol.for('richtxt')
 const symb_text = Symbol.for('text')

package/src/types/expression-model.ts

@@ -1,5 +1,4 @@
 import type * as aux from './_aux'
-import type { AnyAux } from './_aux'
 import type { ExclusiveUnion } from './_common'
 import type { PredicateSelector } from './expression'
 import { FqnRef } from './fqnRef'
@@ -14,6 +13,9 @@ import type {
   ShapeSize,
 } from './styles'
 
+// Alias for bundle exports
+type AnyAux = aux.Any
+
 export namespace ModelFqnExpr {
   export type Wildcard = {
     wildcard: true

package/src/types/expression.ts

@@ -1,5 +1,4 @@
 import type * as aux from './_aux'
-import type { AnyAux } from './_aux'
 import type { ExclusiveUnion } from './_common'
 import { FqnRef } from './fqnRef'
 import type { WhereOperator } from './operators'
@@ -13,6 +12,9 @@ import type {
   ShapeSize,
 } from './styles'
 
+// Alias for bundle exports
+type AnyAux = aux.Any
+
 export type PredicateSelector =
   | 'children' // ele.*
   | 'expanded' // ele._

package/src/types/fqnRef.ts

@@ -1,9 +1,12 @@
 import { isString } from 'remeda'
 import type * as aux from './_aux'
-import type { AnyAux, Unknown } from './_aux'
 import type { ExclusiveUnion } from './_common'
 import { GlobalFqn } from './scalar'
 
+// Alias for bundle exports
+type AnyAux = aux.Any
+type Unknown = aux.Unknown
+
 export namespace FqnRef {
   /**
    * Reference to logical model element

package/src/utils/guards.ts

@@ -1,5 +1,4 @@
 import type { NonEmptyArray } from '../types'
-export { hasAtLeast } from 'remeda'
 
 export function isString(value: unknown): value is string {
   return value != null && typeof value === 'string'

package/src/utils/index.ts

@@ -34,7 +34,6 @@ export {
 export { getOrCreate } from './getOrCreate'
 
 export {
-  hasAtLeast,
   isNonEmptyArray,
   isString,
 } from './guards'

package/dist/shared/core.BW8K1y6R.mjs

@@ -1,278 +0,0 @@
-import { F as FqnRef } from './core.DK6I-Nr7.mjs';
-import { n } from './core.CnIyafWn.mjs';
-import { e as isStepEdgeId } from './core.BL_xjl90.mjs';
-
-function o(r){return Array.isArray(r)}
-
-var FqnExpr;
-((FqnExpr2) => {
-  function isWildcard(expr) {
-    return "wildcard" in expr && expr.wildcard === true;
-  }
-  FqnExpr2.isWildcard = isWildcard;
-  function isModelRef(ref) {
-    return "ref" in ref && FqnRef.isModelRef(ref.ref);
-  }
-  FqnExpr2.isModelRef = isModelRef;
-  function isDeploymentRef(expr) {
-    return "ref" in expr && FqnRef.isDeploymentRef(expr.ref);
-  }
-  FqnExpr2.isDeploymentRef = isDeploymentRef;
-  function isElementKindExpr(expr) {
-    return "elementKind" in expr && "isEqual" in expr;
-  }
-  FqnExpr2.isElementKindExpr = isElementKindExpr;
-  function isElementTagExpr(expr) {
-    return "elementTag" in expr && "isEqual" in expr;
-  }
-  FqnExpr2.isElementTagExpr = isElementTagExpr;
-  function isWhere(expr) {
-    return "where" in expr && is(expr.where.expr);
-  }
-  FqnExpr2.isWhere = isWhere;
-  function isCustom(expr) {
-    return "custom" in expr && (is(expr.custom.expr) || isWhere(expr.custom.expr));
-  }
-  FqnExpr2.isCustom = isCustom;
-  function is(expr) {
-    return isWildcard(expr) || isModelRef(expr) || isDeploymentRef(expr) || isElementKindExpr(expr) || isElementTagExpr(expr);
-  }
-  FqnExpr2.is = is;
-  function unwrap(expr) {
-    if (isCustom(expr)) {
-      expr = expr.custom.expr;
-    }
-    if (isWhere(expr)) {
-      expr = expr.where.expr;
-    }
-    return expr;
-  }
-  FqnExpr2.unwrap = unwrap;
-})(FqnExpr || (FqnExpr = {}));
-var RelationExpr;
-((RelationExpr2) => {
-  function isDirect(expr) {
-    return "source" in expr && "target" in expr;
-  }
-  RelationExpr2.isDirect = isDirect;
-  function isIncoming(expr) {
-    return "incoming" in expr;
-  }
-  RelationExpr2.isIncoming = isIncoming;
-  function isOutgoing(expr) {
-    return "outgoing" in expr;
-  }
-  RelationExpr2.isOutgoing = isOutgoing;
-  function isInOut(expr) {
-    return "inout" in expr;
-  }
-  RelationExpr2.isInOut = isInOut;
-  function isWhere(expr) {
-    return "where" in expr && (isDirect(expr.where.expr) || isIncoming(expr.where.expr) || isOutgoing(expr.where.expr) || isInOut(expr.where.expr));
-  }
-  RelationExpr2.isWhere = isWhere;
-  function isCustom(expr) {
-    return "customRelation" in expr;
-  }
-  RelationExpr2.isCustom = isCustom;
-  function is(expr) {
-    return isDirect(expr) || isIncoming(expr) || isOutgoing(expr) || isInOut(expr);
-  }
-  RelationExpr2.is = is;
-  function unwrap(expr) {
-    if (isCustom(expr)) {
-      expr = expr.customRelation.expr;
-    }
-    if (isWhere(expr)) {
-      expr = expr.where.expr;
-    }
-    return expr;
-  }
-  RelationExpr2.unwrap = unwrap;
-})(RelationExpr || (RelationExpr = {}));
-var Expression;
-((Expression2) => {
-  function isWhere(expr) {
-    return "where" in expr;
-  }
-  Expression2.isWhere = isWhere;
-  function isRelationWhere(expr) {
-    return RelationExpr.isWhere(expr);
-  }
-  Expression2.isRelationWhere = isRelationWhere;
-  function isFqnExprWhere(expr) {
-    return FqnExpr.isWhere(expr);
-  }
-  Expression2.isFqnExprWhere = isFqnExprWhere;
-  function isFqnExpr(expr) {
-    return FqnExpr.is(expr) || FqnExpr.isWhere(expr) || FqnExpr.isCustom(expr);
-  }
-  Expression2.isFqnExpr = isFqnExpr;
-  function isRelation(expr) {
-    return RelationExpr.is(expr) || RelationExpr.isWhere(expr) || RelationExpr.isCustom(expr);
-  }
-  Expression2.isRelation = isRelation;
-})(Expression || (Expression = {}));
-
-var ModelFqnExpr;
-((ModelFqnExpr2) => {
-  function isWildcard(expr) {
-    return "wildcard" in expr && expr.wildcard === true;
-  }
-  ModelFqnExpr2.isWildcard = isWildcard;
-  function isModelRef(ref) {
-    return "ref" in ref && FqnRef.isModelRef(ref.ref);
-  }
-  ModelFqnExpr2.isModelRef = isModelRef;
-  function isElementKindExpr(expr) {
-    return "elementKind" in expr && "isEqual" in expr;
-  }
-  ModelFqnExpr2.isElementKindExpr = isElementKindExpr;
-  function isElementTagExpr(expr) {
-    return "elementTag" in expr && "isEqual" in expr;
-  }
-  ModelFqnExpr2.isElementTagExpr = isElementTagExpr;
-  function isWhere(expr) {
-    return "where" in expr && is(expr.where.expr);
-  }
-  ModelFqnExpr2.isWhere = isWhere;
-  function isCustom(expr) {
-    return "custom" in expr && (is(expr.custom.expr) || isWhere(expr.custom.expr));
-  }
-  ModelFqnExpr2.isCustom = isCustom;
-  function is(expr) {
-    return isWildcard(expr) || isModelRef(expr) || isElementKindExpr(expr) || isElementTagExpr(expr);
-  }
-  ModelFqnExpr2.is = is;
-  function unwrap(expr) {
-    if (isCustom(expr)) {
-      expr = expr.custom.expr;
-    }
-    if (isWhere(expr)) {
-      expr = expr.where.expr;
-    }
-    return expr;
-  }
-  ModelFqnExpr2.unwrap = unwrap;
-})(ModelFqnExpr || (ModelFqnExpr = {}));
-var ModelRelationExpr;
-((ModelRelationExpr2) => {
-  function isDirect(expr) {
-    return "source" in expr && "target" in expr;
-  }
-  ModelRelationExpr2.isDirect = isDirect;
-  function isIncoming(expr) {
-    return "incoming" in expr;
-  }
-  ModelRelationExpr2.isIncoming = isIncoming;
-  function isOutgoing(expr) {
-    return "outgoing" in expr;
-  }
-  ModelRelationExpr2.isOutgoing = isOutgoing;
-  function isInOut(expr) {
-    return "inout" in expr;
-  }
-  ModelRelationExpr2.isInOut = isInOut;
-  function isWhere(expr) {
-    return "where" in expr && (isDirect(expr.where.expr) || isIncoming(expr.where.expr) || isOutgoing(expr.where.expr) || isInOut(expr.where.expr));
-  }
-  ModelRelationExpr2.isWhere = isWhere;
-  function isCustom(expr) {
-    return "customRelation" in expr;
-  }
-  ModelRelationExpr2.isCustom = isCustom;
-  function is(expr) {
-    return isDirect(expr) || isIncoming(expr) || isOutgoing(expr) || isInOut(expr);
-  }
-  ModelRelationExpr2.is = is;
-  function unwrap(expr) {
-    if (isCustom(expr)) {
-      expr = expr.customRelation.expr;
-    }
-    if (isWhere(expr)) {
-      expr = expr.where.expr;
-    }
-    return expr;
-  }
-  ModelRelationExpr2.unwrap = unwrap;
-})(ModelRelationExpr || (ModelRelationExpr = {}));
-var ModelExpression;
-((ModelExpression2) => {
-  function isWhere(expr) {
-    return "where" in expr;
-  }
-  ModelExpression2.isWhere = isWhere;
-  function isRelationWhere(expr) {
-    return ModelRelationExpr.isWhere(expr);
-  }
-  ModelExpression2.isRelationWhere = isRelationWhere;
-  function isFqnExprWhere(expr) {
-    return ModelFqnExpr.isWhere(expr);
-  }
-  ModelExpression2.isFqnExprWhere = isFqnExprWhere;
-  function isFqnExpr(expr) {
-    return ModelFqnExpr.is(expr) || ModelFqnExpr.isWhere(expr) || ModelFqnExpr.isCustom(expr);
-  }
-  ModelExpression2.isFqnExpr = isFqnExpr;
-  function isRelationExpr(expr) {
-    return ModelRelationExpr.is(expr) || ModelRelationExpr.isWhere(expr) || ModelRelationExpr.isCustom(expr);
-  }
-  ModelExpression2.isRelationExpr = isRelationExpr;
-})(ModelExpression || (ModelExpression = {}));
-
-function isViewRulePredicate(rule) {
-  return "include" in rule || "exclude" in rule;
-}
-function isViewRuleStyle(rule) {
-  return "targets" in rule && "style" in rule;
-}
-function isComputedView(view) {
-  return view._stage === "computed";
-}
-function isDiagramView(view) {
-  return view._stage === "layouted";
-}
-function isElementView(view) {
-  return view._type === "element";
-}
-function isScopedElementView(view) {
-  return isElementView(view) && n(view.viewOf);
-}
-function isExtendsElementView(view) {
-  return isElementView(view) && n(view.extends);
-}
-function isDeploymentView(view) {
-  return view._type === "deployment";
-}
-function isDynamicView(view) {
-  return view._type === "dynamic";
-}
-
-function isViewRuleGlobalStyle(rule) {
-  return "styleId" in rule;
-}
-function isViewRuleGlobalPredicateRef(rule) {
-  return "predicateId" in rule;
-}
-function isAutoLayoutDirection(autoLayout) {
-  return autoLayout === "TB" || autoLayout === "BT" || autoLayout === "LR" || autoLayout === "RL";
-}
-function isViewRuleAutoLayout(rule) {
-  return "direction" in rule;
-}
-
-function getParallelStepsPrefix(id) {
-  if (isStepEdgeId(id) && id.includes(".")) {
-    return id.slice(0, id.indexOf(".") + 1);
-  }
-  return null;
-}
-function isDynamicViewParallelSteps(step) {
-  return "__parallel" in step && o(step.__parallel);
-}
-
-function isViewRuleGroup(rule) {
-  return "title" in rule && "groupRules" in rule && Array.isArray(rule.groupRules);
-}
-
-export { Expression as E, FqnExpr as F, ModelFqnExpr as M, RelationExpr as R, ModelRelationExpr as a, ModelExpression as b, isViewRuleStyle as c, isComputedView as d, isDiagramView as e, isElementView as f, isScopedElementView as g, isExtendsElementView as h, isViewRulePredicate as i, isDeploymentView as j, isDynamicView as k, isViewRuleGlobalStyle as l, isViewRuleGlobalPredicateRef as m, isAutoLayoutDirection as n, isViewRuleAutoLayout as o, getParallelStepsPrefix as p, isDynamicViewParallelSteps as q, isViewRuleGroup as r, o as s };

package/dist/shared/core.BgvIuGGU.mjs

@@ -1,3 +0,0 @@
-function o(a){return t=>!a(t)}
-
-export { o };

package/dist/shared/core.BpJu1RrF.mjs

@@ -1,5 +0,0 @@
-import { u as u$1 } from './core.DbRvwARP.mjs';
-
-function k(...n){return u$1(u,n)}function u(n,e){if(n===e||Object.is(n,e))return  true;if(typeof n!="object"||typeof e!="object"||n===null||e===null||Object.getPrototypeOf(n)!==Object.getPrototypeOf(e))return  false;if(Array.isArray(n))return l(n,e);if(n instanceof Map)return a(n,e);if(n instanceof Set)return c(n,e);if(n instanceof Date)return n.getTime()===e.getTime();if(n instanceof RegExp)return n.toString()===e.toString();if(Object.keys(n).length!==Object.keys(e).length)return  false;for(let[r,t]of Object.entries(n))if(!(r in e)||!u(t,e[r]))return  false;return  true}function l(n,e){if(n.length!==e.length)return  false;for(let[r,t]of n.entries())if(!u(t,e[r]))return  false;return  true}function a(n,e){if(n.size!==e.size)return  false;for(let[r,t]of n.entries())if(!e.has(r)||!u(t,e.get(r)))return  false;return  true}function c(n,e){if(n.size!==e.size)return  false;let r=[...e];for(let t of n){let o=false;for(let[s,f]of r.entries())if(u(t,f)){o=true,r.splice(s,1);break}if(!o)return  false}return  true}
-
-export { k };

package/dist/shared/core.ByrmCl9I.mjs

@@ -1,5 +0,0 @@
-import { u } from './core.DbRvwARP.mjs';
-
-function m(...a){return u(o,a,p)}var o=(a,e)=>a.map(e),p=a=>(e,t,r)=>({done:false,hasNext:true,next:a(e,t,r)});
-
-export { m };

package/dist/shared/core.CnIyafWn.mjs

@@ -1,3 +0,0 @@
-function n(e){return !!e}
-
-export { n };