bare-script 5.0.0__tar.gz → 5.0.3__tar.gz

{bare_script-5.0.0/src/bare_script.egg-info → bare_script-5.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bare-script
-Version: 5.0.0
+Version: 5.0.3
 Summary: bare-script
 Home-page: https://github.com/craigahobbs/bare-script
 Author: Craig A. Hobbs

{bare_script-5.0.0 → bare_script-5.0.3}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = bare-script
-version = 5.0.0
+version = 5.0.3
 url = https://github.com/craigahobbs/bare-script
 author = Craig A. Hobbs
 author_email = craigahobbs@gmail.com

{bare_script-5.0.0 → bare_script-5.0.3}/src/bare_script/include_source.py

@@ -138,7 +138,7 @@ function argsURL(arguments, args, explicit, headerText, url):
         default = objectGet(argument, \'default\')
 
         # Add the argument name (for unknown argument check below)
-        objectSet(argNames, name, null)
+        objectSet(argNames, name, true)
 
         # Add the URL variable, if any
         value = null
@@ -168,7 +168,7 @@ function argsURL(arguments, args, explicit, headerText, url):
 
     # Create the URL
     return \'#\' + if(url != null, \'url=\' + urlEncodeComponent(url) + \'&\', \'\') + \\
-        if(arrayLength(urlVars), arrayJoin(urlVars, \'&\'), \'var=\') + \\
+        if(urlVars, arrayJoin(urlVars, \'&\'), \'var=\') + \\
         if(headerText != null, \'&\' + if(headerText == argsTopHeaderId, argsTopHeaderId, markdownHeaderId(headerText)), \'\')
 endfunction
 
@@ -265,14 +265,12 @@ function argsFormatValue(value, type):
         return "\'" + datetimeISOFormat(value, true) + "\'"
     elif type == \'datetime\':
         return "\'" + datetimeISOFormat(value) + "\'"
-    elif type == \'float\':
-        return stringNew(value)
-    elif type == \'int\':
+    elif type == \'float\' || type == \'int\':
         return stringNew(value)
     endif
 
-    # type == \'string\'
-    return "\'" + value + "\'"
+    # type == \'string\' - escape backslashes and single-quotes for the URL argument expression
+    return "\'" + stringReplace(stringReplace(value, \'\\\\\', \'\\\\\\\\\'), "\'", "\\\\\'") + "\'"
 endfunction
 
 
@@ -300,7 +298,8 @@ function argsValidateValue(value, type, global, warn):
             value = datetimeISOParse(value)
             valueType = systemType(value)
         endif
-        if valueType != \'datetime\' || datetimeHour(value) != 0 || datetimeMinute(value) != 0 || datetimeSecond(value) != 0:
+        if valueType != \'datetime\' || datetimeHour(value) != 0 || datetimeMinute(value) != 0 || datetimeSecond(value) != 0 || \\
+                datetimeMillisecond(value) != 0:
             if warn != false:
                 systemLogDebug(\'args.bare: Invalid value \' + jsonStringify(valueOrig) + \' for URL argument "\' + global + \'"\')
             endif
@@ -558,7 +557,7 @@ async function baredocSinglePage(config, args, sectionGroups, groups):
             arrayPush(urls, url)
         endif
     endfor
-    texts = systemFetch(urls)
+    texts = if(urls, systemFetch(urls), [])
     groupContent = {}
     for groupName, ixName in contentNames:
         text = arrayGet(texts, ixName)
@@ -837,11 +836,14 @@ baredocCLIMainArguments = argsValidate([ \\
 function baredocCLIParse(functions, source, filename):
     errors = []
 
+    # Note the previously-parsed functions - only functions added by this call are validated below
+    functionsPrev = objectCopy(functions)
+
     # Process documentation comments line-by-line
     func = null
     for line, ixLine in stringSplitLines(source):
         # function/group/doc/return documentation keywords?
-        matchKey = regexMatch(baredocCLIMainRegexKey, line)
+        matchKey = regexMatch(baredocCLIParseRegexKey, line)
         if matchKey != null:
             groupsKey = objectGet(matchKey, \'groups\')
             key = objectGet(groupsKey, \'key\')
@@ -885,7 +887,7 @@ function baredocCLIParse(functions, source, filename):
                     arrayPush(errors, filename + \':\' + (ixLine + 1) + \': Invalid ignore value "\' + textTrim + \'"\')
                     continue
                 endif
-                objectSet(func, key, text == \'true\')
+                objectSet(func, key, textTrim == \'true\')
 
             else:
                 # key == \'function\'
@@ -907,7 +909,7 @@ function baredocCLIParse(functions, source, filename):
         endif
 
         # arg keyword?
-        matchArg = regexMatch(baredocCLIMainRegexArg, line)
+        matchArg = regexMatch(baredocCLIParseRegexArg, line)
         if matchArg != null:
             groupsArg = objectGet(matchArg, \'groups\')
             name = objectGet(groupsArg, \'name\')
@@ -955,7 +957,7 @@ function baredocCLIParse(functions, source, filename):
         endif
 
         # Unknown documentation comment?
-        matchUnknown = regexMatch(baredocCLIMainRegexUnknown, line)
+        matchUnknown = regexMatch(baredocCLIParseRegexUnknown, line)
         if matchUnknown != null:
             groupsUnknown = objectGet(matchUnknown, \'groups\')
             unknown = objectGet(groupsUnknown, \'unknown\')
@@ -964,15 +966,12 @@ function baredocCLIParse(functions, source, filename):
         endif
     endfor
 
-    # Create the sorted function model array
-    libraryFunctions = []
+    # Validate the function documentation models added by this call
     for funcName in arraySort(objectKeys(functions)):
-        arrayPush(libraryFunctions, objectGet(functions, funcName))
-    endfor
-
-    # Validate the library documentation model
-    for funcObj in libraryFunctions:
-        funcName = objectGet(funcObj, \'name\')
+        if objectHas(functionsPrev, funcName):
+            continue
+        endif
+        funcObj = objectGet(functions, funcName)
         if !objectHas(funcObj, \'group\'):
             arrayPush(errors, \'error: Function "\' + funcName + \'" missing group\')
         endif
@@ -989,9 +988,9 @@ endfunction
 
 
 # baredocCLIParse regular expressions
-baredocCLIMainRegexKey = regexNew(\'^\\\\s*(?:\\\\/\\\\/|#)\\\\s*\\\\$(?<key>function|group|doc|return|ignore):\\\\s?(?<text>.*)$\')
-baredocCLIMainRegexArg = regexNew(\'^\\\\s*(?:\\\\/\\\\/|#)\\\\s*\\\\$arg\\\\s+(?<name>[A-Za-z_][A-Za-z0-9_]*(?:\\\\.\\\\.\\\\.)?):\\\\s?(?<text>.*)$\')
-baredocCLIMainRegexUnknown = regexNew(\'^\\\\s*(?:\\\\/\\\\/|#)\\\\s*\\\\$(?<unknown>[^:]+):\')
+baredocCLIParseRegexKey = regexNew(\'^\\\\s*(?:\\\\/\\\\/|#)\\\\s*\\\\$(?<key>function|group|doc|return|ignore):\\\\s?(?<text>.*)$\')
+baredocCLIParseRegexArg = regexNew(\'^\\\\s*(?:\\\\/\\\\/|#)\\\\s*\\\\$arg\\\\s+(?<name>[A-Za-z_][A-Za-z0-9_]*(?:\\\\.\\\\.\\\\.)?):\\\\s?(?<text>.*)$\')
+baredocCLIParseRegexUnknown = regexNew(\'^\\\\s*(?:\\\\/\\\\/|#)\\\\s*\\\\$(?<unknown>[^:]+):\')
 '''
 
 
@@ -1007,8 +1006,9 @@ include <schemaParser.bare>
 # $function: dataParseCSV
 # $group: data.bare
 # $doc: Parse CSV text to a data array
-# $arg text: The CSV text
-# $return: The data array
+# $arg text: The CSV text or array of CSV text
+# $return: The data array. String values are parsed into typed values; if a value fails to parse as its
+# $return: column\'s type, a debug message is logged and the remaining column values are left as strings.
 function dataParseCSV(text):
     # Collect all lines from variadic text arguments
     if systemType(text) == \'array\':
@@ -1039,7 +1039,9 @@ function dataParseCSV(text):
             if mQuoted:
                 groups = objectGet(mQuoted, \'groups\')
                 arrayPush(row, stringReplace(objectGet(groups, \'1\'), \'""\', \'"\'))
-                linePart = stringSlice(linePart, stringLength(objectGet(groups, \'0\')))
+
+                # Continue parsing fields only on a comma delimiter - at end-of-line the field is the last
+                linePart = if(objectGet(groups, \'2\') == \',\', stringSlice(linePart, stringLength(objectGet(groups, \'0\'))))
                 continue
             endif
 
@@ -1244,7 +1246,8 @@ endfunction
 # $arg joinExpr: The join expression
 # $arg rightExpr: Optional (default is null).
 # $arg rightExpr: The right join expression
-# $arg isLeftJoin: Optional (default is false). If true, perform a left join (always include left row).
+# $arg isLeftJoin: Optional (default is false). By default, all left rows are included in the result.
+# $arg isLeftJoin: If true, left rows with no matching right row are excluded.
 # $arg variables: Optional (default is null). A variables object for join expression evaluation.
 # $return: The joined data array
 function dataJoin(leftData, rightData, joinExpr, rightExpr, isLeftJoin, variables):
@@ -1252,32 +1255,30 @@ function dataJoin(leftData, rightData, joinExpr, rightExpr, isLeftJoin, variable
     leftNames = {}
     for leftRow in leftData:
         for fieldName in objectKeys(leftRow):
-            if !objectHas(leftNames, fieldName):
-                objectSet(leftNames, fieldName, fieldName)
-            endif
+            objectSet(leftNames, fieldName, fieldName)
         endfor
     endfor
 
     rightNamesRaw = {}
     for rightRow in rightData:
         for fieldName in objectKeys(rightRow):
-            if !objectHas(rightNamesRaw, fieldName):
-                objectSet(rightNamesRaw, fieldName, fieldName)
-            endif
+            objectSet(rightNamesRaw, fieldName, fieldName)
         endfor
     endfor
 
     rightNames = {}
+    rightNamesUsed = {}
     for fieldName in objectKeys(rightNamesRaw):
         if !objectHas(leftNames, fieldName):
             objectSet(rightNames, fieldName, fieldName)
         else:
             ixUnique = 2
             uniqueName = fieldName + ixUnique
-            while objectHas(leftNames, uniqueName) || objectHas(rightNames, uniqueName) || objectHas(rightNamesRaw, uniqueName):
+            while objectHas(leftNames, uniqueName) || objectHas(rightNamesUsed, uniqueName) || objectHas(rightNamesRaw, uniqueName):
                 ixUnique = ixUnique + 1
                 uniqueName = fieldName + ixUnique
             endwhile
+            objectSet(rightNamesUsed, uniqueName, uniqueName)
             objectSet(rightNames, fieldName, uniqueName)
         endif
     endfor
@@ -1291,12 +1292,12 @@ function dataJoin(leftData, rightData, joinExpr, rightExpr, isLeftJoin, variable
     for rightRow in rightData:
         rightRowVars = if(variables != null, objectAssign(objectCopy(rightRow), variables), rightRow)
         categoryKey = jsonStringify(barescriptEvaluateExpression(rightExprParsed, rightRowVars))
-        rightCategoryKeys = objectGet(rightCategoryRows, categoryKey)
-        if rightCategoryKeys == null:
-            rightCategoryKeys = []
-            objectSet(rightCategoryRows, categoryKey, rightCategoryKeys)
+        rightRows = objectGet(rightCategoryRows, categoryKey)
+        if rightRows == null:
+            rightRows = []
+            objectSet(rightCategoryRows, categoryKey, rightRows)
         endif
-        arrayPush(rightCategoryKeys, rightRow)
+        arrayPush(rightRows, rightRow)
     endfor
 
     # Join the left with the right
@@ -1327,7 +1328,7 @@ endfunction
 # $arg data: The data array
 # $arg fieldName: The calculated field name
 # $arg expr: The calculated field expression
-# $arg variables: Optional (default is null). A variables object the expression evaluation.
+# $arg variables: Optional (default is null). A variables object for the expression evaluation.
 # $return: The updated data array
 function dataCalculatedField(data, fieldName, expr, variables):
     # Parse the calculation expression
@@ -1353,7 +1354,7 @@ endfunction
 # $doc: Filter a data array
 # $arg data: The data array
 # $arg expr: The filter expression
-# $arg variables: Optional (default is null). A variables object the expression evaluation.
+# $arg variables: Optional (default is null). A variables object for the expression evaluation.
 # $return: The filtered data array
 function dataFilter(data, expr, variables):
     result = []
@@ -1604,7 +1605,7 @@ function dataTop(data, count, categoryFields):
         if categoryFields != null:
             categoryValues = []
             for field in categoryFields:
-                arrayPush(categoryValues, if(objectHas(row, field), objectGet(row, field), null))
+                arrayPush(categoryValues, objectGet(row, field))
             endfor
             categoryKey = jsonStringify(categoryValues)
         else:
@@ -1621,18 +1622,18 @@ function dataTop(data, count, categoryFields):
     endfor
 
     # Take only the top rows per category
-    dataTop = []
+    result = []
     for categoryKey in categoryOrder:
         categoryKeyRows = objectGet(categoryRows, categoryKey)
         categoryKeyLength = arrayLength(categoryKeyRows)
         ixRow = 0
         while ixRow < count && ixRow < categoryKeyLength:
-            arrayPush(dataTop, arrayGet(categoryKeyRows, ixRow))
+            arrayPush(result, arrayGet(categoryKeyRows, ixRow))
             ixRow = ixRow + 1
         endwhile
     endfor
 
-    return dataTop
+    return result
 endfunction
 '''
 
@@ -1862,15 +1863,17 @@ function dataLineChartElements(data, lineChart, options):
             colorValue = dataUtilFormatValue(objectGet(row, colorField), chartPrecision, chartDatetime)
             for yField in yFields:
                 rowKey = if(isSingleY, colorValue, yField + \', \' + colorValue)
-                objectSet(colorValueSet, rowKey, true)
                 yRow = objectGet(row, yField)
                 if xRow != null && yRow != null:
+                    objectSet(colorValueSet, rowKey, true)
                     rowPoints = objectGet(pointsMap, rowKey)
                     if rowPoints == null:
                         rowPoints = []
                         objectSet(pointsMap, rowKey, rowPoints)
                     endif
                     arrayPush(rowPoints, [xRow, yRow])
+
+                    # The rows are sorted by the X field, so the first X value is the min and the last is the max
                     xMin = if(xMin == null, xRow, xMin)
                     yMin = if(yMin == null, yRow, if(yRow < yMin, yRow, yMin))
                     xMax = xRow
@@ -1896,10 +1899,9 @@ function dataLineChartElements(data, lineChart, options):
         # Create a line for each y-field
         for yField, ixField in yFields:
             color = arrayGet(dataLineChartCategoricalColors, ixField % arrayLength(dataLineChartCategoricalColors))
-            points = []
-            arrayPush(linePoints, {\'label\': yField, \'color\': color, \'points\': points})
 
-            # Add the points
+            # Add the points - each y-field iterates the sorted rows separately, so compare in full for min/max
+            points = []
             for row in data:
                 xRow = objectGet(row, xField)
                 yRow = objectGet(row, yField)
@@ -1907,10 +1909,15 @@ function dataLineChartElements(data, lineChart, options):
                     arrayPush(points, [xRow, yRow])
                     xMin = if(xMin == null, xRow, if(xRow < xMin, xRow, xMin))
                     yMin = if(yMin == null, yRow, if(yRow < yMin, yRow, yMin))
-                    xMax = xRow
+                    xMax = if(xMax == null, xRow, if(xRow > xMax, xRow, xMax))
                     yMax = if(yMax == null, yRow, if(yRow > yMax, yRow, yMax))
                 endif
             endfor
+
+            # Skip y-fields with no points
+            if points:
+                arrayPush(linePoints, {\'label\': yField, \'color\': color, \'points\': points})
+            endif
         endfor
     endif
     linePointsReversed = arrayReverse(arrayCopy(linePoints))
@@ -2614,20 +2621,30 @@ function dataTableMarkdown(data, model):
         endfor
         arrayExtend(fields, objectKeys(fieldNames))
     endif
-    if !arrayLength(fields):
+    if !fields:
         return null
     endif
 
     # Get precision and formatting
-    precisionDatetime = if(model != null, objectGet(model, \'datetime\'))
-    precisionNumber = if(model != null, objectGet(model, \'precision\', 2), 2)
-    precisionTrim = if(model != null, objectGet(model, \'trim\', true), true)
+    formatDatetime = if(model != null, objectGet(model, \'datetime\'))
+    formatPrecision = if(model != null, objectGet(model, \'precision\'))
+    formatTrim = if(model != null, objectGet(model, \'trim\'))
     formats = if(model != null, objectGet(model, \'formats\'))
 
-    # Initialize widths to the field header width
+    # Precompute per-field rendering metadata, [field, align, header, isCategory], and
+    # initialize widths to the field header width
+    fieldMeta = []
     widths = {}
     for field in fields:
-        objectSet(widths, field, stringLength(field))
+        format = if(formats != null, objectGet(formats, field))
+        header = if(format != null, objectGet(format, \'header\', field), field)
+        arrayPush(fieldMeta, [ \\
+            field, \\
+            if(format != null, objectGet(format, \'align\')), \\
+            header, \\
+            modelCategories != null && arrayIndexOf(modelCategories, field) != -1 \\
+        ])
+        objectSet(widths, field, stringLength(header))
     endfor
 
     # Compute the formatted field value strings and widths
@@ -2640,7 +2657,7 @@ function dataTableMarkdown(data, model):
             value = objectGet(row, field)
             valueType = systemType(value)
             if valueType == \'number\' || valueType == \'datetime\':
-                valueFormat = dataUtilFormatValue(value, precisionNumber, precisionDatetime, precisionTrim)
+                valueFormat = dataUtilFormatValue(value, formatPrecision, formatDatetime, formatTrim)
             else:
                 valueFormat = if(valueType == \'string\', stringTrim(value), stringNew(value))
                 valueFormat = regexReplace(dataTableMarkdownRegexMultipleNewline, valueFormat, \'<br><br>\')
@@ -2658,24 +2675,16 @@ function dataTableMarkdown(data, model):
         endfor
     endfor
 
-    # Precompute per-field rendering metadata: [field, width, align, header, isCategory]
-    fieldMeta = []
-    for field in fields:
-        format = if(formats != null, objectGet(formats, field))
-        arrayPush(fieldMeta, [ \\
-            field, \\
-            objectGet(widths, field), \\
-            if(format != null, objectGet(format, \'align\')), \\
-            if(format != null, objectGet(format, \'header\', field), field), \\
-            modelCategories != null && arrayIndexOf(modelCategories, field) != -1 \\
-        ])
+    # Add each field\'s computed width to its metadata, [field, align, header, isCategory, width]
+    for meta in fieldMeta:
+        arrayPush(meta, objectGet(widths, arrayGet(meta, 0)))
     endfor
 
     # Compute the field header separator
     headerSeparator = \'\'
     for meta in fieldMeta:
-        width = arrayGet(meta, 1)
-        align = arrayGet(meta, 2)
+        align = arrayGet(meta, 1)
+        width = arrayGet(meta, 4)
         alignLeft = if(align == \'center\', \':\', \'-\')
         alignRight = if(align == \'center\' || align == \'right\', \':\', \'-\')
         headerSeparator = headerSeparator + \'|\' + alignLeft + dataTableMarkdownField(\'\', width, align, \'-\') + alignRight
@@ -2685,9 +2694,9 @@ function dataTableMarkdown(data, model):
     # Compute the table header fields
     headerFields = \'\'
     for meta in fieldMeta:
-        width = arrayGet(meta, 1)
-        align = arrayGet(meta, 2)
-        header = arrayGet(meta, 3)
+        align = arrayGet(meta, 1)
+        header = arrayGet(meta, 2)
+        width = arrayGet(meta, 4)
         headerFields = headerFields + \'| \' + dataTableMarkdownField(header, width, align, \' \') + \' \'
     endfor
     headerFields = headerFields + \'|\'
@@ -2705,12 +2714,12 @@ function dataTableMarkdown(data, model):
         parts = []
         for meta in fieldMeta:
             field = arrayGet(meta, 0)
-            width = arrayGet(meta, 1)
-            align = arrayGet(meta, 2)
+            align = arrayGet(meta, 1)
+            width = arrayGet(meta, 4)
 
             # Skip this value? (blank a category cell matching the previous row)
             if skip:
-                isCategory = arrayGet(meta, 4)
+                isCategory = arrayGet(meta, 3)
                 skip = isCategory && systemCompare(objectGet(rowRaw, field), objectGet(rowPrevRaw, field)) == 0
             endif
 
@@ -2807,7 +2816,7 @@ function dataTableElements(data, dataTable):
                 isCategory, \\
                 dataTableElementsFieldAttr(fieldFormat), \\
                 fieldFormat != null && objectGet(fieldFormat, \'markdown\'), \\
-                if(fieldFormat != null, objectGet(fieldFormat, \'header\')) || field \\
+                if(fieldFormat != null, objectGet(fieldFormat, \'header\', field), field) \\
             ])
         endfor
     endfor
@@ -2842,14 +2851,12 @@ function dataTableElements(data, dataTable):
                 skip = isCategory && systemCompare(value, objectGet(rowPrev, field)) == 0
             endif
 
-            fieldElements = if(isMarkdown, \\
-                markdownElements(markdownParse(stringNew(value))), \\
-                {\'text\': dataUtilFormatValue(value, formatPrecision, formatDatetime, formatTrim)} \\
-            )
             arrayPush(fieldRowElements, { \\
                 \'html\': \'td\', \\
                 \'attr\': fieldAttr, \\
-                \'elem\': if(skip, null, fieldElements) \\
+                \'elem\': if(skip, null, if(isMarkdown, \\
+                    markdownElements(markdownParse(stringNew(value))), \\
+                    {\'text\': dataUtilFormatValue(value, formatPrecision, formatDatetime, formatTrim)})) \\
             })
         endfor
         arrayPush(resultRows, {\'html\': \'tr\', \'elem\': fieldRowElements})
@@ -2994,17 +3001,13 @@ function diffLines(left, right):
     leftLength = arrayLength(leftLines)
     rightLength = arrayLength(rightLines)
     while ixLeft < leftLength || ixRight < rightLength:
-        # If we\'ve run out of lines on either side
+        # If we\'ve run out of lines on either side (the loop condition ensures lines remain on the other)
         if ixLeft >= leftLength:
-            if ixRight < rightLength:
-                arrayPush(diffs, {\'type\': \'Add\', \'lines\': arraySlice(rightLines, ixRight)})
-            endif
+            arrayPush(diffs, {\'type\': \'Add\', \'lines\': arraySlice(rightLines, ixRight)})
             break
         endif
         if ixRight >= rightLength:
-            if ixLeft < leftLength:
-                arrayPush(diffs, {\'type\': \'Remove\', \'lines\': arraySlice(leftLines, ixLeft)})
-            endif
+            arrayPush(diffs, {\'type\': \'Remove\', \'lines\': arraySlice(leftLines, ixLeft)})
             break
         endif
 
@@ -3036,16 +3039,12 @@ function diffLines(left, right):
             ixLeftTmp = ixLeftTmp + 1
         endwhile
 
-        # If no match found, use remaining lines
+        # If no match found, use remaining lines (lines remain on both sides or we\'d have broken above)
         if matchIxLeft == null:
-            if ixLeft < leftLength:
-                arrayPush(diffs, {\'type\': \'Remove\', \'lines\': arraySlice(leftLines, ixLeft)})
-                ixLeft = leftLength
-            endif
-            if ixRight < rightLength:
-                arrayPush(diffs, {\'type\': \'Add\', \'lines\': arraySlice(rightLines, ixRight)})
-                ixRight = rightLength
-            endif
+            arrayPush(diffs, {\'type\': \'Remove\', \'lines\': arraySlice(leftLines, ixLeft)})
+            arrayPush(diffs, {\'type\': \'Add\', \'lines\': arraySlice(rightLines, ixRight)})
+            ixLeft = leftLength
+            ixRight = rightLength
             continue
         endif
 
@@ -3359,7 +3358,7 @@ endfunction
 # $function: drawOnClick
 # $group: draw.bare
 # $doc: Set the most recent drawing object\'s on-click event handler
-# $arg callback: The on-click event callback function (x, y)
+# $arg callback: The on-click event callback function (x, y, width, height)
 function drawOnClick(callback):
     drawing = drawGetCurrentDrawing()
     svg = objectGet(drawing, \'svg\')
@@ -3429,13 +3428,19 @@ endfunction
 # $arg strokeDashArray: [dash array](https://developer.mozilla.org/en-US/docs/Web/SVG/Attribute/stroke-dasharray#usage_notes).
 function drawStyle(stroke, strokeWidth, fill, strokeDashArray):
     drawing = drawGetCurrentDrawing()
+
+    # Apply the style defaults and compare with the current styles - an unchanged style continues the current path
+    stroke = if(stroke != null, stroke, \'black\')
+    strokeWidth = if(strokeWidth != null, strokeWidth, 1)
+    fill = if(fill != null, fill, \'none\')
+    strokeDashArray = if(strokeDashArray != null, strokeDashArray, \'none\')
     if stroke != objectGet(drawing, \'stroke\') || strokeWidth != objectGet(drawing, \'strokeWidth\') || \\
        strokeDashArray != objectGet(drawing, \'strokeDashArray\') || fill != objectGet(drawing, \'fill\'):
         drawFinishDrawingPath(drawing)
-        objectSet(drawing, \'stroke\', if(stroke != null, stroke, \'black\'))
-        objectSet(drawing, \'strokeWidth\', if(strokeWidth != null, strokeWidth, 1))
-        objectSet(drawing, \'strokeDashArray\', if(strokeDashArray != null, strokeDashArray, \'none\'))
-        objectSet(drawing, \'fill\', if(fill != null, fill, \'none\'))
+        objectSet(drawing, \'stroke\', stroke)
+        objectSet(drawing, \'strokeWidth\', strokeWidth)
+        objectSet(drawing, \'strokeDashArray\', strokeDashArray)
+        objectSet(drawing, \'fill\', fill)
     endif
 endfunction
 
@@ -3639,10 +3644,22 @@ function elementModelValidateEx(elements):
         endif
     endif
 
-    # Validate creation callback
+    # Validate the element callback - a map of event name to event callback function
     callback = objectGet(elements, \'callback\')
-    if callback != null && systemType(callback) != \'function\':
-        return {\'error\': \'Invalid element callback function \' + elementModelTruncate(jsonStringify(callback)) + \' (type "\' + systemType(callback) + \'")\'}
+    if callback != null:
+        callbackType = systemType(callback)
+        if callbackType != \'object\':
+            return {\'error\': \'Invalid element callback function \' + elementModelTruncate(jsonStringify(callback)) + \' (type "\' + callbackType + \'")\'}
+        endif
+
+        # Validate the map\'s event callback functions
+        for callbackEvent in objectKeys(callback):
+            eventCallback = objectGet(callback, callbackEvent)
+            if systemType(eventCallback) != \'function\':
+                return {\'error\': \'Invalid element event callback function \' + elementModelTruncate(jsonStringify(eventCallback)) + \\
+                    \' (type "\' + systemType(eventCallback) + \'")\'}
+            endif
+        endfor
     endif
 
     return {\'result\': elements}
@@ -3714,9 +3731,8 @@ function elementModelToStringHelper(elements, indentStr, level):
     attrStr = \'\'
     attr = objectGet(elements, \'attr\')
     if tag == \'svg\':
-        if attr == null:
-            attr = {}
-        endif
+        # Add the SVG namespace attribute (copy the attributes - the caller\'s model is not modified)
+        attr = if(attr != null, objectCopy(attr), {})
         objectSet(attr, \'xmlns\', \'http://www.w3.org/2000/svg\')
     endif
     if attr != null:
@@ -3914,7 +3930,7 @@ function markdownParserGetSpanText(span):
         endfor
         return arrayJoin(parts, \'\')
     endif
-    return objectGet(span, \'text\')
+    return objectGet(span, \'text\', \'\')
 endfunction
 
 
@@ -5664,7 +5680,6 @@ INCLUDE_SOURCE_MARKDOWN_PARSER = '''\
 
 
 # Markdown regex
-markdownParserRegexLineSplit = regexNew(\'\\r?\\n\')
 markdownParserRegexParagraphEmpty = regexNew(\'^\\\\s*$\')
 markdownParserRegexIndent = regexNew(\'^(?<indent> *)(?<notIndent>.*)$\')
 markdownParserRegexHeading = regexNew(\'^ {0,3}(?<heading>#{1,6})\\\\s+(?<text>.*?)(?:\\\\s+#+)?\\\\s*$\')
@@ -5828,9 +5843,6 @@ function markdownParseInternal(markdown, startLineNumber, linkRefsRaw):
                 markdownParserCloseParagraph( \\
                     markdownParts, paragraphLines, paragraphPart, paragraphLineNumber, fencedMark, linkRefs, null \\
                 )
-                paragraphPart = null
-                paragraphLineNumber = null
-                tablePart = null
                 matchHeadingGroups = objectGet(matchHeading, \'groups\')
                 paragraphLines = [objectGet(matchHeadingGroups, \'text\')]
                 headingStyle = \'h\' + stringLength(objectGet(matchHeadingGroups, \'heading\'))
@@ -6085,7 +6097,7 @@ function markdownParserCloseParagraph(markdownParts, paragraphLines, paragraphPa
             endif
 
             # Check for more link reference definitions
-            text = stringSlice(text, stringLength(objectGet(objectGet(matchLinkDef, \'groups\'), \'0\')))
+            text = stringSlice(text, stringLength(objectGet(matchLinkDefGroups, \'0\')))
             matchLinkDef = regexMatch(markdownParserRegexLinkDef, text)
         endwhile
 
@@ -6381,7 +6393,8 @@ function markdownParserCreateLinkRefSpan(refText, optText, fullText, linkRefs, t
     arrayPush(objectGet(linkRefs, \'links\'), { \\
         \'refKey\': markdownParserGetLinkRefKey(refText), \\
         \'linkSpan\': {\'link\': { \\
-            \'spans\': if(systemType(optText) == \'array\', optText, markdownParserParagraphSpans(optText || refText, linkRefs)) \\
+            \'spans\': if(systemType(optText) == \'array\', optText, \\
+                markdownParserParagraphSpans(if(optText != null, optText, refText), linkRefs)) \\
         }}, \\
         \'linkRefSpan\': linkRefSpan \\
     })
@@ -6394,7 +6407,7 @@ function markdownParserCreateImageRefSpan(refText, optText, fullText, linkRefs,
     linkRefSpan = {\'linkRef\': {\'spans\': markdownParserCreateFallbackSpan(fullText, linkRefs, textFallback)}}
     arrayPush(objectGet(linkRefs, \'links\'), { \\
         \'refKey\': markdownParserGetLinkRefKey(refText), \\
-        \'imageSpan\': {\'image\': {\'alt\': markdownParserGetImageAltText(optText || refText)}}, \\
+        \'imageSpan\': {\'image\': {\'alt\': markdownParserGetImageAltText(if(optText != null, optText, refText))}}, \\
         \'linkRefSpan\': linkRefSpan \\
     })
     return linkRefSpan
@@ -6844,7 +6857,7 @@ endfunction
 # $arg text: The text to write
 # $arg type: The clipboard content type (default is "text/plain")
 function windowClipboardWrite(text):
-    return objectSet(markdownUpState, \'windowClipboard\', text)
+    objectSet(markdownUpState, \'windowClipboard\', text)
 endfunction
 
 
@@ -6931,6 +6944,7 @@ endfunction
 # $arg contentType: Optional (default is "text/plain"). The object content type.
 # $return: The object URL string
 function windowURLObject(data, contentType):
+    contentType = if(contentType != null, contentType, \'text/plain\')
     return \'blob:\' + urlEncode(contentType) + \'-\' + urlEncode(if(stringLength(data) < 20, data, stringSlice(data, 0, 20)))
 endfunction
 
@@ -7067,17 +7081,16 @@ async function pagerMain(pagerModel, options):
     for page, ixPage in pages:
         pageName = objectGet(page, \'name\')
         pageHidden = objectGet(page, \'hidden\')
-        pageTypeKey = arrayGet(objectKeys(objectGet(page, \'type\')), 0)
-        pageNavigable = pageTypeKey != \'link\'
+        pageNavigable = !objectHas(objectGet(page, \'type\'), \'link\')
 
         # Start page?
-        if pageNavigable && !pageHidden && startPageName == null:
+        if !startPageExplicit && pageName == optionStart:
             startPageName = pageName
             startPageIndex = ixPage
-        elif !startPageExplicit && pageName == optionStart:
+            startPageExplicit = true
+        elif pageNavigable && !pageHidden && startPageName == null:
             startPageName = pageName
             startPageIndex = ixPage
-            startPageExplicit = true
         endif
 
         # Update the end page
@@ -7112,8 +7125,7 @@ async function pagerMain(pagerModel, options):
     curPageIndex = startPageIndex
     for page, ixPage in pages:
         pageName = objectGet(page, \'name\')
-        pageTypeKey = arrayGet(objectKeys(objectGet(page, \'type\')), 0)
-        pageNavigable = pageTypeKey != \'link\'
+        pageNavigable = !objectHas(objectGet(page, \'type\'), \'link\')
 
         # Current page?
         if pageNavigable && pageName == argPage:
@@ -7131,8 +7143,7 @@ async function pagerMain(pagerModel, options):
         page = arrayGet(pages, ixPage)
         pageName = objectGet(page, \'name\')
         pageHidden = objectGet(page, \'hidden\')
-        pageTypeKey = arrayGet(objectKeys(objectGet(page, \'type\')), 0)
-        pageNavigable = pageTypeKey != \'link\'
+        pageNavigable = !objectHas(objectGet(page, \'type\'), \'link\')
         if !pageHidden && pageNavigable:
             nextPageName = pageName
             break
@@ -7147,8 +7158,7 @@ async function pagerMain(pagerModel, options):
         page = arrayGet(pages, ixPage)
         pageName = objectGet(page, \'name\')
         pageHidden = objectGet(page, \'hidden\')
-        pageTypeKey = arrayGet(objectKeys(objectGet(page, \'type\')), 0)
-        pageNavigable = pageTypeKey != \'link\'
+        pageNavigable = !objectHas(objectGet(page, \'type\'), \'link\')
         if !pageHidden && pageNavigable:
             prevPageName = pageName
             break
@@ -7163,8 +7173,7 @@ async function pagerMain(pagerModel, options):
             pageName = objectGet(page, \'name\')
             pageHidden = objectGet(page, \'hidden\')
             pageType = objectGet(page, \'type\')
-            pageTypeKey = arrayGet(objectKeys(pageType), 0)
-            pageNavigable = pageTypeKey != \'link\'
+            pageLink = objectGet(pageType, \'link\')
 
             # Hidden page?
             if pageHidden:
@@ -7172,10 +7181,10 @@ async function pagerMain(pagerModel, options):
             endif
 
             # Render the menu link
-            if pageTypeKey == \'link\':
-                pageLinkURL = objectGet(objectGet(pageType, \'link\'), \'url\')
+            if pageLink != null:
+                pageLinkURL = objectGet(pageLink, \'url\')
                 arrayPush(menuItems, \'[\' + markdownEscape(pageName) + \'](\' + urlEncode(pageLinkURL) + \')\')
-            elif pageName == objectGet(curPage, \'name\'):
+            elif pageName == curPageName:
                 arrayPush(menuItems, markdownEscape(pageName))
             else:
                 arrayPush(menuItems, argsLink(arguments, pageName, {\'page\': pageName}))
@@ -7198,8 +7207,7 @@ async function pagerMain(pagerModel, options):
 
     # Function page?
     curPageType = objectGet(curPage, \'type\')
-    curPageTypeKey = arrayGet(objectKeys(curPageType), 0)
-    if curPageTypeKey == \'function\':
+    if objectHas(curPageType, \'function\'):
         # Set the title
         title = objectGet(objectGet(curPageType, \'function\'), \'title\')
         if title != null:
@@ -7210,7 +7218,7 @@ async function pagerMain(pagerModel, options):
         # Call the page function
         pageFn = objectGet(objectGet(curPageType, \'function\'), \'function\')
         pageFn(args)
-    elif curPageTypeKey == \'markdown\':
+    elif objectHas(curPageType, \'markdown\'):
         # Fetch the Markdown text
         url = objectGet(objectGet(curPageType, \'markdown\'), \'url\')
         markdownText = systemFetch(url)
@@ -7275,6 +7283,9 @@ include <draw.bare>
 function qrcodeDraw(message, x, y, size, level):
     # Get the QR code pixel matrix
     matrix = if(systemType(message) == \'string\', qrcodeMatrix(message, level), message)
+    if matrix == null:
+        return
+    endif
     qrcodeSize = arrayLength(matrix)
 
     # Draw the white background
@@ -7315,6 +7326,9 @@ endfunction
 function qrcodeElements(message, size, level):
     # Get the QR code pixel matrix
     matrix = if(systemType(message) == \'string\', qrcodeMatrix(message, level), message)
+    if matrix == null:
+        return null
+    endif
     qrcodeSize = arrayLength(matrix)
 
     # Compute the black pixel paths
@@ -7722,15 +7736,15 @@ function qrcodeDataBits(qrcode, level, message):
     # Compute the message bits
     messageBits = qrcodeMessageBits(qrcode, level, message)
 
-    # Padding bits
+    # Padding bits - the pad bytes 236 and 17 alternate
     paddingBits = []
     remainingBitCount = totalMessageCodewords * 8 - arrayLength(messageBits)
     byteCount = mathFloor(remainingBitCount / 8)
+    padBits236 = qrcodeBytesToBits([236])
+    padBits17 = qrcodeBytesToBits([17])
     ix = 0
     while ix < byteCount:
-        padValue = if(ix % 2, 17, 236)
-        padBits = qrcodeBytesToBits([padValue])
-        arrayExtend(paddingBits, padBits)
+        arrayExtend(paddingBits, if(ix % 2, padBits17, padBits236))
         ix = ix + 1
     endwhile
 
@@ -7844,7 +7858,7 @@ endfunction
 
 # Mode determination regex
 qrcodeModeNumericRegex = regexNew(\'^[0-9]+$\')
-qrcodeModeAlphanumericRegex = regexNew(\'^[0-9A-Z $%*+-./:]+$\')
+qrcodeModeAlphanumericRegex = regexNew(\'^[0-9A-Z $%*+\\\\-./:]+$\')
 qrcodeModeAlphanumericStr = \'0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ $%*+-./:\'
 
 
@@ -8915,27 +8929,27 @@ async function schemaDocMain(url, title, hideNoGroup):
         markdownPrint(\'\', argsLink(schemaDocArguments, if(single, \'Multi Page\', \'Single Page\'), {\'single\': !single}))
     endif
 
-    # Group the types
+    # Group the type names
     groups = {}
     typeNames = arraySort(objectKeys(types))
-    typeGroups = {\'action\': \'Actions\', \'enum\': \'Enums\', \'struct\': \'Structs\', \'typedef\': \'Typedefs\'}
     for typeName in typeNames:
         type = objectGet(types, typeName)
-        group = objectGet(objectGet(type, arrayGet(objectKeys(type), 0)), \'docGroup\')
+        typeKey = arrayGet(objectKeys(type), 0)
+        group = objectGet(objectGet(type, typeKey), \'docGroup\')
 
         # No group? Use the type\'s default group.
         if group == null:
             if hideNoGroup:
                 continue
             endif
-            group = objectGet(typeGroups, arrayGet(objectKeys(type), 0))
+            group = objectGet(schemaDocTypeGroups, typeKey)
         endif
 
-        # Add the type to the group
+        # Add the type name to the group
         if !objectHas(groups, group):
             objectSet(groups, group, [])
         endif
-        arrayPush(objectGet(groups, group), type)
+        arrayPush(objectGet(groups, group), typeName)
     endfor
     groupNames = arraySort(objectKeys(groups))
 
@@ -8958,9 +8972,7 @@ async function schemaDocMain(url, title, hideNoGroup):
         endif
 
         # Render the group type links
-        groupTypes = objectGet(groups, groupName)
-        for groupType in groupTypes:
-            groupTypeName = objectGet(objectGet(groupType, arrayGet(objectKeys(groupType), 0)), \'name\')
+        for groupTypeName in objectGet(groups, groupName):
             if single:
                 markdownPrint(\'\', schemaDocMarkdown(types, groupTypeName, {\'headerPrefix\': \'###\', \'hideReferenced\': true}))
             else:
@@ -8971,6 +8983,10 @@ async function schemaDocMain(url, title, hideNoGroup):
 endfunction
 
 
+# The map of type key to default documentation group name
+schemaDocTypeGroups = {\'action\': \'Actions\', \'enum\': \'Enums\', \'struct\': \'Structs\', \'typedef\': \'Typedefs\'}
+
+
 # The Schema Markdown documentation viewer arguments
 schemaDocArguments = argsValidate([ \\
     {\'name\': \'name\'}, \\
@@ -9003,31 +9019,31 @@ function schemaDocMarkdown(types, typeName, options):
     userType = objectGet(types, typeName)
     action = objectGet(userType, \'action\')
 
-    # Compute the referenced types
-    referencedTypes = schemaGetReferencedTypes(types, typeName)
-    if action != null:
-        typesFilter = [ \\
-            typeName, objectGet(action, \'path\'), objectGet(action, \'query\'), objectGet(action, \'input\'), \\
-            objectGet(action, \'output\'), objectGet(action, \'errors\') \\
-        ]
-    else:
-        typesFilter = [typeName]
-    endif
-
-    # Filter and sort referenced types
+    # Compute, filter, and sort the referenced types (not needed when referenced types are hidden)
     filteredTypeNames = []
-    for refTypeName in arraySort(objectKeys(referencedTypes)):
-        if arrayIndexOf(typesFilter, refTypeName) == -1:
-            arrayPush(filteredTypeNames, refTypeName)
+    if !hideReferenced:
+        referencedTypes = schemaGetReferencedTypes(types, typeName)
+        if action != null:
+            typesFilter = [ \\
+                typeName, objectGet(action, \'path\'), objectGet(action, \'query\'), objectGet(action, \'input\'), \\
+                objectGet(action, \'output\'), objectGet(action, \'errors\') \\
+            ]
+        else:
+            typesFilter = [typeName]
         endif
-    endfor
+        for refTypeName in arraySort(objectKeys(referencedTypes)):
+            if arrayIndexOf(typesFilter, refTypeName) == -1:
+                arrayPush(filteredTypeNames, refTypeName)
+            endif
+        endfor
+    endif
 
     # The user type documentation
     lines = []
     arrayExtend(lines, schemaDocUserTypeMarkdown(types, typeName, options, headerPrefix))
 
     # Referenced type documentation
-    if filteredTypeNames && !hideReferenced:
+    if filteredTypeNames:
         arrayPush(lines, \'\')
         arrayPush(lines, \'---\')
         arrayPush(lines, \'\')
@@ -9188,7 +9204,7 @@ function schemaDocUserTypeMarkdown(types, typeName, options, headerPrefix, title
         endif
 
         # Type table data
-        attrText = if(objectHas(typedef, \'attr\'), schemaDocAttrText(typedef))
+        attrText = schemaDocAttrText(typedef)
         tableData = [{\'Type\': schemaDocTypeText(types, objectGet(typedef, \'type\'))}]
         if attrText != null:
             objectSet(arrayGet(tableData, 0), \'Attributes\', attrText)
@@ -9413,7 +9429,7 @@ function schemaDocAttrParts(parts, noun, attr, optional):
             arrayPush(parts, noun + \' >= \' + objectGet(attr, \'gte\'))
         endif
         if objectHas(attr, \'lt\'):
-            arrayPush(parts, noun + \' < \'+ objectGet(attr, \'lt\'))
+            arrayPush(parts, noun + \' < \' + objectGet(attr, \'lt\'))
         endif
         if objectHas(attr, \'lte\'):
             arrayPush(parts, noun + \' <= \' + objectGet(attr, \'lte\'))
@@ -11053,7 +11069,7 @@ function unittestReport(options):
     testFailCount = 0
     for testName in testNames:
         testFailures = objectGet(unittestTests, testName)
-        if arrayLength(testFailures):
+        if testFailures:
             testFailCount = testFailCount + 1
         endif
     endfor
@@ -11066,10 +11082,11 @@ function unittestReport(options):
 
     # Render the page title
     documentSetTitle(title)
+    testSummary = \'Ran \' + testCount + \' tests - \' + testPassCount + \' passed, \' + testFailCount + \' failed\'
     markdownPrint( \\
         \'# \' + markdownEscape(title), \\
         \'\', \\
-        \'Ran \' + testCount + \' tests - \' + testPassCount + \' passed, \' + testFailCount + \' failed\' \\
+        testSummary \\
     )
     if !isReport:
         if testNameArg:
@@ -11097,7 +11114,7 @@ function unittestReport(options):
         if !hideTests || testNameArg:
             for testName in testNames:
                 testFailures = objectGet(unittestTests, testName)
-                if arrayLength(testFailures):
+                if testFailures:
                     failureLink = if(isReport, testName, \\
                         argsLink(unittestReportArguments, testName, {\'test\': testName}, false, \'_top\'))
                     failureLines = [\'\', failureLink + \' - FAIL\']
@@ -11126,7 +11143,7 @@ function unittestReport(options):
         if !hideTests || testNameArg:
             for testName in testNames:
                 testFailures = objectGet(unittestTests, testName)
-                if !arrayLength(testFailures):
+                if !testFailures:
                     testLink = if(isReport, testName, \\
                         argsLink(unittestReportArguments, testName, {\'test\': testName}, false, \'_top\'))
                     markdownPrint(\'\', testLink + \' - OK\')
@@ -11135,23 +11152,26 @@ function unittestReport(options):
         endif
     endif
 
-    # Coverage report
+    # Compute the coverage data, the total coverage percentage, and the coverage error, if any
     coverage = unittestCoverageGlobal()
+    coverageData = if(!testNameArg && coverage, unittestCoverageData(coverageExclude))
+    coveragePercent = if(coverageData, objectGet(arrayGet(coverageData, arrayLength(coverageData) - 1), \'Coverage\'))
+    coverageSummary = if(coveragePercent != null, \'Coverage: \' + numberToFixed(coveragePercent, 2) + \'%\' + \\
+        if(coverageMin, \' (minimum \' + numberToFixed(coverageMin, 2) + \'%)\', \'\'))
+    coverageError = if(coveragePercent != null && coveragePercent < coverageMin, \\
+        \'**Error**: Coverage percentage, \' + numberToFixed(coveragePercent, 2) + \\
+            \'%, is below the minimum coverage percentage of \' + numberToFixed(coverageMin, 2) + \'%.\')
+
+    # Coverage report
     coverageFailCount = 0
     if !testNameArg && coverage:
         markdownPrint(\'\', \'## Coverage Report\')
-
-        # Compute the coverage data table
-        coverageData = unittestCoverageData(coverageExclude)
         if coverageData:
+            markdownPrint(\'\', coverageSummary)
+
             # Verify the coverage percent
-            coveragePercent = objectGet(arrayGet(coverageData, arrayLength(coverageData) - 1), \'Coverage\')
-            if coveragePercent < coverageMin:
-                markdownPrint( \\
-                    \'\', \\
-                    \'**Error**: Coverage percentage, \' + numberToFixed(coveragePercent, 1, true) + \\
-                        \'%, is below the minimum coverage percentage of \' + numberToFixed(coverageMin, 1, true) + \'%.\' \\
-                )
+            if coverageError != null:
+                markdownPrint(\'\', coverageError)
                 coverageFailCount = coverageFailCount + 1
             endif
 
@@ -11161,7 +11181,7 @@ function unittestReport(options):
                 if !isReport && !stringStartsWith(scriptName, \'**\'):
                     objectSet(row, \'Script\', argsLink(unittestReportArguments, scriptName, {"script": scriptName}, false, "_top"))
                 endif
-                objectSet(row, \'Coverage\', numberToFixed(objectGet(row, \'Coverage\'), 1) + \'%\')
+                objectSet(row, \'Coverage\', numberToFixed(objectGet(row, \'Coverage\'), 2) + \'%\')
             endfor
             markdownPrint(\'\', dataTableMarkdown(coverageData, { \\
                 \'fields\': [\'Script\', \'Statements\', \'Missing\', \'Coverage\'], \\
@@ -11176,6 +11196,15 @@ function unittestReport(options):
         endif
     endif
 
+    # Render the summary section
+    markdownPrint(\'\', \'## Summary\', \'\', testSummary)
+    if coverageSummary != null:
+        markdownPrint(\'\', coverageSummary)
+    endif
+    if coverageError != null:
+        markdownPrint(\'\', coverageError)
+    endif
+
     # Return status code
     return testWarningCount + testFailCount + coverageFailCount
 endfunction
@@ -11273,7 +11302,7 @@ function unittestReportScriptLines(codeLineElements, lines, color, noNewline):
 endfunction
 
 
-# Get the coverage data table - columns are "Script", "Statement", "Covered", and "Percent"
+# Get the coverage data table - columns are "Script", "Statements", "Missing", and "Coverage"
 function unittestCoverageData(coverageExclude):
     data = []
 
@@ -11328,8 +11357,7 @@ function unittestCoverageData(coverageExclude):
                 \'Script\': scriptName, \\
                 \'Statements\': statementCount, \\
                 \'Missing\': missingCount, \\
-                \'Coverage\':  coveragePercent, \\
-                \'CoverageStr\': numberToFixed(coveragePercent, 1) + \'%\'  \\
+                \'Coverage\':  coveragePercent \\
             })
         endfor
 
@@ -11340,8 +11368,7 @@ function unittestCoverageData(coverageExclude):
                 \'Script\': \'**Total**\', \\
                 \'Statements\': totalStatements, \\
                 \'Missing\': totalMissing, \\
-                \'Coverage\': coveragePercent, \\
-                \'CoverageStr\': numberToFixed(coveragePercent, 1) + \'%\'  \\
+                \'Coverage\': coveragePercent \\
             })
         endif
     endif
@@ -11359,9 +11386,9 @@ function unittestScriptStatements(script):
         arrayPush(statements, statement)
 
         # Add function statements
-        statementKey = arrayGet(objectKeys(statement), 0)
-        if statementKey == \'function\':
-            for funcStatement in objectGet(objectGet(statement, statementKey), \'statements\'):
+        statementFunction = objectGet(statement, \'function\')
+        if statementFunction != null:
+            for funcStatement in objectGet(statementFunction, \'statements\'):
                 arrayPush(statements, funcStatement)
             endfor
         endif
@@ -11388,15 +11415,20 @@ unittestMockWindowHeight = 768
 unittestMockWindowWidth = 1024
 
 
+# Create a new mocked MarkdownUp state
+function unittestMockStateNew():
+    return { \\
+        \'localStorage\': {}, \\
+        \'sessionStorage\': {}, \\
+        \'windowClipboard\': \'\' \\
+    }
+endfunction
+
+
 # The mocked MarkdownUp state
 unittestMockCalls = []
 unittestMockFunctions = {}
-unittestMockStateDefault = { \\
-    \'localStorage\': {}, \\
-    \'sessionStorage\': {}, \\
-    \'windowClipboard\': \'\' \\
-}
-unittestMockState = objectCopy(unittestMockStateDefault)
+unittestMockState = unittestMockStateNew()
 
 
 # $function: unittestMockAll
@@ -11459,7 +11491,7 @@ endfunction
 # $arg funcName: The name of the function to mock
 # $arg mockFunc: The mock function
 function unittestMockOne(funcName, mockFunc):
-    # Replace the function withi the mocked function
+    # Replace the function with the mocked function
     objectSet(unittestMockFunctions, funcName, systemGlobalGet(funcName))
     systemGlobalSet(funcName, mockFunc)
 endfunction
@@ -11494,7 +11526,7 @@ function unittestMockEnd():
     mockCalls = unittestMockCalls
     systemGlobalSet(\'unittestMockCalls\', [])
     systemGlobalSet(\'unittestMockFunctions\', {})
-    systemGlobalSet(\'unittestMockState\', objectCopy(unittestMockStateDefault))
+    systemGlobalSet(\'unittestMockState\', unittestMockStateNew())
 
     return mockCalls
 endfunction
@@ -11644,6 +11676,7 @@ endfunction
 
 
 function unittestMock_windowURLObject(data, contentType):
+    contentType = if(contentType != null, contentType, \'text/plain\')
     return \'blob:\' + urlEncode(contentType) + \'-\' + urlEncode(if(stringLength(data) < 20, data, stringSlice(data, 0, 20)))
 endfunction
 
@@ -11701,7 +11734,7 @@ endfunction
 function urlEncodeQueryStringHelper(obj, memberFqn, keyValues):
     objType = systemType(obj)
     if objType == \'array\':
-        if arrayLength(obj) == 0:
+        if !obj:
             arrayPush(keyValues, if(memberFqn != null, memberFqn + \'=\', \'\'))
         else:
             for value, ixValue in obj:
@@ -11713,7 +11746,7 @@ function urlEncodeQueryStringHelper(obj, memberFqn, keyValues):
         arrayPush(keyValues, if(memberFqn != null, memberFqn + \'=\' + objEncoded, objEncoded))
     elif objType == \'object\':
         keys = arraySort(objectKeys(obj))
-        if arrayLength(keys) == 0:
+        if !keys:
             arrayPush(keyValues, if(memberFqn != null, memberFqn + \'=\', \'\'))
         else:
             for key in keys:
@@ -11881,6 +11914,7 @@ function urlEncodeHelper(url, regexSafe, regexUnsafe):
     # implementation, in which case null is returned below
     parts = []
     ixSafe = 0
+    encodeFailed = false
     for match in regexMatchAll(regexUnsafe, url):
         ixUnsafe = objectGet(match, \'index\')
         unsafe = objectGet(objectGet(match, \'groups\'), \'0\')
@@ -11893,6 +11927,7 @@ function urlEncodeHelper(url, regexSafe, regexUnsafe):
 
         # Percent-encode the run\'s unsafe UTF-8 bytes
         bytes = stringEncode(unsafe)
+        encodeFailed = encodeFailed || bytes == null
         for byte in if(bytes != null, bytes, []):
             arrayPush(parts, arrayGet(urlEncodeBytes, byte))
         endfor
@@ -11903,7 +11938,7 @@ function urlEncodeHelper(url, regexSafe, regexUnsafe):
         arrayPush(parts, stringSlice(url, ixSafe))
     endif
 
-    return if(bytes != null, arrayJoin(parts, \'\'))
+    return if(!encodeFailed, arrayJoin(parts, \'\'))
 endfunction
 
 
@@ -11934,9 +11969,12 @@ function urlDecodeComponent(string):
         return string
     endif
 
-    # Compute the decoded UTF-8 byte array
+    # Compute the decoded UTF-8 byte array - stringEncode fails on surrogate code points under
+    # the Python implementation, in which case null is returned below
     parts = stringSplit(string, \'%\')
-    bytes = stringEncode(arrayGet(parts, 0))
+    partBytes = stringEncode(arrayGet(parts, 0))
+    encodeFailed = partBytes == null
+    bytes = if(partBytes != null, partBytes, [])
     for part, ixPart in parts:
         if ixPart == 0:
             continue
@@ -11949,12 +11987,14 @@ function urlDecodeComponent(string):
         endif
         arrayPush(bytes, numberParseInt(stringSlice(part, 0, 2), 16))
         if stringLength(part) > 2:
-            arrayExtend(bytes, stringEncode(stringSlice(part, 2)))
+            partBytes = stringEncode(stringSlice(part, 2))
+            encodeFailed = encodeFailed || partBytes == null
+            arrayExtend(bytes, if(partBytes != null, partBytes, []))
         endif
     endfor
 
-    # Invalid UTF-8?
-    decoded = stringDecode(bytes)
+    # Invalid UTF-8 or unencodable input?
+    decoded = if(!encodeFailed, stringDecode(bytes))
     if decoded == null:
         systemLogDebug("url.bare: Invalid percent-encoding \'" + urlTruncate(string) + "\'")
     endif

{bare_script-5.0.0 → bare_script-5.0.3}/src/bare_script/value.py

@@ -507,8 +507,23 @@ def value_parse_datetime(text):
             month = int(m_date.group('month'))
             day = int(m_date.group('day'))
             return datetime.datetime(year, month, day)
-        if _R_DATETIME.match(text):
-            result = datetime.datetime.fromisoformat(_R_DATETIME_ZULU.sub('+00:00', text)).astimezone().replace(tzinfo=None)
+        m_datetime = _R_DATETIME.match(text)
+        if m_datetime is not None:
+            text_zulu = _R_DATETIME_ZULU.sub('+00:00', text)
+
+            # fromisoformat's support for ISO 8601's hour-24 end-of-day special case varies across Python
+            # versions, so handle it explicitly rather than relying on stdlib behavior
+            is_hour24 = m_datetime.group('hour') == '24'
+            if is_hour24:
+                if m_datetime.group('minute') != '00' or m_datetime.group('second') != '00' or \
+                        (m_datetime.group('fraction') is not None and int(m_datetime.group('fraction')) != 0):
+                    return None
+                text_zulu = text_zulu[:11] + '00' + text_zulu[13:]
+
+            result = datetime.datetime.fromisoformat(text_zulu)
+            if is_hour24:
+                result += datetime.timedelta(days=1)
+            result = result.astimezone().replace(tzinfo=None)
             return result.replace(microsecond=(result.microsecond // 1000) * 1000)
     except ValueError:
         return None
@@ -516,7 +531,10 @@ def value_parse_datetime(text):
     return None
 
 _R_DATE = re.compile(r'^(?P<year>[0-9]{4})-(?P<month>[0-9]{2})-(?P<day>[0-9]{2})$')
-_R_DATETIME = re.compile(r'^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}(?:\.[0-9]{1,6})?(?:Z|[+-][0-9]{2}:[0-9]{2})$')
+_R_DATETIME = re.compile(
+    r'^[0-9]{4}-[0-9]{2}-[0-9]{2}T(?P<hour>[0-9]{2}):(?P<minute>[0-9]{2}):(?P<second>[0-9]{2})'
+    r'(?:\.(?P<fraction>[0-9]{1,6}))?(?:Z|[+-][0-9]{2}:[0-9]{2})$'
+)
 _R_DATETIME_ZULU = re.compile(r'Z$')
 
 

{bare_script-5.0.0 → bare_script-5.0.3/src/bare_script.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bare-script
-Version: 5.0.0
+Version: 5.0.3
 Summary: bare-script
 Home-page: https://github.com/craigahobbs/bare-script
 Author: Craig A. Hobbs