bare-script 3.7.1 → 3.7.2

package/lib/include/args.bare

@@ -62,7 +62,7 @@ function argsValidate(arguments):
 
     # Check for duplicate arguments
     if validatedArguments != null:
-        argNames = objectNew()
+        argNames = {}
         for argument in arguments:
             name = objectGet(argument, 'name')
             if objectHas(argNames, name):
@@ -86,7 +86,7 @@ endfunction
 # $return: The arguments object
 function argsParse(arguments):
     # Create the arguments object
-    args = objectNew()
+    args = {}
     for argument in arguments:
         # Get the argument value
         global = argsGlobalName(argument)
@@ -119,8 +119,8 @@ endfunction
 # $return: The MarkdownUp application URL
 function argsURL(arguments, args, explicit, headerText, url):
     # Get the URL variables
-    urlVars = arrayNew()
-    argNames = objectNew()
+    urlVars = []
+    argNames = {}
     for argument in arguments:
         name = objectGet(argument, 'name')
         type = objectGet(argument, 'type')
@@ -189,7 +189,7 @@ endfunction
 # $arg arguments: The [arguments model](includeModel.html#var.vName='ArgsArguments')
 function argsHelp(arguments):
     # Create the help data
-    helpData = arrayNew()
+    helpData = []
     anyDefault = false
     anyExplicit = false
     anyDescription = false
@@ -200,13 +200,13 @@ function argsHelp(arguments):
         description = objectGet(argument, 'description')
 
         # Add the help data row
-        arrayPush(helpData, objectNew( \
-            'Variable', argsGlobalName(argument), \
-            'Type', type, \
-            'Default', argsFormatValue(default, type), \
-            'Explicit', if(explicit, 'Yes', ''), \
-            'Description', if(description != null, description, '') \
-        ))
+        arrayPush(helpData, { \
+            'Variable': argsGlobalName(argument), \
+            'Type': type, \
+            'Default': argsFormatValue(default, type), \
+            'Explicit': if(explicit, 'Yes', ''), \
+            'Description': if(description != null, description, '') \
+        })
 
         # Update the "any" field bools
         anyDefault = anyDefault || (default != null)
@@ -215,7 +215,7 @@ function argsHelp(arguments):
     endfor
 
     # Render the help table
-    helpFields = arrayNew('Variable', 'Type')
+    helpFields = ['Variable', 'Type']
     if anyDefault:
         arrayPush(helpFields, 'Default')
     endif
@@ -225,7 +225,7 @@ function argsHelp(arguments):
     if anyDescription:
         arrayPush(helpFields, 'Description')
     endif
-    dataTable(helpData, objectNew('fields', helpFields))
+    dataTable(helpData, {'fields': helpFields})
 endfunction
 
 

package/lib/include/dataTable.bare

@@ -92,7 +92,7 @@ function dataTableMarkdown(data, model):
     endif
 
     # Determine the table fields
-    fields = arrayNew()
+    fields = []
     modelFields = if(model != null, objectGet(model, 'fields'))
     modelCategories = if(model != null, objectGet(model, 'categories'))
     if modelFields != null || modelCategories != null:
@@ -116,7 +116,7 @@ function dataTableMarkdown(data, model):
     formats = if(model != null, objectGet(model, 'formats'))
 
     # Compute the field header widths
-    widths = objectNew()
+    widths = {}
     for field in fields:
         fieldWidth = stringLength(field)
         if !objectHas(widths, field) || fieldWidth > objectGet(widths, field):
@@ -125,9 +125,9 @@ function dataTableMarkdown(data, model):
     endfor
 
     # Compute the formatted field value strings and widths
-    dataFormat = arrayNew()
+    dataFormat = []
     for row in data:
-        rowFormat = objectNew()
+        rowFormat = {}
         arrayPush(dataFormat, rowFormat)
         for field in fields:
             # Format the value
@@ -176,7 +176,7 @@ function dataTableMarkdown(data, model):
     headerFields = headerFields + '|'
 
     # Output the table header
-    lines = arrayNew()
+    lines = []
     arrayPush(lines, headerFields)
     arrayPush(lines, headerSeparator)
 

package/lib/include/diff.bare

@@ -49,11 +49,11 @@ diffTypes = schemaParse( \
 # $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()
+    diffs = []
 
     # Split the left into an array of lines
     if systemType(left) == 'array':
-        leftLines = arrayNew()
+        leftLines = []
         for leftPart in left:
             arrayExtend(leftLines, regexSplit(diffRegexLineSplit, leftPart))
         endfor
@@ -63,7 +63,7 @@ function diffLines(left, right):
 
     # Split the right into an array of lines
     if systemType(right) == 'array':
-        rightLines = arrayNew()
+        rightLines = []
         for rightPart in right:
             arrayExtend(rightLines, regexSplit(diffRegexLineSplit, rightPart))
         endfor
@@ -80,26 +80,26 @@ function diffLines(left, right):
         # 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)))
+                arrayPush(diffs, {'type': 'Add', 'lines': arraySlice(rightLines, ixRight)})
             endif
             break
         endif
         if ixRight >= rightLength:
             if ixLeft < leftLength:
-                arrayPush(diffs, objectNew('type', 'Remove', 'lines', arraySlice(leftLines, ixLeft)))
+                arrayPush(diffs, {'type': 'Remove', 'lines': arraySlice(leftLines, ixLeft)})
             endif
             break
         endif
 
         # Find consecutive identical lines
-        identicalLines = arrayNew()
+        identicalLines = []
         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(diffs, objectNew('type', 'Identical', 'lines', identicalLines))
+            arrayPush(diffs, {'type': 'Identical', 'lines': identicalLines})
             continue
         endif
 
@@ -124,11 +124,11 @@ function diffLines(left, right):
         # If no match found, use remaining lines
         if !foundMatch:
             if ixLeft < leftLength:
-                arrayPush(diffs, objectNew('type', 'Remove', 'lines', arraySlice(leftLines, ixLeft)))
+                arrayPush(diffs, {'type': 'Remove', 'lines': arraySlice(leftLines, ixLeft)})
                 ixLeft = leftLength
             endif
             if ixRight < rightLength:
-                arrayPush(diffs, objectNew('type', 'Add', 'lines', arraySlice(rightLines, ixRight)))
+                arrayPush(diffs, {'type': 'Add', 'lines': arraySlice(rightLines, ixRight)})
                 ixRight = rightLength
             endif
             continue
@@ -136,13 +136,13 @@ function diffLines(left, right):
 
         # Add removed lines if any
         if ixLeftTmp > ixLeft:
-            arrayPush(diffs, objectNew('type', 'Remove', 'lines', arraySlice(leftLines, ixLeft, ixLeftTmp)))
+            arrayPush(diffs, {'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)))
+            arrayPush(diffs, {'type': 'Add', 'lines': arraySlice(rightLines, ixRight, ixRightTmp)})
             ixRight = ixRightTmp
         endif
     endwhile

package/lib/include/forms.bare

@@ -18,18 +18,18 @@ formsSentinel = true
 # $arg onEnter: Optional (default is null). The text input element on-enter event handler
 # $return: The text input [element model](https://github.com/craigahobbs/element-model#readme)
 function formsTextElements(id, text, size, onEnter):
-    return objectNew( \
-        'html', 'input', \
-        'attr', objectNew( \
-            'autocomplete', 'off', \
-            'id', id, \
-            'style', 'font-size: inherit; border: thin solid black; padding: 0.4em;', \
-            'type', 'text', \
-            'value', text, \
-            'size', size \
-        ), \
-        'callback', if(onEnter != null, objectNew('keyup', systemPartial(formsTextOnKeyup, onEnter))) \
-    )
+    return { \
+        'html': 'input', \
+        'attr': { \
+            'autocomplete': 'off', \
+            'id': id, \
+            'style': 'font-size: inherit; border: thin solid black; padding: 0.4em;', \
+            'type': 'text', \
+            'value': text, \
+            'size': size \
+        }, \
+        'callback': if(onEnter != null, {'keyup': systemPartial(formsTextOnKeyup, onEnter)}) \
+    }
 endfunction
 
 
@@ -47,12 +47,12 @@ endfunction
 # $arg onClick: The link button's click event handler
 # $return: The link button [element model](https://github.com/craigahobbs/element-model#readme)
 function formsLinkButtonElements(text, onClick):
-    return objectNew( \
-        'html', 'a', \
-        'attr', objectNew('style', 'cursor: pointer; user-select: none;'), \
-        'elem', objectNew('text', text), \
-        'callback', objectNew('click', onClick) \
-    )
+    return { \
+        'html': 'a', \
+        'attr': {'style': 'cursor: pointer; user-select: none;'}, \
+        'elem': {'text': text}, \
+        'callback': {'click': onClick} \
+    }
 endfunction
 
 
@@ -64,16 +64,16 @@ endfunction
 # $return: The link [element model](https://github.com/craigahobbs/element-model#readme)
 function formsLinkElements(text, url):
     if url == null:
-        return objectNew( \
-            'html', 'span', \
-            'attr', objectNew('style', 'user-select: none;'), \
-            'elem', objectNew('text', text) \
-        )
+        return { \
+            'html': 'span', \
+            'attr': {'style': 'user-select: none;'}, \
+            'elem': {'text': text} \
+        }
     endif
 
-    return objectNew( \
-        'html', 'a', \
-        'attr', objectNew('href', documentURL(url)), \
-        'elem', objectNew('text', text) \
-    )
+    return { \
+        'html': 'a', \
+        'attr': {'href': documentURL(url)}, \
+        'elem': {'text': text} \
+    }
 endfunction

package/lib/include/markdownUp.bare

@@ -21,14 +21,14 @@ markdownUpWindowWidth = 1024
 
 
 # The simulated MarkdownUp state
-markdownUpState = objectNew( \
-    'drawingFontSizePx', markdownUpDefaultFontSizePx, \
-    'drawingHeight', 480, \
-    'drawingWidth', 640, \
-    'localStorage', objectNew(), \
-    'sessionStorage', objectNew(), \
-    'windowClipboard', '' \
-)
+markdownUpState = { \
+    'drawingFontSizePx': markdownUpDefaultFontSizePx, \
+    'drawingHeight': 480, \
+    'drawingWidth': 640, \
+    'localStorage': {}, \
+    'sessionStorage': {}, \
+    'windowClipboard': '' \
+}
 
 
 #
@@ -202,7 +202,7 @@ endfunction
 
 
 function localStorageClear():
-    objectSet(markdownUpState, 'localStorage', objectNew())
+    objectSet(markdownUpState, 'localStorage', {})
 endfunction
 
 
@@ -281,11 +281,11 @@ function schemaElements(types, typeName):
     if userTypeKey == 'struct' && objectGet(objectGet(userType, 'struct'), 'union'):
         userTypeKey = 'union'
     endif
-    return arrayNew( \
-        arrayNew( \
-            objectNew('html', 'h1', 'elem', objectNew('text', userTypeKey + ' ' + typeName)) \
-        ) \
-    )
+    return [ \
+        [ \
+            {'html': 'h1', 'elem': {'text': userTypeKey + ' ' + typeName}} \
+        ] \
+    ]
 endfunction
 
 
@@ -295,7 +295,7 @@ endfunction
 
 
 function sessionStorageClear():
-    objectSet(markdownUpState, 'sessionStorage', objectNew())
+    objectSet(markdownUpState, 'sessionStorage', {})
 endfunction
 
 

package/lib/include/pager.bare

@@ -97,7 +97,7 @@ endfunction
 # $arg options: - **start** - The start page name
 # $arg options: - **keyboard** - Enable keyboard commands ('n' for next, 'p' for previous, 's' for start, 'e' for end)
 async function pagerMain(pagerModel, options):
-    options = if(options != null, options, objectNew())
+    options = if(options != null, options, {})
     optionArguments = objectGet(options, 'arguments')
     optionHideMenu = objectGet(options, 'hideMenu')
     optionHideNav = objectGet(options, 'hideNav')
@@ -154,7 +154,7 @@ async function pagerMain(pagerModel, options):
             return
         endif
     else:
-        arguments = arrayNew(objectNew('name', 'page', 'default', startPageName))
+        arguments = [{'name': 'page', 'default': startPageName}]
     endif
     args = argsParse(arguments)
     argPage = objectGet(args, 'page')
@@ -211,7 +211,7 @@ async function pagerMain(pagerModel, options):
 
     # Render the menu
     if !optionHideMenu:
-        menuItems = arrayNew()
+        menuItems = []
         for page in pages:
             pageName = objectGet(page, 'name')
             pageHidden = objectGet(page, 'hidden')
@@ -231,7 +231,7 @@ async function pagerMain(pagerModel, options):
             elif pageName == objectGet(curPage, 'name'):
                 arrayPush(menuItems, markdownEscape(pageName))
             else:
-                arrayPush(menuItems, argsLink(arguments, pageName, objectNew('page', pageName)))
+                arrayPush(menuItems, argsLink(arguments, pageName, {'page': pageName}))
             endif
         endfor
         markdownPrint(arrayJoin(menuItems, ' | '), '')
@@ -239,13 +239,13 @@ async function pagerMain(pagerModel, options):
 
     # Render the start/next/prev buttons
     if !optionHideNav && (nextPageName != null || prevPageName != null):
-        navItems = arrayNew()
+        navItems = []
         arrayPush(navItems, \
-            if(startPageName != curPageName, argsLink(arguments, 'Start', objectNew('page', startPageName)), 'Start'))
+            if(startPageName != curPageName, argsLink(arguments, 'Start', {'page': startPageName}), 'Start'))
         arrayPush(navItems, \
-            if(prevPageName != null, argsLink(arguments, 'Previous', objectNew('page', prevPageName)), 'Previous'))
+            if(prevPageName != null, argsLink(arguments, 'Previous', {'page': prevPageName}), 'Previous'))
         arrayPush(navItems, \
-            if(nextPageName != null, argsLink(arguments, 'Next', objectNew('page', nextPageName)), 'Next'))
+            if(nextPageName != null, argsLink(arguments, 'Next', {'page': nextPageName}), 'Next'))
         markdownPrint('( ' + arrayJoin(navItems, ' | ') + ' )', '')
     endif
 
@@ -294,15 +294,15 @@ function pagerKeyDown(arguments, curPageName, startPageName, endPageName, nextPa
     key = objectGet(event, 'key')
     if key == 's' && startPageName != curPageName:
         # Start slide
-        windowSetLocation(argsURL(arguments, objectNew('page', startPageName)))
+        windowSetLocation(argsURL(arguments, {'page': startPageName}))
     elif key == 'e' && endPageName != curPageName:
         # End slide
-        windowSetLocation(argsURL(arguments, objectNew('page', endPageName)))
+        windowSetLocation(argsURL(arguments, {'page': endPageName}))
     elif key == 'n' && nextPageName:
         # Next page
-        windowSetLocation(argsURL(arguments, objectNew('page', nextPageName)))
+        windowSetLocation(argsURL(arguments, {'page': nextPageName}))
     elif key == 'p' && prevPageName:
         # Previous page
-        windowSetLocation(argsURL(arguments, objectNew('page', prevPageName)))
+        windowSetLocation(argsURL(arguments, {'page': prevPageName}))
     endif
 endfunction

package/lib/include/unittest.bare

@@ -15,8 +15,8 @@ include <diff.bare>
 
 
 # Test statistics
-unittestTests = objectNew()
-unittestWarnings = arrayNew()
+unittestTests = {}
+unittestWarnings = []
 
 
 # $function: unittestRunTest
@@ -60,7 +60,7 @@ function unittestRunTestHelper(testName):
     endif
 
     # Add the unit test result array
-    testFailures = arrayNew()
+    testFailures = []
     objectSet(unittestTests, testName, testFailures)
     systemGlobalSet('unittestTestName', testName)
 
@@ -81,7 +81,7 @@ function unittestEqual(actual, expected, description):
 
     # Add the test failure error lines
     testFailures = objectGet(unittestTests, unittestTestName)
-    errorLines = arrayNew( \
+    errorLines = [ \
         'Equal:', \
         '', \
         '```', \
@@ -91,9 +91,9 @@ function unittestEqual(actual, expected, description):
         '```', \
         jsonStringify(expected), \
         '```' \
-    )
+    ]
     if description:
-        arrayPush(testFailures, arrayExtend(arrayNew(markdownEscape(description), ''), errorLines))
+        arrayPush(testFailures, arrayExtend([markdownEscape(description), ''], errorLines))
     else:
         arrayPush(testFailures, errorLines)
     endif
@@ -115,8 +115,8 @@ function unittestDeepEqual(actual, expected, description):
     endif
 
     # Compute the difference lines
-    errorLines = arrayNew()
-    diffErrorLines = arrayNew()
+    errorLines = []
+    diffErrorLines = []
     for diff in diffLines(actualJSON, expectedJSON):
         diffType = objectGet(diff, 'type')
         if diffType == 'Remove':
@@ -130,15 +130,15 @@ function unittestDeepEqual(actual, expected, description):
         else:
             # diffType == 'Identical'
             if diffErrorLines:
-                arrayExtend(errorLines, arrayNew('Deep-equal:', '', '```'))
+                arrayExtend(errorLines, ['Deep-equal:', '', '```'])
                 arrayExtend(errorLines, diffErrorLines)
                 arrayPush(errorLines, '```')
-                diffErrorLines = arrayNew()
+                diffErrorLines = []
             endif
         endif
     endfor
     if diffErrorLines:
-        arrayExtend(errorLines, arrayNew('Deep-equal:', '', '```'))
+        arrayExtend(errorLines, ['Deep-equal:', '', '```'])
         arrayExtend(errorLines, diffErrorLines)
         arrayPush(errorLines, '```')
     endif
@@ -146,7 +146,7 @@ function unittestDeepEqual(actual, expected, description):
     # Add the test failure error lines
     testFailures = objectGet(unittestTests, unittestTestName)
     if description:
-        arrayPush(testFailures, arrayExtend(arrayNew(markdownEscape(description), ''), errorLines))
+        arrayPush(testFailures, arrayExtend([markdownEscape(description), ''], errorLines))
     else:
         arrayPush(testFailures, errorLines)
     endif
@@ -210,7 +210,7 @@ function unittestReport(options):
         if testNameArg:
             markdownPrint('', argsLink(unittestReportArguments, 'All tests', null, true))
         else:
-            markdownPrint('', argsLink(unittestReportArguments, if(hideTests, 'Show', 'Hide') + ' tests', objectNew('hideTests', !hideTests)))
+            markdownPrint('', argsLink(unittestReportArguments, if(hideTests, 'Show', 'Hide') + ' tests', {'hideTests': !hideTests}))
         endif
     endif
 
@@ -227,15 +227,15 @@ function unittestReport(options):
     if testFailCount:
         markdownPrint('', '## Failing Tests')
         if hideTests && !isReport && !testNameArg:
-            markdownPrint('', argsLink(unittestReportArguments, 'Show', objectNew('hideTests', false)))
+            markdownPrint('', argsLink(unittestReportArguments, 'Show', {'hideTests': false}))
         endif
         if !hideTests || testNameArg:
             for testName in testNames:
                 testFailures = objectGet(unittestTests, testName)
                 if arrayLength(testFailures):
                     failureLink = if(isReport, testName, \
-                        argsLink(unittestReportArguments, testName, objectNew('test', testName), false, '_top'))
-                    failureLines = arrayNew('', failureLink + ' - FAIL')
+                        argsLink(unittestReportArguments, testName, {'test': testName}, false, '_top'))
+                    failureLines = ['', failureLink + ' - FAIL']
                     for errorLines in testFailures:
                         for errorLine, ixErrorLine in errorLines:
                             if ixErrorLine == 0:
@@ -256,14 +256,14 @@ function unittestReport(options):
     if testPassCount:
         markdownPrint('', '## Passing Tests')
         if hideTests && !isReport && !testNameArg:
-            markdownPrint('', argsLink(unittestReportArguments, 'Show', objectNew('hideTests', false)))
+            markdownPrint('', argsLink(unittestReportArguments, 'Show', {'hideTests': false}))
         endif
         if !hideTests || testNameArg:
             for testName in testNames:
                 testFailures = objectGet(unittestTests, testName)
                 if !arrayLength(testFailures):
                     testLink = if(isReport, testName, \
-                        argsLink(unittestReportArguments, testName, objectNew('test', testName), false, '_top'))
+                        argsLink(unittestReportArguments, testName, {'test': testName}, false, '_top'))
                     markdownPrint('', testLink + ' - OK')
                 endif
             endfor
@@ -294,18 +294,18 @@ function unittestReport(options):
             for row in coverageData:
                 scriptName = objectGet(row, 'Script')
                 if !isReport && !stringStartsWith(scriptName, '**'):
-                    objectSet(row, 'Script', argsLink(unittestReportArguments, scriptName, objectNew("script", scriptName), false, "_top"))
+                    objectSet(row, 'Script', argsLink(unittestReportArguments, scriptName, {"script": scriptName}, false, "_top"))
                 endif
                 objectSet(row, 'Coverage', numberToFixed(objectGet(row, 'Coverage'), 1) + '%')
             endfor
-            markdownPrint('', dataTableMarkdown(coverageData, objectNew( \
-                'fields', arrayNew('Script', 'Statements', 'Missing', 'Coverage'), \
-                'formats', objectNew( \
-                    'Statements', objectNew('align', 'right'), \
-                    'Missing', objectNew('align', 'right'), \
-                    'Coverage', objectNew('align', 'right') \
-                ) \
-            )))
+            markdownPrint('', dataTableMarkdown(coverageData, { \
+                'fields': ['Script', 'Statements', 'Missing', 'Coverage'], \
+                'formats': { \
+                    'Statements': {'align': 'right'}, \
+                    'Missing': {'align': 'right'}, \
+                    'Coverage': {'align': 'right'} \
+                } \
+            }))
         else:
             markdownPrint('', '*No data.*')
         endif
@@ -317,12 +317,12 @@ endfunction
 
 
 # unittestReport application arguments
-unittestReportArguments = argsValidate(arrayNew( \
-    objectNew('name', 'test', 'global', 'vUnittestTest'), \
-    objectNew('name', 'script', 'global', 'vUnittestScript'), \
-    objectNew('name', 'hideTests', 'global', 'vUnittestHideTests', 'type', 'bool', 'default', false), \
-    objectNew('name', 'report', 'global', 'vUnittestReport', 'type', 'bool', 'default', false) \
-))
+unittestReportArguments = argsValidate([ \
+    {'name': 'test', 'global': 'vUnittestTest'}, \
+    {'name': 'script', 'global': 'vUnittestScript'}, \
+    {'name': 'hideTests', 'global': 'vUnittestHideTests', 'type': 'bool', 'default': false}, \
+    {'name': 'report', 'global': 'vUnittestReport', 'type': 'bool', 'default': false} \
+])
 
 
 # Render the script coverage details page
@@ -331,7 +331,7 @@ function unittestReportScript(scriptName):
     title = scriptName + ' Coverage'
     documentSetTitle(title)
     markdownPrint( \
-        argsLink(unittestReportArguments, 'Back', objectNew('script', null), false, '_top'), \
+        argsLink(unittestReportArguments, 'Back', {'script': null}, false, '_top'), \
         '', \
         '# ' + markdownEscape(title) \
     )
@@ -349,7 +349,7 @@ function unittestReportScript(scriptName):
     scriptLines = objectGet(script, 'scriptLines')
 
     # Mark the statements covered or not-covered
-    lineColors = objectNew()
+    lineColors = {}
     statements = unittestScriptStatements(script)
     for statement in statements:
         statementKey = arrayGet(objectKeys(statement), 0)
@@ -369,9 +369,9 @@ function unittestReportScript(scriptName):
     endfor
 
     # Generate the code coverage details
-    codeLineElements = arrayNew()
-    codeElements = objectNew('html', 'pre', 'elem', codeLineElements)
-    currentLines = arrayNew()
+    codeLineElements = []
+    codeElements = {'html': 'pre', 'elem': codeLineElements}
+    currentLines = []
     currentColor = null
     for line, ixLine in scriptLines:
         # Accumulate lines of the same color
@@ -383,7 +383,7 @@ function unittestReportScript(scriptName):
 
         # Render the current lines
         unittestReportScriptLines(codeLineElements, currentLines, currentColor)
-        currentLines = arrayNew(line)
+        currentLines = [line]
         currentColor = lineColor
     endfor
     unittestReportScriptLines(codeLineElements, currentLines, currentColor, true)
@@ -395,13 +395,13 @@ function unittestReportScriptLines(codeLineElements, lines, color, noNewline):
     if lines:
         linesStr = arrayJoin(lines, stringFromCharCode(10)) + if(noNewline, '', stringFromCharCode(10))
         if !color:
-            arrayPush(codeLineElements, objectNew('text', linesStr))
+            arrayPush(codeLineElements, {'text': linesStr})
         else:
-            arrayPush(codeLineElements, objectNew( \
-                'html', 'span', \
-                'attr', objectNew('style', 'display: block; background-color: ' + color), \
-                'elem', objectNew('text', linesStr) \
-            ))
+            arrayPush(codeLineElements, { \
+                'html': 'span', \
+                'attr': {'style': 'display: block; background-color: ' + color}, \
+                'elem': {'text': linesStr} \
+            })
         endif
     endif
 endfunction
@@ -409,14 +409,14 @@ endfunction
 
 # Get the coverage data table - columns are "Script", "Statement", "Covered", and "Percent"
 function unittestCoverageData(coverageExclude):
-    data = arrayNew()
+    data = []
 
     # Get the global coverage object
     coverage = coverageGlobalGet()
     if coverage:
         # Get the script names with coverage data
         scripts = objectGet(coverage, 'scripts')
-        scriptNames = if(scripts, arraySort(objectKeys(scripts)), arrayNew())
+        scriptNames = if(scripts, arraySort(objectKeys(scripts)), [])
 
         # Compute script statement coverage
         totalStatements = 0
@@ -458,25 +458,25 @@ function unittestCoverageData(coverageExclude):
 
             # Add the script coverage data row
             coveragePercent = if(statementCount, 100 * (statementCount - missingCount) / statementCount, 100)
-            arrayPush(data, objectNew( \
-                'Script', scriptName, \
-                'Statements', statementCount, \
-                'Missing', missingCount, \
-                'Coverage',  coveragePercent, \
-                'CoverageStr', numberToFixed(coveragePercent, 1) + '%'  \
-            ))
+            arrayPush(data, { \
+                'Script': scriptName, \
+                'Statements': statementCount, \
+                'Missing': missingCount, \
+                'Coverage':  coveragePercent, \
+                'CoverageStr': numberToFixed(coveragePercent, 1) + '%'  \
+            })
         endfor
 
         # Add the coverage totals data row
         if scriptNames:
             coveragePercent = if(totalStatements, 100 * (totalStatements - totalMissing) / totalStatements, 100)
-            arrayPush(data, objectNew( \
-                'Script', '**Total**', \
-                'Statements', totalStatements, \
-                'Missing', totalMissing, \
-                'Coverage', coveragePercent, \
-                'CoverageStr', numberToFixed(coveragePercent, 1) + '%'  \
-            ))
+            arrayPush(data, { \
+                'Script': '**Total**', \
+                'Statements': totalStatements, \
+                'Missing': totalMissing, \
+                'Coverage': coveragePercent, \
+                'CoverageStr': numberToFixed(coveragePercent, 1) + '%'  \
+            })
         endif
     endif
 
@@ -486,7 +486,7 @@ endfunction
 
 # Get a script's array of statements
 function unittestScriptStatements(script):
-    statements = arrayNew()
+    statements = []
 
     # Add the top-level script statements
     for statement in objectGet(script, 'statements'):

package/lib/include/unittestMock.bare

@@ -18,16 +18,16 @@ unittestMockWindowWidth = 1024
 
 
 # The mocked MarkdownUp state
-unittestMockCalls = arrayNew()
-unittestMockFunctions = objectNew()
-unittestMockStateDefault = objectNew( \
-    'drawingFontSizePx', unittestMockDefaultFontSizePx, \
-    'drawingHeight', 480, \
-    'drawingWidth', 640, \
-    'localStorage', objectNew(), \
-    'sessionStorage', objectNew(), \
-    'windowClipboard', '' \
-)
+unittestMockCalls = []
+unittestMockFunctions = {}
+unittestMockStateDefault = { \
+    'drawingFontSizePx': unittestMockDefaultFontSizePx, \
+    'drawingHeight': 480, \
+    'drawingWidth': 640, \
+    'localStorage': {}, \
+    'sessionStorage': {}, \
+    'windowClipboard': '' \
+}
 unittestMockState = objectCopy(unittestMockStateDefault)
 
 
@@ -145,7 +145,7 @@ endfunction
 
 function unittestMockGeneric(funcName, args...):
     # Record the mocked function call
-    arrayPush(unittestMockCalls, arrayNew(funcName, args))
+    arrayPush(unittestMockCalls, [funcName, args])
 endfunction
 
 
@@ -161,8 +161,8 @@ function unittestMockEnd():
 
     # Reset the mock state
     mockCalls = unittestMockCalls
-    systemGlobalSet('unittestMockCalls', arrayNew())
-    systemGlobalSet('unittestMockFunctions', objectNew())
+    systemGlobalSet('unittestMockCalls', [])
+    systemGlobalSet('unittestMockFunctions', {})
     systemGlobalSet('unittestMockState', objectCopy(unittestMockStateDefault))
 
     return mockCalls
@@ -183,7 +183,7 @@ function unittestMock_documentInputValue(data, args...):
     id = arrayGet(args, 0)
 
     # Record the mocked function call
-    arrayPush(unittestMockCalls, arrayNew('documentInputValue', args))
+    arrayPush(unittestMockCalls, ['documentInputValue', args])
 
     # Return the mocked documentInputValue response
     return if(data != null, objectGet(data, id))
@@ -210,7 +210,7 @@ function unittestMock_drawNew(args...):
     height = arrayGet(args, 1)
 
     # Record the mocked function call
-    arrayPush(unittestMockCalls, arrayNew('drawNew', args))
+    arrayPush(unittestMockCalls, ['drawNew', args])
 
     # Update the mock state
     objectSet(unittestMockState, 'drawingWidth', width)
@@ -230,7 +230,7 @@ function unittestMock_drawTextStyle(args...):
     fontSizePx = arrayGet(args, 0)
 
     # Record the mocked function call
-    arrayPush(unittestMockCalls, arrayNew('drawTextStyle', args))
+    arrayPush(unittestMockCalls, ['drawTextStyle', args])
 
     # Update the mock state
     objectSet(unittestMockState, 'drawingFontSizePx', if(fontSizePx != null, fontSizePx, unittestMockDefaultFontSizePx))
@@ -254,10 +254,10 @@ endfunction
 
 function unittestMock_localStorageClear(args...):
     # Record the mocked function call
-    arrayPush(unittestMockCalls, arrayNew('localStorageClear', args))
+    arrayPush(unittestMockCalls, ['localStorageClear', args])
 
     # Update the mock state
-    objectSet(unittestMockState, 'localStorage', objectNew())
+    objectSet(unittestMockState, 'localStorage', {})
 endfunction
 
 
@@ -270,7 +270,7 @@ function unittestMock_localStorageRemove(args...):
     key = arrayGet(args, 0)
 
     # Record the mocked function call
-    arrayPush(unittestMockCalls, arrayNew('localStorageRemove', args))
+    arrayPush(unittestMockCalls, ['localStorageRemove', args])
 
     # Update the mock state
     objectDelete(objectGet(unittestMockState, 'localStorage'), key)
@@ -282,7 +282,7 @@ function unittestMock_localStorageSet(args...):
     value = arrayGet(args, 1)
 
     # Record the mocked function call
-    arrayPush(unittestMockCalls, arrayNew('localStorageSet', args))
+    arrayPush(unittestMockCalls, ['localStorageSet', args])
 
     # Update the mock state
     objectSet(objectGet(unittestMockState, 'localStorage'), key, value)
@@ -317,7 +317,7 @@ unittestMock_markdownHeaderId_dash = regexNew('[^a-z0-9]+')
 
 function unittestMock_markdownParse(data, args...):
     # Record the mocked function call
-    arrayPush(unittestMockCalls, arrayNew('markdownParse', args))
+    arrayPush(unittestMockCalls, ['markdownParse', args])
 
     # Return the mocked markdownParse response
     return if(data != null, arrayShift(data))
@@ -326,7 +326,7 @@ endfunction
 
 function unittestMock_markdownTitle(data, args...):
     # Record the mocked function call
-    arrayPush(unittestMockCalls, arrayNew('markdownTitle', args))
+    arrayPush(unittestMockCalls, ['markdownTitle', args])
 
     # Return the mocked markdownTitle response
     return if(data != null, arrayShift(data))
@@ -344,11 +344,11 @@ function unittestMock_schemaElements(types, typeName):
     if userTypeKey == 'struct' && objectGet(objectGet(userType, 'struct'), 'union'):
         userTypeKey = 'union'
     endif
-    return arrayNew( \
-        arrayNew( \
-            objectNew('html', 'h1', 'elem', objectNew('text', userTypeKey + ' ' + typeName)) \
-        ) \
-    )
+    return [ \
+        [ \
+            {'html': 'h1', 'elem': {'text': userTypeKey + ' ' + typeName}} \
+        ] \
+    ]
 endfunction
 
 
@@ -359,10 +359,10 @@ endfunction
 
 function unittestMock_sessionStorageClear(args...):
     # Record the mocked function call
-    arrayPush(unittestMockCalls, arrayNew('sessionStorageClear', args))
+    arrayPush(unittestMockCalls, ['sessionStorageClear', args])
 
     # Update the mock state
-    objectSet(unittestMockState, 'sessionStorage', objectNew())
+    objectSet(unittestMockState, 'sessionStorage', {})
 endfunction
 
 
@@ -375,7 +375,7 @@ function unittestMock_sessionStorageRemove(args...):
     key = arrayGet(args, 0)
 
     # Record the mocked function call
-    arrayPush(unittestMockCalls, arrayNew('sessionStorageRemove', args))
+    arrayPush(unittestMockCalls, ['sessionStorageRemove', args])
 
     # Update the mock state
     objectDelete(objectGet(unittestMockState, 'sessionStorage'), key)
@@ -387,7 +387,7 @@ function unittestMock_sessionStorageSet(args...):
     value = arrayGet(args, 1)
 
     # Record the mocked function call
-    arrayPush(unittestMockCalls, arrayNew('sessionStorageSet', args))
+    arrayPush(unittestMockCalls, ['sessionStorageSet', args])
 
     # Update the mock state
     objectSet(objectGet(unittestMockState, 'sessionStorage'), key, value)
@@ -403,12 +403,12 @@ function unittestMock_systemFetch(data, args...):
     url = arrayGet(args, 0)
 
     # Record the mocked function call
-    arrayPush(unittestMockCalls, arrayNew('systemFetch', args))
+    arrayPush(unittestMockCalls, ['systemFetch', args])
 
     # Array of URLs?
     urlType = systemType(url)
     if urlType == 'array':
-        result = arrayNew()
+        result = []
         for urlItem in url:
             urlActual = if(systemType(urlItem) == 'object', objectGet(urlItem, 'url'), urlItem)
             arrayPush(result, if(data != null, objectGet(data, urlActual)))
@@ -446,7 +446,7 @@ function unittestMock_windowClipboardWrite(args...):
     text = arrayGet(args, 0)
 
     # Record the mocked function call
-    arrayPush(unittestMockCalls, arrayNew('windowClipboardWrite', args))
+    arrayPush(unittestMockCalls, ['windowClipboardWrite', args])
 
     # Update the mock state
     objectSet(unittestMockState, 'windowClipboard', text)

package/package.json

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