@blankdotpage/cake 0.1.56 → 0.1.58

package/dist/cake/extensions/link/link.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"link.d.ts","sourceRoot":"","sources":["../../../../src/cake/extensions/link/link.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,aAAa,EAGnB,MAAM,oBAAoB,CAAC;AAU5B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AA2F3D,8CAA8C;AAC9C,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,EAAE,WAAW,CAAC;IAClB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF,wCAAwC;AACxC,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,EAAE,QAAQ,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AAEF,qDAAqD;AACrD,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,EAAE,cAAc,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF,kCAAkC;AAClC,MAAM,MAAM,WAAW,GAAG,eAAe,GAAG,aAAa,GAAG,iBAAiB,CAAC;AAE9E,MAAM,MAAM,kBAAkB,GAAG,CAC/B,MAAM,EAAE,UAAU,KACf,OAAO,CAAC;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAAC,CAAC;AAEnD,MAAM,MAAM,mBAAmB,GAAG;IAChC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IACxC,MAAM,CAAC,EAAE,mBAAmB,CAAC;CAC9B,CAAC;AAkcF,wBAAgB,aAAa,CAAC,MAAM,EAAE,UAAU,GAAG,IAAI,GAAG,CAAC,MAAM,IAAI,CAAC,CAAC;AACvE,wBAAgB,aAAa,CAAC,OAAO,CAAC,EAAE,oBAAoB,GAAG,aAAa,CAAC"}
+{"version":3,"file":"link.d.ts","sourceRoot":"","sources":["../../../../src/cake/extensions/link/link.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,aAAa,EAGnB,MAAM,oBAAoB,CAAC;AAU5B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAwJ3D,8CAA8C;AAC9C,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,EAAE,WAAW,CAAC;IAClB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF,wCAAwC;AACxC,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,EAAE,QAAQ,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AAEF,qDAAqD;AACrD,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,EAAE,cAAc,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF,kCAAkC;AAClC,MAAM,MAAM,WAAW,GAAG,eAAe,GAAG,aAAa,GAAG,iBAAiB,CAAC;AAE9E,MAAM,MAAM,kBAAkB,GAAG,CAC/B,MAAM,EAAE,UAAU,KACf,OAAO,CAAC;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAAC,CAAC;AAEnD,MAAM,MAAM,mBAAmB,GAAG;IAChC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IACxC,MAAM,CAAC,EAAE,mBAAmB,CAAC;CAC9B,CAAC;AAmaF,wBAAgB,aAAa,CAAC,MAAM,EAAE,UAAU,GAAG,IAAI,GAAG,CAAC,MAAM,IAAI,CAAC,CAAC;AACvE,wBAAgB,aAAa,CAAC,OAAO,CAAC,EAAE,oBAAoB,GAAG,aAAa,CAAC"}

package/dist/cake/extensions/link/link.js

@@ -37,6 +37,47 @@ function countBoundaryWrappers(fragment) {
     }
     return count;
 }
+function findSimpleLinkRangeFromStart(source, linkStart) {
+    if (source[linkStart] !== "[") {
+        return null;
+    }
+    // Don't match image syntax ![...](...)
+    if (linkStart > 0 && source[linkStart - 1] === "!") {
+        return null;
+    }
+    let labelClose = -1;
+    for (let i = linkStart + 1; i < source.length; i += 1) {
+        const char = source[i];
+        if (char === "\\") {
+            i += 1;
+            continue;
+        }
+        // Nested labels are not supported by this parser.
+        if (char === "[") {
+            return null;
+        }
+        if (char === "]") {
+            labelClose = i;
+            break;
+        }
+    }
+    if (labelClose === -1) {
+        return null;
+    }
+    if (source[labelClose + 1] !== "(") {
+        return null;
+    }
+    const urlClose = source.indexOf(")", labelClose + 2);
+    if (urlClose === -1) {
+        return null;
+    }
+    return {
+        linkStart,
+        labelStart: linkStart + 1,
+        labelEnd: labelClose,
+        urlClose,
+    };
+}
 function findEnclosingLinkRange(source, from, to) {
     if (source.length === 0) {
         return null;
@@ -46,29 +87,39 @@ function findEnclosingLinkRange(source, from, to) {
     if (start >= end) {
         return null;
     }
-    let linkStart = source.lastIndexOf("[", start);
-    while (linkStart !== -1) {
-        // Skip image syntax ![...](...)
-        if (linkStart > 0 && source[linkStart - 1] === "!") {
-            linkStart = source.lastIndexOf("[", linkStart - 1);
-            continue;
+    let cursor = 0;
+    while (cursor < source.length) {
+        const linkStart = source.indexOf("[", cursor);
+        if (linkStart === -1) {
+            break;
         }
-        const labelClose = source.indexOf("](", linkStart + 1);
-        if (labelClose === -1) {
-            linkStart = source.lastIndexOf("[", linkStart - 1);
+        const range = findSimpleLinkRangeFromStart(source, linkStart);
+        if (!range) {
+            cursor = linkStart + 1;
             continue;
         }
-        const urlClose = source.indexOf(")", labelClose + 2);
-        if (urlClose === -1) {
-            linkStart = source.lastIndexOf("[", linkStart - 1);
-            continue;
+        if (range.labelStart <= start && end <= range.labelEnd) {
+            return range;
+        }
+        cursor = range.urlClose + 1;
+    }
+    return null;
+}
+function findLinkRangeByScanningBackward(source, startPos) {
+    if (source.length === 0) {
+        return null;
+    }
+    let searchFrom = Math.min(Math.max(0, startPos), source.length - 1);
+    while (searchFrom >= 0) {
+        const linkStart = source.lastIndexOf("[", searchFrom);
+        if (linkStart === -1) {
+            return null;
         }
-        const labelStart = linkStart + 1;
-        const labelEnd = labelClose;
-        if (labelStart <= start && end <= labelEnd) {
-            return { linkStart, labelStart, labelEnd, urlClose };
+        const range = findSimpleLinkRangeFromStart(source, linkStart);
+        if (range) {
+            return range;
         }
-        linkStart = source.lastIndexOf("[", linkStart - 1);
+        searchFrom = linkStart - 1;
     }
     return null;
 }
@@ -154,35 +205,28 @@ function installLinkExtension(editor, options) {
     ]));
     disposers.push(editor.registerOnEdit((command, state) => {
         if (command.type === "unlink") {
-            // Find the link at the given cursor position and remove the link markup
-            const cursorPos = command.start;
-            const sourcePos = state.map.cursorToSource(cursorPos, "forward");
+            // Find the link around the given selection and remove link markup.
+            const cursorStart = Math.min(command.start, command.end);
+            const cursorEnd = Math.max(command.start, command.end);
+            const sourceStart = state.map.cursorToSource(cursorStart, "forward");
+            const sourceEnd = state.map.cursorToSource(cursorEnd, "backward");
+            const from = Math.min(sourceStart, sourceEnd);
+            const to = Math.max(from + 1, sourceEnd);
             const source = state.source;
-            // Search backwards for the opening bracket
-            let linkStart = sourcePos;
-            while (linkStart > 0 && source[linkStart] !== "[") {
-                linkStart--;
-            }
-            if (source[linkStart] !== "[") {
-                return null;
-            }
-            // Find the ]( separator
-            const labelClose = source.indexOf("](", linkStart + 1);
-            if (labelClose === -1) {
-                return null;
-            }
-            // Find the closing )
-            const urlClose = source.indexOf(")", labelClose + 2);
-            if (urlClose === -1) {
+            const existingLink = findEnclosingLinkRange(source, from, to) ??
+                findLinkRangeByScanningBackward(source, from);
+            if (!existingLink) {
                 return null;
             }
             // Extract the label (text between [ and ](  )
-            const label = source.slice(linkStart + 1, labelClose);
+            const label = source.slice(existingLink.labelStart, existingLink.labelEnd);
             // Replace [label](url) with just label
-            const nextSource = source.slice(0, linkStart) + label + source.slice(urlClose + 1);
+            const nextSource = source.slice(0, existingLink.linkStart) +
+                label +
+                source.slice(existingLink.urlClose + 1);
             // Calculate new cursor position - place it at the end of the label
             const newState = state.runtime.createState(nextSource);
-            const labelEndSource = linkStart + label.length;
+            const labelEndSource = existingLink.linkStart + label.length;
             const newCursor = newState.map.sourceToCursor(labelEndSource, "forward");
             return {
                 source: nextSource,
@@ -194,34 +238,25 @@ function installLinkExtension(editor, options) {
             };
         }
         if (command.type === "set-link-url") {
-            const cursorPos = Math.min(command.start, command.end);
-            const sourcePos = state.map.cursorToSource(cursorPos, "forward");
+            const cursorStart = Math.min(command.start, command.end);
+            const cursorEnd = Math.max(command.start, command.end);
+            const sourceStart = state.map.cursorToSource(cursorStart, "forward");
+            const sourceEnd = state.map.cursorToSource(cursorEnd, "backward");
+            const from = Math.min(sourceStart, sourceEnd);
+            const to = Math.max(from + 1, sourceEnd);
             const source = state.source;
-            // Search backwards for the opening bracket
-            let linkStart = sourcePos;
-            while (linkStart > 0 && source[linkStart] !== "[") {
-                linkStart--;
-            }
-            if (source[linkStart] !== "[") {
-                return null;
-            }
-            // Find the ]( separator
-            const labelClose = source.indexOf("](", linkStart + 1);
-            if (labelClose === -1) {
+            const existingLink = findEnclosingLinkRange(source, from, to) ??
+                findLinkRangeByScanningBackward(source, from);
+            if (!existingLink) {
                 return null;
             }
-            // Find the closing )
-            const urlClose = source.indexOf(")", labelClose + 2);
-            if (urlClose === -1) {
-                return null;
-            }
-            const nextSource = source.slice(0, labelClose + 2) +
+            const nextSource = source.slice(0, existingLink.labelEnd + 2) +
                 command.url +
-                source.slice(urlClose);
+                source.slice(existingLink.urlClose);
             const nextState = state.runtime.createState(nextSource);
             if (command.selectLabel) {
-                const labelStartSource = linkStart + 1;
-                const labelEndSource = labelClose;
+                const labelStartSource = existingLink.labelStart;
+                const labelEndSource = existingLink.labelEnd;
                 const startCursor = nextState.map.sourceToCursor(labelStartSource, "forward");
                 const endCursor = nextState.map.sourceToCursor(labelEndSource, "backward");
                 return {
@@ -233,7 +268,7 @@ function installLinkExtension(editor, options) {
                     },
                 };
             }
-            const endCursor = nextState.map.sourceToCursor(labelClose, "backward");
+            const endCursor = nextState.map.sourceToCursor(existingLink.labelEnd, "backward");
             return {
                 source: nextSource,
                 selection: {
@@ -333,25 +368,14 @@ function installLinkExtension(editor, options) {
         return { type: "insert", text: linkMarkdown };
     }));
     disposers.push(editor.registerParseInline((source, start, end, context) => {
-        if (source[start] !== "[") {
-            return null;
-        }
-        // Don't match image syntax ![...](...)
-        if (start > 0 && source[start - 1] === "!") {
-            return null;
-        }
-        const labelClose = source.indexOf("](", start + 1);
-        if (labelClose === -1 || labelClose >= end) {
-            return null;
-        }
-        const urlClose = source.indexOf(")", labelClose + 2);
-        if (urlClose === -1 || urlClose >= end) {
+        const range = findSimpleLinkRangeFromStart(source, start);
+        if (!range || range.urlClose >= end) {
             return null;
         }
-        const labelStart = start + 1;
-        const labelEnd = labelClose;
-        const urlStart = labelClose + 2;
-        const urlEnd = urlClose;
+        const labelStart = range.labelStart;
+        const labelEnd = range.labelEnd;
+        const urlStart = range.labelEnd + 2;
+        const urlEnd = range.urlClose;
         const children = context.parseInline(source, labelStart, labelEnd);
         const url = source.slice(urlStart, urlEnd);
         return {
@@ -361,7 +385,7 @@ function installLinkExtension(editor, options) {
                 children,
                 data: { url },
             },
-            nextPos: urlClose + 1,
+            nextPos: range.urlClose + 1,
         };
     }));
     disposers.push(editor.registerSerializeInline((inline, context) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blankdotpage/cake",
-  "version": "0.1.56",
+  "version": "0.1.58",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",