@diagrammo/dgmo 0.4.0 → 0.4.2

package/dist/index.cjs

@@ -1642,13 +1642,20 @@ function parseArrow(line7) {
       error: "Bidirectional arrows are no longer supported. Use two separate lines: 'A -msg-> B' and 'B -msg-> A'"
     };
   }
+  if (RETURN_SYNC_LABELED_RE.test(line7) || RETURN_ASYNC_LABELED_RE.test(line7)) {
+    const m = line7.match(RETURN_SYNC_LABELED_RE) ?? line7.match(RETURN_ASYNC_LABELED_RE);
+    const from = m[3];
+    const to = m[1];
+    const label = m[2].trim();
+    return {
+      error: `Left-pointing arrows are no longer supported. Write '${from} -${label}-> ${to}' instead`
+    };
+  }
   const patterns = [
-    { re: RETURN_SYNC_LABELED_RE, async: false, isReturn: true },
-    { re: RETURN_ASYNC_LABELED_RE, async: true, isReturn: true },
-    { re: SYNC_LABELED_RE, async: false, isReturn: false },
-    { re: ASYNC_LABELED_RE, async: true, isReturn: false }
+    { re: SYNC_LABELED_RE, async: false },
+    { re: ASYNC_LABELED_RE, async: true }
   ];
-  for (const { re, async: isAsync, isReturn } of patterns) {
+  for (const { re, async: isAsync } of patterns) {
     const m = line7.match(re);
     if (!m) continue;
     const label = m[2].trim();
@@ -1656,25 +1663,15 @@ function parseArrow(line7) {
     for (const arrow of ARROW_CHARS) {
       if (label.includes(arrow)) {
         return {
-          error: "Arrow characters (->, ~>, <-, <~) are not allowed inside labels"
+          error: "Arrow characters (->, ~>) are not allowed inside labels"
         };
       }
     }
-    if (isReturn) {
-      return {
-        from: m[3],
-        to: m[1],
-        label,
-        async: isAsync,
-        isReturn: true
-      };
-    }
     return {
       from: m[1],
       to: m[3],
       label,
-      async: isAsync,
-      isReturn: false
+      async: isAsync
     };
   }
   return null;
@@ -1689,7 +1686,7 @@ var init_arrows = __esm({
     RETURN_ASYNC_LABELED_RE = /^(\S+)\s+<~(.+)~\s+(\S+)$/;
     BIDI_SYNC_RE = /^(\S+)\s+<-(.+)->\s+(\S+)$/;
     BIDI_ASYNC_RE = /^(\S+)\s+<~(.+)~>\s+(\S+)$/;
-    ARROW_CHARS = ["->", "~>", "<-", "<~"];
+    ARROW_CHARS = ["->", "~>"];
   }
 });
 
@@ -1939,15 +1936,14 @@ function parseSequenceDgmo(content) {
     }
     if (labeledArrow) {
       contentStarted = true;
-      const { from, to, label, async: isAsync, isReturn } = labeledArrow;
+      const { from, to, label, async: isAsync } = labeledArrow;
       lastMsgFrom = from;
       const msg = {
         from,
         to,
         label,
         lineNumber,
-        ...isAsync ? { async: true } : {},
-        ...isReturn ? { standaloneReturn: true } : {}
+        ...isAsync ? { async: true } : {}
       };
       result.messages.push(msg);
       currentContainer().push(msg);
@@ -2002,36 +1998,12 @@ function parseSequenceDgmo(content) {
     const bareReturnAsync = trimmed.match(/^(\S+)\s+<~\s+(\S+)$/);
     const bareReturn = bareReturnSync || bareReturnAsync;
     if (bareReturn) {
-      contentStarted = true;
       const to = bareReturn[1];
       const from = bareReturn[2];
-      lastMsgFrom = from;
-      const msg = {
-        from,
-        to,
-        label: "",
+      pushError(
         lineNumber,
-        standaloneReturn: true,
-        ...bareReturnAsync ? { async: true } : {}
-      };
-      result.messages.push(msg);
-      currentContainer().push(msg);
-      if (!result.participants.some((p) => p.id === from)) {
-        result.participants.push({
-          id: from,
-          label: from,
-          type: inferParticipantType(from),
-          lineNumber
-        });
-      }
-      if (!result.participants.some((p) => p.id === to)) {
-        result.participants.push({
-          id: to,
-          label: to,
-          type: inferParticipantType(to),
-          lineNumber
-        });
-      }
+        `Left-pointing arrows are no longer supported. Write '${from} -> ${to}' instead`
+      );
       continue;
     }
     const bareCallSync = trimmed.match(/^(\S+)\s*->\s*(\S+)$/);
@@ -12035,22 +12007,6 @@ function buildRenderSequence(messages) {
         messageIndex: top.messageIndex
       });
     }
-    if (msg.standaloneReturn) {
-      for (let si = stack.length - 1; si >= 0; si--) {
-        if (stack[si].from === msg.to && stack[si].to === msg.from) {
-          stack.splice(si, 1);
-          break;
-        }
-      }
-      steps.push({
-        type: "return",
-        from: msg.from,
-        to: msg.to,
-        label: msg.label,
-        messageIndex: mi
-      });
-      continue;
-    }
     steps.push({
       type: "call",
       from: msg.from,