bare-script 3.8.11 → 3.8.13

package/lib/include/diff.bare

@@ -44,25 +44,9 @@ diffTypes = schemaParse( \
 function diffLines(left, right):
     diffs = []
 
-    # Split the left into an array of lines
-    if systemType(left) == 'array':
-        leftLines = []
-        for leftPart in left:
-            arrayExtend(leftLines, regexSplit(diffRegexLineSplit, leftPart))
-        endfor
-    else:
-        leftLines = regexSplit(diffRegexLineSplit, left)
-    endif
-
-    # Split the right into an array of lines
-    if systemType(right) == 'array':
-        rightLines = []
-        for rightPart in right:
-            arrayExtend(rightLines, regexSplit(diffRegexLineSplit, rightPart))
-        endfor
-    else:
-        rightLines = regexSplit(diffRegexLineSplit, right)
-    endif
+    # Convert inputs to arrays of lines
+    leftLines = diffLinesToArray(left)
+    rightLines = diffLinesToArray(right)
 
     # Compute the differences
     ixLeft = 0
@@ -97,25 +81,23 @@ function diffLines(left, right):
         endif
 
         # Look ahead to find next matching point
-        foundMatch = false
+        matchIxLeft = null
+        matchIxRight = null
         ixLeftTmp = ixLeft
-        while ixLeftTmp < leftLength:
+        while ixLeftTmp < leftLength && matchIxLeft == null:
             ixRightTmp = ixRight
-            while ixRightTmp < rightLength:
+            while ixRightTmp < rightLength && matchIxLeft == null:
                 if arrayGet(leftLines, ixLeftTmp) == arrayGet(rightLines, ixRightTmp):
-                    foundMatch = true
-                    break
+                    matchIxLeft = ixLeftTmp
+                    matchIxRight = ixRightTmp
                 endif
                 ixRightTmp = ixRightTmp + 1
             endwhile
-            if foundMatch:
-                break
-            endif
             ixLeftTmp = ixLeftTmp + 1
         endwhile
 
         # If no match found, use remaining lines
-        if !foundMatch:
+        if matchIxLeft == null:
             if ixLeft < leftLength:
                 arrayPush(diffs, {'type': 'Remove', 'lines': arraySlice(leftLines, ixLeft)})
                 ixLeft = leftLength
@@ -128,15 +110,15 @@ function diffLines(left, right):
         endif
 
         # Add removed lines if any
-        if ixLeftTmp > ixLeft:
-            arrayPush(diffs, {'type': 'Remove', 'lines': arraySlice(leftLines, ixLeft, ixLeftTmp)})
-            ixLeft = ixLeftTmp
+        if matchIxLeft > ixLeft:
+            arrayPush(diffs, {'type': 'Remove', 'lines': arraySlice(leftLines, ixLeft, matchIxLeft)})
+            ixLeft = matchIxLeft
         endif
 
         # Add added lines if any
-        if ixRightTmp > ixRight:
-            arrayPush(diffs, {'type': 'Add', 'lines': arraySlice(rightLines, ixRight, ixRightTmp)})
-            ixRight = ixRightTmp
+        if matchIxRight > ixRight:
+            arrayPush(diffs, {'type': 'Add', 'lines': arraySlice(rightLines, ixRight, matchIxRight)})
+            ixRight = matchIxRight
         endif
     endwhile
 
@@ -144,5 +126,25 @@ function diffLines(left, right):
 endfunction
 
 
+# Helper function to convert input to array of lines
+function diffLinesToArray(input):
+    # Array input?
+    if systemType(input) == 'array':
+        lines = []
+        for part in input:
+            arrayExtend(lines, regexSplit(diffRegexLineSplit, part))
+        endfor
+        return lines
+    endif
+
+    # String input
+    lines = regexSplit(diffRegexLineSplit, input)
+    if arrayLength(lines) == 1 && arrayGet(lines, 0) == '':
+        return []
+    endif
+    return lines
+endfunction
+
+
 # Regex for splitting lines
 diffRegexLineSplit = regexNew('\r?\n')

package/lib/include/markdownUp.bare

@@ -442,7 +442,7 @@ endfunction
 
 
 # $function: markdownElements
-# $group: Markdown
+# $group: markdownUp.bare: markdown
 # $doc: Generate an element model from a Markdown model
 # $arg markdownModel: The [Markdown model](https://craigahobbs.github.io/markdown-model/model/#var.vName='Markdown')
 # $arg generic: Optional (default is false). If true, render markdown elements in a generic context.

package/package.json

@@ -1,7 +1,7 @@
 {
     "type": "module",
     "name": "bare-script",
-    "version": "3.8.11",
+    "version": "3.8.13",
     "description": "BareScript; a lightweight scripting and expression language",
     "keywords": [
         "expression",