@likec4/diagram 1.44.0 → 1.45.0

package/dist/overlays/overlaysActor.d.ts

@@ -1,7 +1,6 @@
 import { Fqn } from '@likec4/core/types';
-import { ActorRefFromLogic, SnapshotFrom, StateMachine, CallbackActorLogic, EventObject, NonReducibleUnknown, Values, MetaObject, ActionFunction, StopAction } from 'xstate';
+import { ActorRef, SnapshotFrom, StateMachine } from 'xstate';
 import { Overlays } from './types';
-import { ElementDetailsLogic } from './element-details/actor';
 export type OverlayActorEvent = {
     type: 'open.elementDetails';
 } & Overlays.ElementDetails.Input | {
@@ -38,397 +37,13 @@ export type OverlayActorEmitedEvent = {
 } | {
     type: 'idle';
 };
-declare const _overlaysActorLogic: StateMachine<OverlaysContext, OverlayActorEvent, {
-    [x: `elementDetails-${number}`]: ActorRefFromLogic< ElementDetailsLogic> | undefined;
-    [x: `relationshipsBrowser-${number}`]: ActorRefFromLogic<Overlays.RelationshipsBrowser.Logic> | undefined;
-    [x: `relationshipDetails-${number}`]: ActorRefFromLogic<Overlays.RelationshipDetails.Logic> | undefined;
-    hotkey?: ActorRefFromLogic< CallbackActorLogic<EventObject, NonReducibleUnknown, EventObject>>;
-}, Values<{
-    elementDetails: {
-        src: "elementDetails";
-        logic: ElementDetailsLogic;
-        id: `elementDetails-${number}`;
-    };
-    relationshipsBrowser: {
-        src: "relationshipsBrowser";
-        logic: Overlays.RelationshipsBrowser.Logic;
-        id: `relationshipsBrowser-${number}`;
-    };
-    relationshipDetails: {
-        src: "relationshipDetails";
-        logic: Overlays.RelationshipDetails.Logic;
-        id: `relationshipDetails-${number}`;
-    };
-    hotkey: {
-        src: "hotkey";
-        logic: CallbackActorLogic<EventObject, NonReducibleUnknown, EventObject>;
-        id: "hotkey";
-    };
-}>, never, Values<{
-    "has overlays?": {
-        type: "has overlays?";
-        params: unknown;
-    };
-    "close specific overlay?": {
-        type: "close specific overlay?";
-        params: unknown;
-    };
-    "last: is relationshipDetails?": {
-        type: "last: is relationshipDetails?";
-        params: unknown;
-    };
-    "last: is relationshipsBrowser?": {
-        type: "last: is relationshipsBrowser?";
-        params: unknown;
-    };
-}>, never, "active" | "idle" | "closing", string, NonReducibleUnknown, NonReducibleUnknown, OverlayActorEmitedEvent, MetaObject, {
-    readonly id: "overlays";
-    readonly context: () => {
-        seq: number;
-        overlays: never[];
-    };
-    readonly initial: "idle";
-    readonly on: {
-        readonly 'open.elementDetails': {
-            readonly actions: ActionFunction<OverlaysContext, OverlayActorEvent, OverlayActorEvent, undefined, Values<{
-                elementDetails: {
-                    src: "elementDetails";
-                    logic: ElementDetailsLogic;
-                    id: `elementDetails-${number}`;
-                };
-                relationshipsBrowser: {
-                    src: "relationshipsBrowser";
-                    logic: Overlays.RelationshipsBrowser.Logic;
-                    id: `relationshipsBrowser-${number}`;
-                };
-                relationshipDetails: {
-                    src: "relationshipDetails";
-                    logic: Overlays.RelationshipDetails.Logic;
-                    id: `relationshipDetails-${number}`;
-                };
-                hotkey: {
-                    src: "hotkey";
-                    logic: CallbackActorLogic<EventObject, NonReducibleUnknown, EventObject>;
-                    id: "hotkey";
-                };
-            }>, never, Values<{
-                "has overlays?": {
-                    type: "has overlays?";
-                    params: unknown;
-                };
-                "close specific overlay?": {
-                    type: "close specific overlay?";
-                    params: unknown;
-                };
-                "last: is relationshipDetails?": {
-                    type: "last: is relationshipDetails?";
-                    params: unknown;
-                };
-                "last: is relationshipsBrowser?": {
-                    type: "last: is relationshipsBrowser?";
-                    params: unknown;
-                };
-            }>, never, OverlayActorEmitedEvent>;
-            readonly target: ".active";
-            readonly reenter: false;
-        };
-        readonly 'open.relationshipDetails': {
-            readonly actions: ActionFunction<OverlaysContext, OverlayActorEvent, OverlayActorEvent, undefined, Values<{
-                elementDetails: {
-                    src: "elementDetails";
-                    logic: ElementDetailsLogic;
-                    id: `elementDetails-${number}`;
-                };
-                relationshipsBrowser: {
-                    src: "relationshipsBrowser";
-                    logic: Overlays.RelationshipsBrowser.Logic;
-                    id: `relationshipsBrowser-${number}`;
-                };
-                relationshipDetails: {
-                    src: "relationshipDetails";
-                    logic: Overlays.RelationshipDetails.Logic;
-                    id: `relationshipDetails-${number}`;
-                };
-                hotkey: {
-                    src: "hotkey";
-                    logic: CallbackActorLogic<EventObject, NonReducibleUnknown, EventObject>;
-                    id: "hotkey";
-                };
-            }>, never, Values<{
-                "has overlays?": {
-                    type: "has overlays?";
-                    params: unknown;
-                };
-                "close specific overlay?": {
-                    type: "close specific overlay?";
-                    params: unknown;
-                };
-                "last: is relationshipDetails?": {
-                    type: "last: is relationshipDetails?";
-                    params: unknown;
-                };
-                "last: is relationshipsBrowser?": {
-                    type: "last: is relationshipsBrowser?";
-                    params: unknown;
-                };
-            }>, never, OverlayActorEmitedEvent>;
-            readonly target: ".active";
-            readonly reenter: false;
-        };
-        readonly 'open.relationshipsBrowser': {
-            readonly actions: ActionFunction<OverlaysContext, OverlayActorEvent, OverlayActorEvent, undefined, Values<{
-                elementDetails: {
-                    src: "elementDetails";
-                    logic: ElementDetailsLogic;
-                    id: `elementDetails-${number}`;
-                };
-                relationshipsBrowser: {
-                    src: "relationshipsBrowser";
-                    logic: Overlays.RelationshipsBrowser.Logic;
-                    id: `relationshipsBrowser-${number}`;
-                };
-                relationshipDetails: {
-                    src: "relationshipDetails";
-                    logic: Overlays.RelationshipDetails.Logic;
-                    id: `relationshipDetails-${number}`;
-                };
-                hotkey: {
-                    src: "hotkey";
-                    logic: CallbackActorLogic<EventObject, NonReducibleUnknown, EventObject>;
-                    id: "hotkey";
-                };
-            }>, never, Values<{
-                "has overlays?": {
-                    type: "has overlays?";
-                    params: unknown;
-                };
-                "close specific overlay?": {
-                    type: "close specific overlay?";
-                    params: unknown;
-                };
-                "last: is relationshipDetails?": {
-                    type: "last: is relationshipDetails?";
-                    params: unknown;
-                };
-                "last: is relationshipsBrowser?": {
-                    type: "last: is relationshipsBrowser?";
-                    params: unknown;
-                };
-            }>, never, OverlayActorEmitedEvent>;
-            readonly target: ".active";
-            readonly reenter: false;
-        };
-    };
-    readonly states: {
-        readonly idle: {};
-        readonly active: {
-            readonly entry: ActionFunction<OverlaysContext, OverlayActorEvent, OverlayActorEvent, undefined, Values<{
-                elementDetails: {
-                    src: "elementDetails";
-                    logic: ElementDetailsLogic;
-                    id: `elementDetails-${number}`;
-                };
-                relationshipsBrowser: {
-                    src: "relationshipsBrowser";
-                    logic: Overlays.RelationshipsBrowser.Logic;
-                    id: `relationshipsBrowser-${number}`;
-                };
-                relationshipDetails: {
-                    src: "relationshipDetails";
-                    logic: Overlays.RelationshipDetails.Logic;
-                    id: `relationshipDetails-${number}`;
-                };
-                hotkey: {
-                    src: "hotkey";
-                    logic: CallbackActorLogic<EventObject, NonReducibleUnknown, EventObject>;
-                    id: "hotkey";
-                };
-            }>, never, never, never, never>;
-            readonly exit: StopAction<OverlaysContext, OverlayActorEvent, undefined, OverlayActorEvent>;
-            readonly on: {
-                readonly close: readonly [{
-                    readonly guard: "close specific overlay?";
-                    readonly actions: ActionFunction<OverlaysContext, OverlayActorEvent, OverlayActorEvent, undefined, Values<{
-                        elementDetails: {
-                            src: "elementDetails";
-                            logic: ElementDetailsLogic;
-                            id: `elementDetails-${number}`;
-                        };
-                        relationshipsBrowser: {
-                            src: "relationshipsBrowser";
-                            logic: Overlays.RelationshipsBrowser.Logic;
-                            id: `relationshipsBrowser-${number}`;
-                        };
-                        relationshipDetails: {
-                            src: "relationshipDetails";
-                            logic: Overlays.RelationshipDetails.Logic;
-                            id: `relationshipDetails-${number}`;
-                        };
-                        hotkey: {
-                            src: "hotkey";
-                            logic: CallbackActorLogic<EventObject, NonReducibleUnknown, EventObject>;
-                            id: "hotkey";
-                        };
-                    }>, never, Values<{
-                        "has overlays?": {
-                            type: "has overlays?";
-                            params: unknown;
-                        };
-                        "close specific overlay?": {
-                            type: "close specific overlay?";
-                            params: unknown;
-                        };
-                        "last: is relationshipDetails?": {
-                            type: "last: is relationshipDetails?";
-                            params: unknown;
-                        };
-                        "last: is relationshipsBrowser?": {
-                            type: "last: is relationshipsBrowser?";
-                            params: unknown;
-                        };
-                    }>, never, OverlayActorEmitedEvent>;
-                    readonly target: "closing";
-                }, {
-                    readonly actions: ActionFunction<OverlaysContext, OverlayActorEvent, OverlayActorEvent, undefined, Values<{
-                        elementDetails: {
-                            src: "elementDetails";
-                            logic: ElementDetailsLogic;
-                            id: `elementDetails-${number}`;
-                        };
-                        relationshipsBrowser: {
-                            src: "relationshipsBrowser";
-                            logic: Overlays.RelationshipsBrowser.Logic;
-                            id: `relationshipsBrowser-${number}`;
-                        };
-                        relationshipDetails: {
-                            src: "relationshipDetails";
-                            logic: Overlays.RelationshipDetails.Logic;
-                            id: `relationshipDetails-${number}`;
-                        };
-                        hotkey: {
-                            src: "hotkey";
-                            logic: CallbackActorLogic<EventObject, NonReducibleUnknown, EventObject>;
-                            id: "hotkey";
-                        };
-                    }>, never, Values<{
-                        "has overlays?": {
-                            type: "has overlays?";
-                            params: unknown;
-                        };
-                        "close specific overlay?": {
-                            type: "close specific overlay?";
-                            params: unknown;
-                        };
-                        "last: is relationshipDetails?": {
-                            type: "last: is relationshipDetails?";
-                            params: unknown;
-                        };
-                        "last: is relationshipsBrowser?": {
-                            type: "last: is relationshipsBrowser?";
-                            params: unknown;
-                        };
-                    }>, never, OverlayActorEmitedEvent>;
-                    readonly target: "closing";
-                }];
-                readonly 'close.all': {
-                    readonly actions: readonly [ ActionFunction<OverlaysContext, OverlayActorEvent, OverlayActorEvent, undefined, Values<{
-                        elementDetails: {
-                            src: "elementDetails";
-                            logic: ElementDetailsLogic;
-                            id: `elementDetails-${number}`;
-                        };
-                        relationshipsBrowser: {
-                            src: "relationshipsBrowser";
-                            logic: Overlays.RelationshipsBrowser.Logic;
-                            id: `relationshipsBrowser-${number}`;
-                        };
-                        relationshipDetails: {
-                            src: "relationshipDetails";
-                            logic: Overlays.RelationshipDetails.Logic;
-                            id: `relationshipDetails-${number}`;
-                        };
-                        hotkey: {
-                            src: "hotkey";
-                            logic: CallbackActorLogic<EventObject, NonReducibleUnknown, EventObject>;
-                            id: "hotkey";
-                        };
-                    }>, never, Values<{
-                        "has overlays?": {
-                            type: "has overlays?";
-                            params: unknown;
-                        };
-                        "close specific overlay?": {
-                            type: "close specific overlay?";
-                            params: unknown;
-                        };
-                        "last: is relationshipDetails?": {
-                            type: "last: is relationshipDetails?";
-                            params: unknown;
-                        };
-                        "last: is relationshipsBrowser?": {
-                            type: "last: is relationshipsBrowser?";
-                            params: unknown;
-                        };
-                    }>, never, OverlayActorEmitedEvent>, StopAction<OverlaysContext, OverlayActorEvent, undefined, OverlayActorEvent>];
-                    readonly target: "idle";
-                };
-            };
-        };
-        readonly closing: {
-            readonly always: readonly [{
-                readonly guard: "has overlays?";
-                readonly target: "active";
-            }, {
-                readonly actions: StopAction<OverlaysContext, OverlayActorEvent, undefined, OverlayActorEvent>;
-                readonly target: "idle";
-            }];
-        };
-    };
-    readonly exit: readonly [ StopAction<OverlaysContext, OverlayActorEvent, undefined, OverlayActorEvent>, ActionFunction<OverlaysContext, OverlayActorEvent, OverlayActorEvent, undefined, Values<{
-        elementDetails: {
-            src: "elementDetails";
-            logic: ElementDetailsLogic;
-            id: `elementDetails-${number}`;
-        };
-        relationshipsBrowser: {
-            src: "relationshipsBrowser";
-            logic: Overlays.RelationshipsBrowser.Logic;
-            id: `relationshipsBrowser-${number}`;
-        };
-        relationshipDetails: {
-            src: "relationshipDetails";
-            logic: Overlays.RelationshipDetails.Logic;
-            id: `relationshipDetails-${number}`;
-        };
-        hotkey: {
-            src: "hotkey";
-            logic: CallbackActorLogic<EventObject, NonReducibleUnknown, EventObject>;
-            id: "hotkey";
-        };
-    }>, never, Values<{
-        "has overlays?": {
-            type: "has overlays?";
-            params: unknown;
-        };
-        "close specific overlay?": {
-            type: "close specific overlay?";
-            params: unknown;
-        };
-        "last: is relationshipDetails?": {
-            type: "last: is relationshipDetails?";
-            params: unknown;
-        };
-        "last: is relationshipsBrowser?": {
-            type: "last: is relationshipsBrowser?";
-            params: unknown;
-        };
-    }>, never, OverlayActorEmitedEvent>];
-}>;
-type InferredMachine = typeof _overlaysActorLogic;
-export interface OverlaysActorLogic extends InferredMachine {
+export interface OverlaysActorLogic extends StateMachine<OverlaysContext, OverlayActorEvent, {
+    [key: `elementDetails-${number}`]: Overlays.ElementDetails.ActorRef | undefined;
+    [key: `relationshipDetails-${number}`]: Overlays.RelationshipDetails.ActorRef | undefined;
+    [key: `relationshipsBrowser-${number}`]: Overlays.RelationshipsBrowser.ActorRef | undefined;
+}, any, any, any, any, any, never, never, any, OverlayActorEmitedEvent, any, any> {
 }
 export declare const overlaysActorLogic: OverlaysActorLogic;
 export type OverlaysActorSnapshot = SnapshotFrom<OverlaysActorLogic>;
-export interface OverlaysActorRef extends ActorRefFromLogic<OverlaysActorLogic> {
+export interface OverlaysActorRef extends ActorRef<OverlaysActorSnapshot, OverlayActorEvent, OverlayActorEmitedEvent> {
 }
-export {};

package/dist/overlays/overlaysActor.js

@@ -4,6 +4,7 @@ import { setup, fromCallback, assertEvent } from 'xstate';
 import { elementDetailsLogic } from './element-details/actor.js';
 import { relationshipDetailsLogic } from './relationship-details/actor.js';
 import { relationshipsBrowserLogic } from './relationships-browser/actor.js';
+import { x as xstateGuards_cjsExports } from '../_virtual/xstate-guards.cjs.js';
 
 const hotkeyLogic = fromCallback(({ sendBack }) => {
   const handler = getHotkeyHandler([
@@ -99,8 +100,8 @@ const openElementDetails = () => machine.enqueueActions(({ context, enqueue, eve
     overlays: [
       ...context.overlays,
       {
-        type: "elementDetails",
         id,
+        type: "elementDetails",
         subject: event.subject
       }
     ]
@@ -126,8 +127,8 @@ const openRelationshipDetails = () => machine.enqueueActions(({ context, enqueue
     overlays: [
       ...context.overlays,
       {
-        type: "relationshipDetails",
-        id
+        id,
+        type: "relationshipDetails"
       }
     ]
   });
@@ -153,17 +154,42 @@ const openRelationshipsBrowser = () => machine.enqueueActions(({ context, enqueu
     overlays: [
       ...context.overlays,
       {
-        type: "relationshipsBrowser",
         id,
+        type: "relationshipsBrowser",
         subject: event.subject
       }
     ]
   });
 });
+const openOverlay = () => machine.enqueueActions(({ enqueue, event }) => {
+  console.log("openOverlay event", event);
+  assertEvent(event, [
+    "open.elementDetails",
+    "open.relationshipDetails",
+    "open.relationshipsBrowser"
+  ]);
+  switch (event.type) {
+    case "open.elementDetails":
+      enqueue(openElementDetails());
+      break;
+    case "open.relationshipDetails":
+      enqueue(openRelationshipDetails());
+      break;
+    case "open.relationshipsBrowser":
+      enqueue(openRelationshipsBrowser());
+      break;
+  }
+});
 const listenToEsc = () => machine.spawnChild("hotkey", {
   id: "hotkey"
 });
 const stopListeningToEsc = () => machine.stopChild("hotkey");
+const checkState = () => machine.enqueueActions(({ enqueue, context }) => {
+  if (context.overlays.length === 0) {
+    console.log("No overlays left, raising close event");
+    enqueue.raise({ type: "close" });
+  }
+});
 const _overlaysActorLogic = machine.createMachine({
   id: "overlays",
   context: () => ({
@@ -171,66 +197,61 @@ const _overlaysActorLogic = machine.createMachine({
     overlays: []
   }),
   initial: "idle",
-  on: {
-    "open.elementDetails": {
-      actions: openElementDetails(),
-      target: ".active",
-      reenter: false
-    },
-    "open.relationshipDetails": {
-      actions: openRelationshipDetails(),
-      target: ".active",
-      reenter: false
-    },
-    "open.relationshipsBrowser": {
-      actions: openRelationshipsBrowser(),
-      target: ".active",
-      reenter: false
-    }
-  },
   states: {
-    idle: {},
+    idle: {
+      on: {
+        "open.*": {
+          actions: openOverlay(),
+          target: "active"
+        }
+      }
+    },
     active: {
-      entry: listenToEsc(),
-      exit: stopListeningToEsc(),
+      entry: [
+        listenToEsc()
+      ],
+      exit: [
+        stopListeningToEsc()
+      ],
       on: {
+        "open.*": {
+          actions: openOverlay()
+        },
         "close": [
+          {
+            guard: xstateGuards_cjsExports.not("has overlays?"),
+            target: "idle"
+          },
           {
             guard: "close specific overlay?",
-            actions: closeSpecificOverlay(),
-            target: "closing"
+            actions: [
+              closeSpecificOverlay(),
+              checkState()
+            ]
           },
           {
-            actions: closeLastOverlay(),
-            target: "closing"
+            actions: [
+              closeLastOverlay(),
+              checkState()
+            ]
           }
         ],
         "close.all": {
           actions: [
-            closeAllOverlays(),
-            stopListeningToEsc()
+            closeAllOverlays()
           ],
           target: "idle"
         }
       }
     },
-    closing: {
-      always: [
-        {
-          guard: "has overlays?",
-          target: "active"
-        },
-        {
-          actions: stopListeningToEsc(),
-          target: "idle"
-        }
-      ]
+    final: {
+      entry: [
+        closeAllOverlays(),
+        stopListeningToEsc()
+      ],
+      type: "final"
     }
-  },
-  exit: [
-    stopListeningToEsc(),
-    closeAllOverlays()
-  ]
+  }
 });
 const overlaysActorLogic = _overlaysActorLogic;
 

package/dist/overlays/relationship-details/_types.d.ts

@@ -1,4 +1,4 @@
-import { Color, DiagramNode, ExclusiveUnion, Fqn, IconUrl, RelationId, RelationshipArrowType, RelationshipLineType, RichTextOrEmpty, ViewId } from '@likec4/core/types';
+import { Color, DiagramNode, ExclusiveUnion, Fqn, IconUrl, MarkdownOrString, RelationId, RelationshipArrowType, RelationshipLineType, ViewId } from '@likec4/core/types';
 import { FunctionComponent } from 'react';
 import { Simplify } from 'type-fest';
 import { BaseEdge, BaseEdgeData, BaseEdgeProps, BaseNode, BaseNodeData, BaseNodeProps, NonOptional } from '../../base/types';
@@ -11,12 +11,11 @@ export declare namespace RelationshipDetailsTypes {
         in: string[];
         out: string[];
     };
-    type ElementNodeData = Simplify<BaseNodeData & NonOptional<Pick<DiagramNode, 'id' | 'title' | 'technology' | 'color' | 'shape' | 'width' | 'height' | 'navigateTo' | 'style' | 'tags'>> & {
+    type ElementNodeData = Simplify<BaseNodeData & NonOptional<Pick<DiagramNode, 'id' | 'title' | 'technology' | 'description' | 'color' | 'shape' | 'width' | 'height' | 'navigateTo' | 'style' | 'tags'>> & {
         column: Column;
         fqn: Fqn;
         icon: IconUrl;
         ports: Ports;
-        description: RichTextOrEmpty;
     }>;
     type CompoundNodeData = Simplify<BaseNodeData & NonOptional<Pick<DiagramNode, 'id' | 'title' | 'color' | 'style'>> & {
         column: Column;
@@ -51,7 +50,7 @@ export declare namespace RelationshipDetailsTypes {
         line: RelationshipLineType;
         head?: RelationshipArrowType;
         tail?: RelationshipArrowType;
-        description: RichTextOrEmpty;
+        description: MarkdownOrString | null;
     }>;
     type Edge = BaseEdge<EdgeData, 'relationship'>;
     type EdgeProps = BaseEdgeProps<Edge>;