bare-script 3.2.2 → 3.2.3

package/lib/include/args.mds

@@ -11,7 +11,7 @@ argsSentinel = true
 
 # The URL arguments model
 argsTypes = schemaParse( \
-    'group "Args"', \
+    'group "args.mds"', \
     '', \
     '', \
     '# An argument model list', \

package/lib/include/diff.bare

@@ -0,0 +1,155 @@
+# Licensed under the MIT License
+# https://github.com/craigahobbs/markdown-up/blob/main/LICENSE
+
+
+# Include sentinel
+if systemGlobalGet('diffSentinel'):
+    return
+endif
+diffSentinel = true
+
+
+# The text line difference model
+diffTypes = schemaParse( \
+    'group "diff.bare"', \
+    '', \
+    '', \
+    '# A list of text line differences', \
+    'typedef Difference[] Differences', \
+    '', \
+    '', \
+    '# A difference', \
+    'struct Difference', \
+    '', \
+    '    # The type of difference', \
+    '    DifferenceType type', \
+    '', \
+    '    # The text lines of this difference', \
+    '    string[] lines', \
+    '', \
+    '', \
+    '# A difference type', \
+    'enum DifferenceType', \
+    '', \
+    '    # The lines are identical', \
+    '    Identical', \
+    '', \
+    '    # The lines were added', \
+    '    Add', \
+    '', \
+    '    # The lines were removed', \
+    '    Remove' \
+)
+
+
+# $function: diffLines
+# $group: diff.bare
+# $doc: Compute the line-differences of two strings or arrays of strings
+# $arg left: The "left" string or array of strings
+# $arg right: The "right" string or array of strings
+# $return: The array of [difference models](includeModel.html#var.vName='Differences')
+function diffLines(left, right):
+    diffs = arrayNew()
+
+    # Split the left into an array of lines
+    if systemType(left) == 'array':
+        leftLines = arrayNew()
+        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 = arrayNew()
+        for rightPart in right:
+            arrayExtend(rightLines, regexSplit(diffRegexLineSplit, rightPart))
+        endfor
+    else:
+        rightLines = regexSplit(diffRegexLineSplit, right)
+    endif
+
+    # Compute the differences
+    ixLeft = 0
+    ixRight = 0
+    leftLength = arrayLength(leftLines)
+    rightLength = arrayLength(rightLines)
+    while ixLeft < leftLength || ixRight < rightLength:
+        # If we've run out of lines on either side
+        if ixLeft >= leftLength:
+            if ixRight < rightLength:
+                arrayPush(diffs, objectNew('type', 'Add', 'lines', arraySlice(rightLines, ixRight)))
+            endif
+            break
+        endif
+        if ixRight >= rightLength:
+            if ixLeft < leftLength:
+                arrayPush(diffs, objectNew('type', 'Remove', 'lines', arraySlice(leftLines, ixLeft)))
+            endif
+            break
+        endif
+
+        # Find consecutive identical lines
+        identicalLines = arrayNew()
+        while ixLeft < leftLength && ixRight < rightLength && arrayGet(leftLines, ixLeft) == arrayGet(rightLines, ixRight):
+            arrayPush(identicalLines, arrayGet(leftLines, ixLeft))
+            ixLeft = ixLeft + 1
+            ixRight = ixRight + 1
+        endwhile
+        if identicalLines:
+            arrayPush(objectdiffs, objectNew('type', 'Identical', 'lines', identicalLines))
+            continue
+        endif
+
+        # Look ahead to find next matching point
+        foundMatch = False
+        ixLeftTmp = ixLeft
+        while ixLeftTmp < leftLength:
+            ixRightTmp = ixRight
+            while ixRightTmp < rightLength:
+                if arrayGet(leftLines, ixLeftTmp) == arrayGet(rightLines, ixRightTmp):
+                    foundMatch = true
+                    break
+                endif
+                ixRightTmp = ixRightTmp + 1
+            endwhile
+            if foundMatch:
+                break
+            endif
+            ixLeftTmp = ixLeftTmp + 1
+        endwhile
+
+        # If no match found, use remaining lines
+        if !foundMatch:
+            if ixLeft < leftLength:
+                arrayPush(diffs, objectNew('type', 'Remove', 'lines', arraySlice(leftLines, ixLeft)))
+                ixLeft = leftLength
+            endif
+            if ixRight < rightLength:
+                arrayPush(diffs, objectNew('type', 'Add', 'lines', arraySlice(rightLines, ixRight)))
+                ixRight = rightLength
+            endif
+            continue
+        endif
+
+        # Add removed lines if any
+        if ixLeftTmp > ixLeft:
+            arrayPush(diffs, objectNew('type', 'Remove', 'lines', arraySlice(leftLines, ixLeft, ixLeftTmp)))
+            ixLeft = ixLeftTmp
+        endif
+
+        # Add added lines if any
+        if ixRightTmp > ixRight:
+            arrayPush(diffs, objectNew('type', 'Add', 'lines', arraySlice(rightLines, ixRight, ixRightTmp)))
+            ixRight = ixRightTmp
+        endif
+    endwhile
+
+    return diffs
+endfunction
+
+
+# Regex for splitting lines
+diffRegexLineSplit = regexNew(stringFromCharCode(13) + '?' + stringFromCharCode(10))

package/lib/include/pager.mds

@@ -13,7 +13,7 @@ pagerSentinel = true
 
 # The pager model
 pagerTypes = schemaParse( \
-    'group "Pager"', \
+    'group "pager.mds"', \
     '', \
     '', \
     '# A pager application model', \

package/lib/include/unittest.mds

@@ -9,6 +9,9 @@ endif
 unittestSentinel = true
 
 
+include 'diff.bare'
+
+
 # Test statistics
 unittestTests = objectNew()
 unittestWarnings = arrayNew()
@@ -116,7 +119,7 @@ function unittestReport():
                             arrayPush(failureLines, '')
                             arrayPush(failureLines, '- ' + errorLine)
                         else:
-                            arrayPush(failureLines, '  ' + errorLine)
+                            arrayPush(failureLines, if(errorLine, '  ' + errorLine, ''))
                         endif
                     endfor
                 endfor
@@ -148,8 +151,27 @@ endfunction
 # $arg expected: The expected value
 # $arg description: The description of the assertion
 function unittestEqual(actual, expected, description):
-    if actual != expected:
-        unittestRecordError(jsonStringify(actual), jsonStringify(expected), description)
+    if actual == expected:
+        return
+    endif
+
+    # Add the test failure error lines
+    testFailures = objectGet(unittestTests, unittestTestName)
+    errorLines = arrayNew( \
+        'Equal:', \
+        '', \
+        '```', \
+        jsonStringify(actual), \
+        '```', \
+        '', \
+        '```', \
+        jsonStringify(expected), \
+        '```' \
+    )
+    if description != null:
+        arrayPush(testFailures, arrayExtend(arrayNew(markdownEscape(description), errorLines)))
+    else:
+        arrayPush(testFailures, errorLines)
     endif
 endfunction
 
@@ -161,28 +183,44 @@ endfunction
 # $arg expected: The expected value
 # $arg description: The description of the assertion
 function unittestDeepEqual(actual, expected, description):
-    actualJSON = jsonStringify(actual)
-    expectedJSON = jsonStringify(expected)
-    if actualJSON != expectedJSON:
-        unittestRecordError(actualJSON, expectedJSON, description)
+    # Serialize as JSON
+    actualJSON = if(systemType(actual) == 'string', actual, jsonStringify(actual, 4))
+    expectedJSON = if(systemType(expected) == 'string', expected, jsonStringify(expected, 4))
+    if actualJSON == expectedJSON:
+        return
     endif
-endfunction
 
+    # Compute the difference lines
+    errorLines = arrayNew()
+    diffErrorLines = arrayNew()
+    for diff in diffLines(actualJSON, expectedJSON):
+        diffType = objectGet(diff, 'type')
+        if diffType == 'Remove':
+            for diffLine in objectGet(diff, 'lines'):
+                arrayPush(diffErrorLines, '--- ' + diffLine)
+            endfor
+        elif diffType == 'Add':
+            for diffLine in objectGet(diff, 'lines'):
+                arrayPush(diffErrorLines, '+++ ' + diffLine)
+            endfor
+        else:
+            # diffType == 'Identical'
+            if diffErrorLines:
+                arrayExtend(errorLines, arrayNew('Deep-equal:', '', '```'))
+                arrayExtend(errorLines, diffErrorLines)
+                arrayPush(errorLines, '```')
+                diffErrorLines = arrayNew()
+            endif
+        endif
+    endfor
+    if diffErrorLines:
+        arrayExtend(errorLines, arrayNew('Deep-equal:', '', '```'))
+        arrayExtend(errorLines, diffErrorLines)
+        arrayPush(errorLines, '```')
+    endif
 
-# Helper function to record a unit test error
-function unittestRecordError(actualStr, expectedStr, description):
+    # Add the test failure error lines
     testFailures = objectGet(unittestTests, unittestTestName)
-    errorLines = arrayNew( \
-        '~~~', \
-        actualStr, \
-        '~~~', \
-        '', \
-        '!=', \
-        '', \
-        '~~~', \
-        expectedStr, \
-        '~~~' \
-    )
     if description != null:
         arrayPush(testFailures, arrayExtend(arrayNew(markdownEscape(description), errorLines)))
     else:

package/lib/value.js

@@ -206,8 +206,7 @@ export function valueCompare(left, right) {
         const leftKeyValues = Object.entries(left).sort((kv1, kv2) => kv1[0] < kv2[0] ? -1 : 1);
         const rightKeyValues = Object.entries(right).sort((kv1, kv2) => kv1[0] < kv2[0] ? -1 : 1);
         const ixMax = Math.min(leftKeyValues.length, rightKeyValues.length);
-        let ix = 0;
-        while (ix < ixMax) {
+        for (let ix = 0; ix < ixMax; ix++) {
             const keyCompare = valueCompare(leftKeyValues[ix][0], rightKeyValues[ix][0]);
             if (keyCompare !== 0) {
                 return keyCompare;
@@ -216,7 +215,6 @@ export function valueCompare(left, right) {
             if (valCompare !== 0) {
                 return valCompare;
             }
-            ix += 1;
         }
         return leftKeyValues.length < rightKeyValues.length ? -1 : (leftKeyValues.length === rightKeyValues.length ? 0 : 1);
     }

package/package.json

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