@likec4/core 1.40.0 → 1.42.0

package/dist/builder/index.mjs

@@ -1,16 +1,22 @@
-import defu from 'defu';
-import { isArray, isString, map, entries, mapValues, fromEntries, mapToObj, isNullish, pickBy, isNonNullish, hasAtLeast, isFunction } from 'remeda';
-import { c as computeLikeC4Model } from '../shared/core.DuR3R-xJ.mjs';
-import { n as nameFromFqn, d as isSameHierarchy, p as parentFqn } from '../shared/core.DgttqsJc.mjs';
+import { d as defu, t as t$6 } from '../shared/core.DNbUPnve.mjs';
+import { t as t$1, a as t$7 } from '../shared/core.BsSXS-_R.mjs';
+import { a as t$5 } from '../shared/core.C8sl5Y8Z.mjs';
+import { s as e, d as isElementView } from '../shared/core.BzTakU3I.mjs';
+import { e as e$3 } from '../shared/core.DRJma0Ol.mjs';
+import { a as _type, k as e$2, _ as _stage, c as isDeployedInstance } from '../shared/core.BYNkXQ8A.mjs';
+import { t as t$2 } from '../shared/core.CbT8JVYL.mjs';
+import { a as t$3, b as t$4, c as computeLikeC4Model } from '../shared/core.DSO_rTC2.mjs';
+import { n as nameFromFqn, d as isSameHierarchy, p as parentFqn } from '../shared/core.DRhg-gVU.mjs';
+import { e as e$1 } from '../shared/core.CqAJJpK_.mjs';
 import { ModelFqnExpr } from '../types/expression-model.mjs';
-import { a as _type, _ as _stage, c as isDeployedInstance } from '../shared/core.yHe79zEl.mjs';
 import { i as invariant } from '../shared/core.D4npX2q8.mjs';
-import { d as isElementView } from '../shared/core.T-eLZTW_.mjs';
+import { e as exact } from '../shared/core.01VTr9qu.mjs';
 import { FqnRef } from '../types/fqnRef.mjs';
-import { D as DefaultThemeColor, a as DefaultElementShape } from '../shared/core.DHQ32OHa.mjs';
+
+function t(...t){return t$1(Object.fromEntries,t)}
 
 function parseWhere(where) {
-  if (isString(where)) {
+  if (e$1(where)) {
     const op = where;
     switch (true) {
       case op.startsWith("tag is not #"):
@@ -57,12 +63,12 @@ function parseWhere(where) {
   }
   if (where.and) {
     return {
-      and: map(where.and, parseWhere)
+      and: t$2(where.and, parseWhere)
     };
   }
   if (where.or) {
     return {
-      or: map(where.or, parseWhere)
+      or: t$2(where.or, parseWhere)
     };
   }
   if (where.not) {
@@ -127,7 +133,7 @@ function $exclude(...args) {
 }
 function $style(element, { notation, ...style }) {
   return (b) => b.style({
-    targets: (isArray(element) ? element : [element]).map((e) => b.$expr(e)),
+    targets: (e(element) ? element : [element]).map((e) => b.$expr(e)),
     ...notation ? { notation } : {},
     style: {
       ...style
@@ -142,7 +148,7 @@ function $rules(...rules) {
 }
 
 function $deploymentExpr(expr) {
-  if (!isString(expr)) {
+  if (!e$1(expr)) {
     return expr;
   }
   const asTypedDeploymentExpression = (expr2) => {
@@ -216,7 +222,7 @@ const asTypedExpr = (expr) => {
   return expr;
 };
 function $expr(expr) {
-  if (!isString(expr)) {
+  if (!e$1(expr)) {
     return expr;
   }
   if (expr === "*") {
@@ -320,60 +326,68 @@ function mkViewBuilder(view) {
   return viewBuilder;
 }
 
-function validateSpec(specification) {
-  for (const [kind, spec] of entries(specification.elements)) {
+function ensureObj(value) {
+  return e(value) ? t$6(value, (_) => ({})) : value;
+}
+function validateSpec({ tags, elements, deployments, relationships, ...specification }) {
+  const spectags = {};
+  if (tags) {
+    Object.assign(
+      spectags,
+      ensureObj(tags)
+    );
+  }
+  const _elements = ensureObj(elements);
+  for (const [kind, spec] of t$5(_elements)) {
     if (spec.tags) {
       for (const tag of spec.tags) {
-        invariant(specification.tags?.[tag], `Invalid specification for element kind "${kind}": tag "${tag}" not found`);
+        invariant(tag in spectags, `Invalid specification for element kind "${kind}": tag "${tag}" not found`);
       }
     }
   }
-  if (specification.deployments) {
-    for (const [kind, spec] of entries(specification.deployments)) {
-      if (spec.tags) {
-        for (const tag of spec.tags) {
-          invariant(
-            specification.tags?.[tag],
-            `Invalid specification for deployment kind "${kind}": tag "${tag}" not found`
-          );
-        }
+  const _deployments = ensureObj(deployments ?? {});
+  for (const [kind, spec] of t$5(_deployments)) {
+    if (spec.tags) {
+      for (const tag of spec.tags) {
+        invariant(
+          tag in spectags,
+          `Invalid specification for deployment kind "${kind}": tag "${tag}" not found`
+        );
       }
     }
   }
+  return {
+    ...specification,
+    tags: spectags,
+    elements: _elements,
+    deployments: _deployments,
+    relationships: ensureObj(relationships ?? {})
+  };
 }
-function builder(spec, _elements = /* @__PURE__ */ new Map(), _relations = [], _views = /* @__PURE__ */ new Map(), _globals = {
+function builder(_spec, _elements = /* @__PURE__ */ new Map(), _relations = [], _views = /* @__PURE__ */ new Map(), _globals = {
   predicates: {},
   dynamicPredicates: {},
   styles: {}
 }, _deployments = /* @__PURE__ */ new Map(), _deploymentRelations = []) {
+  const spec = validateSpec(_spec);
   const toLikeC4Specification = () => {
-    validateSpec(spec);
     return {
-      elements: {
-        ...structuredClone(spec.elements)
-      },
-      deployments: {
-        ...structuredClone(spec.deployments)
-      },
-      relationships: {
-        ...structuredClone(spec.relationships)
-      },
-      tags: mapValues(spec.tags ?? {}, (tagSpec) => ({
-        color: DefaultThemeColor,
-        ...tagSpec
-      })),
-      ...!!spec.metadataKeys ? { metadataKeys: spec.metadataKeys } : {},
+      elements: structuredClone(spec.elements),
+      deployments: structuredClone(spec.deployments),
+      relationships: structuredClone(spec.relationships),
+      tags: structuredClone(spec.tags),
+      ...spec.metadataKeys ? { metadataKeys: spec.metadataKeys } : {},
       customColors: {}
     };
   };
   const mapLinks = (links) => {
-    if (!links || !hasAtLeast(links, 1)) {
-      return null;
+    if (!links || !t$7(links, 1)) {
+      return void 0;
     }
-    return map(links, (l) => typeof l === "string" ? { url: l } : l);
+    return t$2(links, (l) => typeof l === "string" ? { url: l } : l);
   };
   const createGenericView = (id, _props, builder2) => {
-    if (isFunction(_props)) {
+    if (e$3(_props)) {
       builder2 = _props;
       _props = {};
     }
@@ -386,15 +400,18 @@ function builder(spec, _elements = /* @__PURE__ */ new Map(), _relations = [], _
       ...props
     } = typeof _props === "string" ? { title: _props } : { ..._props };
     const links = mapLinks(_links);
-    return [{
-      id,
-      title,
-      description: description ? { txt: description } : null,
-      tags,
-      links,
-      _stage: "parsed",
-      ...props
-    }, builder2];
+    return [
+      exact({
+        id,
+        title,
+        description: description ? { txt: description } : null,
+        tags,
+        links,
+        _stage: "parsed",
+        ...props
+      }),
+      builder2
+    ];
   };
   const self = {
     get Types() {
@@ -427,9 +444,9 @@ function builder(spec, _elements = /* @__PURE__ */ new Map(), _relations = [], _
     },
     __addRelation(relation) {
       const sourceEl = _elements.get(FqnRef.flatten(relation.source));
-      invariant(sourceEl, `Element with id "${relation.source}" not found`);
+      invariant(sourceEl, `Element with id "${relation.source.model}" not found`);
       const targetEl = _elements.get(FqnRef.flatten(relation.target));
-      invariant(targetEl, `Element with id "${relation.target}" not found`);
+      invariant(targetEl, `Element with id "${relation.target.model}" not found`);
       invariant(
         !isSameHierarchy(sourceEl, targetEl),
         "Cannot create relationship between elements in the same hierarchy"
@@ -512,22 +529,22 @@ function builder(spec, _elements = /* @__PURE__ */ new Map(), _relations = [], _
         ...project
       },
       specification: toLikeC4Specification(),
-      elements: fromEntries(
+      elements: t(
         structuredClone(
           Array.from(_elements.entries())
         )
       ),
-      relations: mapToObj(_relations, (r) => [r.id, structuredClone(r)]),
+      relations: t$4(_relations, (r) => [r.id, structuredClone(r)]),
       globals: structuredClone(_globals),
       deployments: {
-        elements: fromEntries(
+        elements: t(
           structuredClone(
             Array.from(_deployments.entries())
           )
         ),
-        relations: mapToObj(_deploymentRelations, (r) => [r.id, structuredClone(r)])
+        relations: t$4(_deploymentRelations, (r) => [r.id, structuredClone(r)])
       },
-      views: fromEntries(
+      views: t(
         structuredClone(
           Array.from(_views.entries())
         )
@@ -557,7 +574,7 @@ function builder(spec, _elements = /* @__PURE__ */ new Map(), _relations = [], _
               { title: null, links: null }
             );
             const links = mapLinks(_links);
-            b.__addRelation({
+            b.__addRelation(exact({
               source: {
                 model: source
               },
@@ -566,9 +583,9 @@ function builder(spec, _elements = /* @__PURE__ */ new Map(), _relations = [], _
               },
               title,
               ...description && { description: { txt: description } },
-              ...links && { links },
+              links,
               ...props
-            });
+            }));
             return b;
           };
         },
@@ -576,63 +593,63 @@ function builder(spec, _elements = /* @__PURE__ */ new Map(), _relations = [], _
           return (b) => {
             const {
               title = "",
-              links: _links = [],
+              links,
               description = null,
               ...props
             } = defu(
               typeof _props === "string" ? { title: _props } : { ..._props },
               { title: null, links: null }
             );
-            const links = mapLinks(_links);
-            b.__addSourcelessRelation({
+            b.__addSourcelessRelation(exact({
               target: {
                 model: target
               },
               title,
               ...description && { description: { txt: description } },
-              ...links && { links },
+              links: mapLinks(links),
               ...props
-            });
+            }));
             return b;
           };
         },
-        ...mapValues(
+        ...t$3(
           spec.elements,
           ({ style: specStyle, ...spec2 }, kind) => (id, _props) => {
             const add = ((b) => {
               const {
-                links: _links,
+                links,
                 icon: _icon,
+                color,
+                shape,
                 style,
                 title,
-                description = null,
+                description,
+                summary,
                 ...props
               } = typeof _props === "string" ? { title: _props } : { ..._props };
-              const links = mapLinks(_links);
               const icon = _icon ?? specStyle?.icon;
               const _id = b.__fqn(id);
-              b.__addElement({
+              b.__addElement(exact({
                 id: _id,
                 kind,
                 title: title ?? nameFromFqn(_id),
                 ...description && { description: { txt: description } },
-                technology: null,
-                tags: [],
-                color: specStyle?.color ?? DefaultThemeColor,
-                shape: specStyle?.shape ?? DefaultElementShape,
-                style: pickBy({
+                ...summary && { summary: { txt: summary } },
+                style: exact({
+                  icon,
+                  color: color ?? specStyle?.color,
+                  shape: shape ?? specStyle?.shape,
                   border: specStyle?.border,
                   opacity: specStyle?.opacity,
                   size: specStyle?.size,
                   padding: specStyle?.padding,
                   textSize: specStyle?.textSize,
                   ...style
-                }, isNonNullish),
-                links,
-                ...icon && { icon },
+                }),
+                links: mapLinks(links),
                 ...spec2,
                 ...props
-              });
+              }));
               return b;
             });
             add.with = (...ops) => (b) => {
@@ -752,7 +769,7 @@ function builder(spec, _elements = /* @__PURE__ */ new Map(), _relations = [], _
         },
         instanceOf: (id, target, _props) => {
           return (b) => {
-            if (isNullish(target)) {
+            if (e$2(target)) {
               target = id;
               id = nameFromFqn(id);
             } else if (typeof target === "string") {
@@ -765,19 +782,33 @@ function builder(spec, _elements = /* @__PURE__ */ new Map(), _relations = [], _
             const {
               links,
               title,
-              description = null,
+              description,
+              summary,
+              icon,
+              color,
+              shape,
+              style,
               ...props
             } = typeof _props === "string" ? { title: _props } : { ..._props };
             const _id = b.__deploymentFqn(id);
             invariant(_elements.has(target), `Target element with id "${target}" not found`);
-            b.__addDeployment({
-              id: _id,
-              element: target,
-              ...title && { title },
-              ...description && { description: { txt: description } },
-              ...links && { links: mapLinks(links) },
-              ...props
-            });
+            b.__addDeployment(
+              exact({
+                id: _id,
+                element: target,
+                ...title && { title },
+                ...summary && { summary: { txt: summary } },
+                ...description && { description: { txt: description } },
+                style: exact({
+                  icon,
+                  color,
+                  shape,
+                  ...style
+                }),
+                links: mapLinks(links),
+                ...props
+              })
+            );
             return b;
           };
         },
@@ -789,7 +820,7 @@ function builder(spec, _elements = /* @__PURE__ */ new Map(), _relations = [], _
               description = null,
               ...props
             } = typeof _props === "string" ? { title: _props } : { ..._props };
-            b.__addDeploymentRelation({
+            b.__addDeploymentRelation(exact({
               source: {
                 deployment: source
               },
@@ -798,13 +829,13 @@ function builder(spec, _elements = /* @__PURE__ */ new Map(), _relations = [], _
               },
               title,
               ...description && { description: { txt: description } },
-              ...links && { links: mapLinks(links) },
+              links: mapLinks(links),
               ...props
-            });
+            }));
             return b;
           };
         },
-        ...mapValues(
+        ...t$3(
           spec.deployments ?? {},
           ({ style: specStyle, ...spec2 }, kind) => (id, _props) => {
             const add = ((b) => {
@@ -813,35 +844,37 @@ function builder(spec, _elements = /* @__PURE__ */ new Map(), _relations = [], _
                 icon: _icon,
                 style,
                 title,
-                description = null,
+                description,
+                summary,
+                color,
+                shape,
                 ...props
               } = typeof _props === "string" ? { title: _props } : { ..._props };
               const icon = _icon ?? specStyle?.icon;
               const _id = b.__deploymentFqn(id);
-              b.__addDeployment({
-                id: _id,
-                kind,
-                title: title ?? nameFromFqn(_id),
-                ...description && { description: { txt: description } },
-                technology: null,
-                tags: null,
-                style: {
-                  ...icon && { icon },
-                  color: specStyle?.color ?? DefaultThemeColor,
-                  shape: specStyle?.shape ?? DefaultElementShape,
-                  ...pickBy({
+              b.__addDeployment(
+                exact({
+                  id: _id,
+                  kind,
+                  title: title ?? nameFromFqn(_id),
+                  ...description && { description: { txt: description } },
+                  ...summary && { summary: { txt: summary } },
+                  style: exact({
+                    icon,
+                    color: color ?? specStyle?.color,
+                    shape: shape ?? specStyle?.shape,
                     border: specStyle?.border,
                     opacity: specStyle?.opacity,
                     size: specStyle?.size,
                     padding: specStyle?.padding,
                     textSize: specStyle?.textSize,
                     ...style
-                  }, isNonNullish)
-                },
-                ...links && { links: mapLinks(links) },
-                ...spec2,
-                ...props
-              });
+                  }),
+                  links: mapLinks(links),
+                  ...spec2,
+                  ...props
+                })
+              );
               return b;
             });
             add.with = (...ops) => (b) => {
@@ -886,22 +919,73 @@ function builder(spec, _elements = /* @__PURE__ */ new Map(), _relations = [], _
   };
   return self;
 }
-var Builder;
-((Builder2) => {
-  function forSpecification(spec) {
-    validateSpec(spec);
+const Builder = {
+  /**
+   * Creates a builder with compositional methods
+   *
+   * @example
+   * ```ts
+   * const {
+   *   model: { model, system, component, relTo },
+   *   deployment: { env, vm},
+   *   views: { view, $include },
+   *   builder,
+   * } = Builder.forSpecification({
+   *   elements: {
+   *     system: {},
+   *     component: {},
+   *   },
+   *   deployments: ['env', 'vm'],
+   * })
+   *
+   * const b = builder
+   *   .with(
+   *     model(
+   *       system('cloud').with(
+   *         component('backend'),
+   *         component('backend.api'),
+   *         component('frontend').with(
+   *           relTo('cloud.backend.api'),
+   *         ),
+   *       ),
+   *     ),
+   *   )
+   * ```
+   */
+  forSpecification(spec) {
     const b = builder(spec);
     return {
       ...b.helpers(),
       builder: b
     };
-  }
-  Builder2.forSpecification = forSpecification;
-  function specification(spec) {
-    validateSpec(spec);
+  },
+  /**
+   * Creates a builder with chainable methods
+   *
+   * @example
+   * ```ts
+   * const b = Builder
+   *   .specification({
+   *     elements: ['system', 'component'],
+   *     deployments: ['env', 'vm'],
+   *   })
+   *   .model(({ system, component, relTo }, _) =>
+   *     _(
+   *       system('cloud').with(
+   *         component('backend').with(
+   *           component('api'),
+   *         ),
+   *         component('frontend').with(
+   *           relTo('cloud.backend.api'),
+   *         )
+   *       )
+   *     )
+   *   )
+   * ```
+   */
+  specification(spec) {
     return builder(spec);
   }
-  Builder2.specification = specification;
-})(Builder || (Builder = {}));
+};
 
 export { Builder };

package/dist/compute-view/index.d.mts

@@ -1,14 +1,15 @@
-import { A as Any } from '../shared/core.D_fI5Lf6.mjs';
-import { g as LikeC4Model } from '../shared/core.CySf-2gP.mjs';
-import { h as ParsedLikeC4ModelData, C as ComputedLikeC4ModelData, $ as ParsedView, a2 as ComputedView } from '../shared/core.Bpou6c2f.mjs';
+import { A as Any } from '../shared/core.Dgs6-nuz.mjs';
+import { f as LikeC4Model } from '../shared/core.D0PjZzIS.mjs';
+import { P as ParsedLikeC4ModelData, C as ComputedLikeC4ModelData, r as ParsedView, u as ComputedView } from '../shared/core.DdMJk7nx.mjs';
 import 'type-fest';
-import '../shared/core.DrvfVXkh.mjs';
+import '../shared/core.D5fzJWbF.mjs';
 import '../shared/core.DX-WYEPA.mjs';
-import '../shared/core.CywrQs86.mjs';
-import '../shared/core.CzdwsPmY.mjs';
-import '../shared/core.BbThmf6M.mjs';
+import '../shared/core.yna0OdV5.mjs';
+import '../shared/core.CQngdcuj.mjs';
 import '../types/fqnRef.mjs';
+import '../shared/core.fHR_8Tnq.mjs';
 import '../types/expression-model.mjs';
+import '../shared/core.CywrQs86.mjs';
 
 type ComputeViewResult<V> = {
     isSuccess: true;

package/dist/compute-view/index.mjs

@@ -1,15 +1,18 @@
-import { G as Graph, w as willCreateCycle, t as topologicalSortExports } from '../shared/core.DuR3R-xJ.mjs';
-export { c as computeLikeC4Model, a as computeParsedModelData, b as computeView, u as unsafeComputeView } from '../shared/core.DuR3R-xJ.mjs';
-import { values, unique, mapValues, omit, mapToObj, map } from 'remeda';
-import { f as isExtendsElementView, d as isElementView } from '../shared/core.T-eLZTW_.mjs';
-import { c as isNonEmptyArray } from '../shared/core.DgttqsJc.mjs';
+import { w as willCreateCycle, t as topologicalSortExports, a as t$1, b as t$2, n as n$1 } from '../shared/core.DSO_rTC2.mjs';
+export { c as computeLikeC4Model, d as computeParsedModelData, e as computeView, u as unsafeComputeView } from '../shared/core.DSO_rTC2.mjs';
+import { n } from '../shared/core.BIqHjQiH.mjs';
+import { t } from '../shared/core.C8sl5Y8Z.mjs';
+import { f as isExtendsElementView, d as isElementView } from '../shared/core.BzTakU3I.mjs';
+import { G as Graph } from '../shared/core.CNgZvKb8.mjs';
+import { c as isNonEmptyArray } from '../shared/core.DRhg-gVU.mjs';
+import { t as t$3 } from '../shared/core.CbT8JVYL.mjs';
 
 function resolveRulesExtendedViews(unresolvedViews) {
   const g = new Graph({
     type: "directed"
   });
   const extendedViews = [];
-  for (const view of values(unresolvedViews)) {
+  for (const view of t(unresolvedViews)) {
     g.addNode(view.id, { view });
     if (isExtendsElementView(view)) {
       extendedViews.push(view);
@@ -40,7 +43,7 @@ function resolveRulesExtendedViews(unresolvedViews) {
     if (!extendsFrom || !isElementView(extendsFrom)) {
       return acc;
     }
-    const tags = unique([
+    const tags = n([
       ...extendsFrom.tags ?? [],
       ...view.tags ?? []
     ]);
@@ -62,7 +65,7 @@ function resolveRulesExtendedViews(unresolvedViews) {
 }
 
 function withReadableEdges({ edges, nodes, ...view }, separator = ":") {
-  const edgeids = mapToObj(edges, (e) => [e.id, `${e.source}${separator}${e.target}`]);
+  const edgeids = t$2(edges, (e) => [e.id, `${e.source}${separator}${e.target}`]);
   return {
     ...view,
     edges: edges.map((e) => ({
@@ -71,8 +74,8 @@ function withReadableEdges({ edges, nodes, ...view }, separator = ":") {
     })),
     nodes: nodes.map((n) => ({
       ...n,
-      inEdges: map(n.inEdges, (e) => edgeids[e]),
-      outEdges: map(n.outEdges, (e) => edgeids[e])
+      inEdges: t$3(n.inEdges, (e) => edgeids[e]),
+      outEdges: t$3(n.outEdges, (e) => edgeids[e])
     })),
     nodeIds: nodes.map((n) => n.id),
     edgeIds: edges.map((e) => edgeids[e.id])
@@ -81,7 +84,7 @@ function withReadableEdges({ edges, nodes, ...view }, separator = ":") {
 function viewsWithReadableEdges({ views, ...model }) {
   return {
     ...model,
-    views: mapValues(views, (v) => omit(withReadableEdges(v), ["nodeIds", "edgeIds"]))
+    views: t$1(views, (v) => n$1(withReadableEdges(v), ["nodeIds", "edgeIds"]))
   };
 }
 

package/dist/compute-view/relationships-view/index.d.mts

@@ -1,14 +1,15 @@
-import { A as Any, U as Unknown, j as ElementId, V as ViewId } from '../../shared/core.D_fI5Lf6.mjs';
-import { E as ElementModel, R as RelationshipModel, g as LikeC4Model } from '../../shared/core.CySf-2gP.mjs';
+import { A as Any, U as Unknown, k as ElementId, V as ViewId } from '../../shared/core.Dgs6-nuz.mjs';
+import { E as ElementModel, R as RelationshipModel, f as LikeC4Model } from '../../shared/core.D0PjZzIS.mjs';
 import 'type-fest';
-import '../../shared/core.DrvfVXkh.mjs';
+import '../../shared/core.D5fzJWbF.mjs';
 import '../../shared/core.DX-WYEPA.mjs';
-import '../../shared/core.CywrQs86.mjs';
-import '../../shared/core.Bpou6c2f.mjs';
-import '../../types/expression-model.mjs';
-import '../../shared/core.BbThmf6M.mjs';
+import '../../shared/core.yna0OdV5.mjs';
+import '../../shared/core.CQngdcuj.mjs';
 import '../../types/fqnRef.mjs';
-import '../../shared/core.CzdwsPmY.mjs';
+import '../../shared/core.fHR_8Tnq.mjs';
+import '../../types/expression-model.mjs';
+import '../../shared/core.CywrQs86.mjs';
+import '../../shared/core.DdMJk7nx.mjs';
 
 type RelationshipsViewData<M extends Any = Unknown> = {
     incomers: ReadonlySet<ElementModel<M>>;