bare-script 3.7.1 → 3.7.3

package/lib/bare.js

@@ -91,13 +91,13 @@ export async function main(options) {
             if (args.static || args.debug) {
                 const warnings = lintScript(script);
                 if (warnings.length === 0) {
-                    options.logFn(`BareScript: Static analysis "${scriptName}" ... OK`);
+                    options.logFn(`BareScript static analysis "${scriptName}" ... OK`);
                 } else {
                     options.logFn(
-                        `BareScript: Static analysis "${scriptName}" ... ${warnings.length} warning${warnings.length > 1 ? 's' : ''}:`
+                        `BareScript static analysis "${scriptName}" ... ${warnings.length} warning${warnings.length > 1 ? 's' : ''}:`
                     );
                     for (const warning of warnings) {
-                        options.logFn(`BareScript:     ${warning}`);
+                        options.logFn(warning);
                     }
                     if (args.static) {
                         statusCode = 1;
@@ -131,7 +131,7 @@ export async function main(options) {
             // Log script execution end with timing
             if (args.debug) {
                 const timeEnd = performance.now();
-                options.logFn(`BareScript: Script executed in ${(timeEnd - timeBegin).toFixed(1)} milliseconds`);
+                options.logFn(`BareScript executed in ${(timeEnd - timeBegin).toFixed(1)} milliseconds`);
             }
 
             // Stop on error status code

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