@likec4/diagram 1.47.0 → 1.48.0

package/dist/editor/{editorActor.js → editorActor.states.js}

@@ -1,44 +1,11 @@
 import { find } from 'remeda';
-import { setup, assign, fromPromise, enqueueActions, sendTo, log } from 'xstate';
-import { cancelSync, stopHotkey, undo, markHistoryAsSynched, reschedule, isLayoutChange, withoutSnapshotChanges, addSnapshotToPendingChanges, ensureHotKey, pushHistory, saveStateBeforeEdit, stopEditing, startEditing } from './editorActor.actions.js';
-import { hotkeyActorLogic } from './hotkeyActor.js';
+import { assign, enqueueActions, log, sendTo } from 'xstate';
+import { cancelSync, stopHotkey, undo, markHistoryAsSynched, isLayoutChange, withoutSnapshotChanges, addSnapshotToPendingChanges, ensureHotKey, reschedule, pushHistory, saveStateBeforeEdit, stopEditing, startEditing } from './editorActor.actions.js';
+import { machine } from './editorActor.setup.js';
 
-const applyLatest = fromPromise(
-  () => {
-    throw new Error("Not implemented");
-  }
-);
-const executeChange = fromPromise(
-  () => {
-    throw new Error("Not implemented");
-  }
-);
 const diagramActorRef = function(params) {
   return params.system.get("diagram");
 };
-const machine = setup({
-  types: {
-    context: {},
-    events: {},
-    emitted: {},
-    input: {},
-    children: {},
-    tags: {}
-  },
-  delays: {
-    "350ms": 350,
-    "waitBeforeSync": 2e3
-  },
-  actors: {
-    applyLatest,
-    executeChange,
-    hotkey: hotkeyActorLogic
-  },
-  guards: {
-    "has pending": ({ context }) => context.pendingChanges.length > 0,
-    "can undo": ({ context }) => context.history.length > 0
-  }
-});
 const to = {
   idle: { target: "#idle" },
   editing: { target: "#editing" },
@@ -125,7 +92,7 @@ const applyLatestToManual = machine.createStateConfig({
     "*": {
       actions: [
         log(({ event }) => `applyLatestToManual received unexpected event: ${event.type}`),
-        reschedule(350)
+        reschedule(500)
       ]
     }
   },
@@ -170,8 +137,16 @@ const applyLatestToManual = machine.createStateConfig({
     // Now we wait 350ms, take new snapshot and send save-view-snapshot
     wait: {
       entry: pushHistory(),
+      on: {
+        "*": {
+          actions: [
+            log(({ event }) => `wait received unexpected event: ${event.type}`),
+            reschedule(500)
+          ]
+        }
+      },
       after: {
-        "350ms": {
+        "500ms": {
           actions: [
             addSnapshotToPendingChanges(),
             ensureHotKey()
@@ -215,7 +190,7 @@ const executeChanges = machine.createStateConfig({
       viewId: context.viewId
     }),
     onDone: {
-      actions: enqueueActions(({ context, enqueue }) => {
+      actions: enqueueActions(({ context, event, enqueue }) => {
         const snapshot = find(context.pendingChanges, (c) => c.op === "save-view-snapshot");
         if (snapshot) {
           enqueue.sendTo(
@@ -233,15 +208,13 @@ const executeChanges = machine.createStateConfig({
       ...to.idle
     },
     onError: {
-      actions: ({ event }) => {
-        console.error(event.error);
-      },
-      ...to.afterEdit
-    }
-  },
-  on: {
-    "*": {
-      actions: reschedule()
+      actions: assign(({ event }) => {
+        console.error("executeChanges onError", { error: event.error });
+        return {
+          pendingChanges: []
+        };
+      }),
+      ...to.idle
     }
   }
 });
@@ -255,21 +228,6 @@ const _editorActorLogic = machine.createMachine({
     history: []
   }),
   initial: "idle",
-  // TODO: listen to diagram actor, if switches to "sequence" dynamic view, cancel editing
-  // entry: ({ self, system }) => {
-  //   // let previous = ''
-  //   // const a = (self._parent as DiagramMachineRef).subscribe({
-  //   //   next({ context }) {
-  //   //     const current = context.view._type === 'dynamic' ? context.dynamicViewVariant
-  //   //   },
-  //   // })
-  //   const s = self.subscribe({
-  //     complete: () => {
-  //       console.log('editor actor completed')
-  //       s.unsubscribe()
-  //     },
-  //   })
-  // },
   states: {
     idle,
     editing,
@@ -321,4 +279,4 @@ const _editorActorLogic = machine.createMachine({
 });
 const editorActorLogic = _editorActorLogic;
 
-export { editorActorLogic, machine };
+export { editorActorLogic };

package/dist/editor/index.d.ts

@@ -1,3 +1,4 @@
-export { EnsureEditorContext, LikeC4EditorProvider, useOptionalLikeC4EditorPort, } from './LikeC4EditorProvider';
-export type { LikeC4EditorPort } from './LikeC4EditorProvider';
-export type * from './editorActor';
+export type * from './editorActor.states';
+export { createLikeC4Editor } from './LikeC4EditorCallbacks';
+export type { LikeC4EditorCallbacks } from './LikeC4EditorCallbacks';
+export { EnsureEditorContext, LikeC4EditorProvider, useOptionalLikeC4Editor, } from './LikeC4EditorProvider';