bare-script 3.8.10 → 3.8.13

package/lib/include/baredoc.bare

@@ -90,14 +90,31 @@ async function baredocMain(url, title, menuLinks, groupURLs):
         return
     endif
 
+    # Fetch the group content URLs
+    groupContent = {}
+    if groupURLs != null:
+        # Fetch the content URLs
+        groupURLArray = []
+        groupNames = arraySort(objectKeys(groupURLs))
+        for groupName in groupNames:
+            arrayPush(groupURLArray, objectGet(groupURLs, groupName))
+        endfor
+        groupContentArray = systemFetch(groupURLArray)
+
+        # Assign the group contents
+        for groupName, ixGroupName in groupNames:
+            objectSet(groupContent, groupName, arrayGet(groupContentArray, ixGroupName))
+        endfor
+    endif
+
     # Render the page
     title = if(title != null && !objectHas(args, 'url'), title, url)
     if group != null:
-        baredocGroupPage(args, title, groupURLs, groups, group)
+        baredocGroupPage(args, title, groupURLs, groupContent, groups, group)
     elif single:
-        baredocSinglePage(args, title, menuLinks, groupURLs, groups)
+        baredocSinglePage(args, title, menuLinks, groupURLs, groupContent, groups)
     else:
-        baredocIndexPage(args, title, menuLinks, groupURLs, groups)
+        baredocIndexPage(args, title, menuLinks, groupURLs, groupContent, groups)
     endif
 endfunction
 
@@ -122,7 +139,7 @@ endfunction
 
 
 # Render a library documentation index page
-async function baredocIndexPage(args, title, menuLinks, groupURLs, groups):
+function baredocIndexPage(args, title, menuLinks, groupURLs, groupContent, groups):
     publish = objectGet(args, 'publish')
 
     # Render the menu and title
@@ -139,9 +156,9 @@ async function baredocIndexPage(args, title, menuLinks, groupURLs, groups):
     markdownPrint('# ' + markdownEscape(title))
 
     # Render the index Markdown, if any
-    if groupURLs != null && objectHas(groupURLs, ''):
+    if objectHas(groupContent, ''):
         rootURL = objectGet(groupURLs, '')
-        rootMarkdown = systemFetch(rootURL)
+        rootMarkdown = objectGet(groupContent, '')
         markdownPrint('', if(rootMarkdown != null, rootMarkdown, '**Error:** Failed to load "' + markdownEscape(rootURL) + '"'))
     endif
 
@@ -159,7 +176,7 @@ endfunction
 
 
 # Render the single-page library documentation
-async function baredocSinglePage(args, title, menuLinks, groupURLs, groups):
+function baredocSinglePage(args, title, menuLinks, groupURLs, groupContent, groups):
     publish = objectGet(args, 'publish')
 
     # Render the menu and title
@@ -176,9 +193,9 @@ async function baredocSinglePage(args, title, menuLinks, groupURLs, groups):
     markdownPrint('# ' + markdownEscape(title))
 
     # Render the index Markdown, if any
-    if groupURLs != null && objectHas(groupURLs, ''):
+    if objectHas(groupContent, ''):
         rootURL = objectGet(groupURLs, '')
-        rootMarkdown = systemFetch(rootURL)
+        rootMarkdown = objectGet(groupContent, '')
         markdownPrint('', if(rootMarkdown != null, rootMarkdown, '**Error:** Failed to load "' + markdownEscape(rootURL) + '"'))
     endif
 
@@ -196,13 +213,13 @@ async function baredocSinglePage(args, title, menuLinks, groupURLs, groups):
     # Render the library function index
     for groupName in arraySort(objectKeys(groups)):
         markdownPrint('', '---', '')
-        baredocGroupPage(args, title, groupURLs, groups, groupName)
+        baredocGroupPage(args, title, groupURLs, groupContent, groups, groupName)
     endfor
 endfunction
 
 
 # Render a library documentation group page
-async function baredocGroupPage(args, title, groupURLs, groups, groupName):
+function baredocGroupPage(args, title, groupURLs, groupContent, groups, groupName):
     publish = objectGet(args, 'publish')
     single = objectGet(args, 'single')
     baseHeader = if(single, '##', '#')
@@ -227,11 +244,10 @@ async function baredocGroupPage(args, title, groupURLs, groups, groupName):
         markdownPrint('', argsLink(baredocArguments, 'Back to top', null, false, '_top'))
     endif
 
-
     # Render the group Markdown, if any
-    if groupURLs != null && objectHas(groupURLs, groupName):
+    if objectHas(groupContent, groupName):
         groupURL = objectGet(groupURLs, groupName)
-        groupMarkdown = systemFetch(groupURL)
+        groupMarkdown = objectGet(groupContent, groupName)
         markdownPrint('', if(groupMarkdown != null, groupMarkdown, '**Error:** Failed to load "' + markdownEscape(groupURL) + '"'))
     endif
 

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.10",
+    "version": "3.8.13",
     "description": "BareScript; a lightweight scripting and expression language",
     "keywords": [
         "expression",