bare-script 3.5.5__tar.gz → 3.7.1__tar.gz

{bare_script-3.5.5/src/bare_script.egg-info → bare_script-3.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bare-script
-Version: 3.5.5
+Version: 3.7.1
 Summary: bare-script
 Home-page: https://github.com/craigahobbs/bare-script
 Author: Craig A. Hobbs
@@ -10,7 +10,6 @@ Keywords: bare-script
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
@@ -62,7 +61,7 @@ function. Then execute the script using the
 [execute_script](https://craigahobbs.github.io/bare-script-py/scripts.html#execute-script)
 function. For example:
 
-~~~ python
+``` python
 from bare_script import execute_script, parse_script
 
 # Parse the script
@@ -78,13 +77,13 @@ return N + ' times 2 is ' + double(N)
 # Execute the script
 globals = {'N': 10}
 print(execute_script(script, {'globals': globals}))
-~~~
+```
 
 This outputs:
 
-~~~
+```
 10 times 2 is 20
-~~~
+```
 
 
 ### The BareScript Library
@@ -98,7 +97,7 @@ of the
 [arrayLength](https://craigahobbs.github.io/bare-script-py/library/#var.vGroup='Array'&arraylength)
 functions.
 
-~~~ python
+``` python
 import urllib.request
 
 from bare_script import execute_script, fetch_http, parse_script
@@ -114,13 +113,13 @@ return 'The BareScript Library has ' + arrayLength(objectGet(docs, 'functions'))
 
 # Execute the script
 print(execute_script(script, {'fetchFn': fetch_http}))
-~~~
+```
 
 This outputs:
 
-~~~
+```
 The BareScript Library has 105 functions
-~~~
+```
 
 
 ## Evaluating BareScript Expressions
@@ -139,7 +138,7 @@ a set of built-in, spreadsheet-like functions.
 
 For example:
 
-~~~ python
+``` python
 from bare_script import evaluate_expression, parse_expression
 
 # Parse the expression
@@ -148,13 +147,13 @@ expr = parse_expression('2 * max(a, b, c)')
 # Evaluate the expression
 variables = {'a': 1, 'b': 2, 'c': 3}
 print(evaluate_expression(expr, None, variables))
-~~~
+```
 
 This outputs:
 
-~~~
+```
 6
-~~~
+```
 
 
 ## The BareScript Command-Line Interface (CLI)
@@ -162,9 +161,9 @@ This outputs:
 You can run BareScript from the command line using the BareScript CLI, "bare". BareScript script
 files use the ".bare" file extension.
 
-~~~
+```
 bare script.bare
-~~~
+```
 
 **Note:** In the BareScript CLI, import statements and the
 [systemFetch](https://craigahobbs.github.io/bare-script-py/library/#var.vGroup='System'&systemfetch)
@@ -187,15 +186,15 @@ with functions for dynamically rendering Markdown text, drawing SVG images, etc.
 
 For example:
 
-```
+~~~
 # Markdown Application
 
 This is a Markdown document with embedded BareScript:
 
-~~~ markdown-script
+``` markdown-script
 markdownPrint('Hello, Markdown!')
-~~~
 ```
+~~~
 
 
 ## Development
@@ -203,6 +202,6 @@ markdownPrint('Hello, Markdown!')
 This package is developed using [python-build](https://github.com/craigahobbs/python-build#readme).
 It was started using [python-template](https://github.com/craigahobbs/python-template#readme) as follows:
 
-~~~
+```
 template-specialize python-template/template/ bare-script-py/ -k package bare-script -k name 'Craig A. Hobbs' -k email 'craigahobbs@gmail.com' -k github 'craigahobbs'
-~~~
+```

{bare_script-3.5.5 → bare_script-3.7.1}/README.md

@@ -36,7 +36,7 @@ function. Then execute the script using the
 [execute_script](https://craigahobbs.github.io/bare-script-py/scripts.html#execute-script)
 function. For example:
 
-~~~ python
+``` python
 from bare_script import execute_script, parse_script
 
 # Parse the script
@@ -52,13 +52,13 @@ return N + ' times 2 is ' + double(N)
 # Execute the script
 globals = {'N': 10}
 print(execute_script(script, {'globals': globals}))
-~~~
+```
 
 This outputs:
 
-~~~
+```
 10 times 2 is 20
-~~~
+```
 
 
 ### The BareScript Library
@@ -72,7 +72,7 @@ of the
 [arrayLength](https://craigahobbs.github.io/bare-script-py/library/#var.vGroup='Array'&arraylength)
 functions.
 
-~~~ python
+``` python
 import urllib.request
 
 from bare_script import execute_script, fetch_http, parse_script
@@ -88,13 +88,13 @@ return 'The BareScript Library has ' + arrayLength(objectGet(docs, 'functions'))
 
 # Execute the script
 print(execute_script(script, {'fetchFn': fetch_http}))
-~~~
+```
 
 This outputs:
 
-~~~
+```
 The BareScript Library has 105 functions
-~~~
+```
 
 
 ## Evaluating BareScript Expressions
@@ -113,7 +113,7 @@ a set of built-in, spreadsheet-like functions.
 
 For example:
 
-~~~ python
+``` python
 from bare_script import evaluate_expression, parse_expression
 
 # Parse the expression
@@ -122,13 +122,13 @@ expr = parse_expression('2 * max(a, b, c)')
 # Evaluate the expression
 variables = {'a': 1, 'b': 2, 'c': 3}
 print(evaluate_expression(expr, None, variables))
-~~~
+```
 
 This outputs:
 
-~~~
+```
 6
-~~~
+```
 
 
 ## The BareScript Command-Line Interface (CLI)
@@ -136,9 +136,9 @@ This outputs:
 You can run BareScript from the command line using the BareScript CLI, "bare". BareScript script
 files use the ".bare" file extension.
 
-~~~
+```
 bare script.bare
-~~~
+```
 
 **Note:** In the BareScript CLI, import statements and the
 [systemFetch](https://craigahobbs.github.io/bare-script-py/library/#var.vGroup='System'&systemfetch)
@@ -161,15 +161,15 @@ with functions for dynamically rendering Markdown text, drawing SVG images, etc.
 
 For example:
 
-```
+~~~
 # Markdown Application
 
 This is a Markdown document with embedded BareScript:
 
-~~~ markdown-script
+``` markdown-script
 markdownPrint('Hello, Markdown!')
-~~~
 ```
+~~~
 
 
 ## Development
@@ -177,6 +177,6 @@ markdownPrint('Hello, Markdown!')
 This package is developed using [python-build](https://github.com/craigahobbs/python-build#readme).
 It was started using [python-template](https://github.com/craigahobbs/python-template#readme) as follows:
 
-~~~
+```
 template-specialize python-template/template/ bare-script-py/ -k package bare-script -k name 'Craig A. Hobbs' -k email 'craigahobbs@gmail.com' -k github 'craigahobbs'
-~~~
+```

{bare_script-3.5.5 → bare_script-3.7.1}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = bare-script
-version = 3.5.5
+version = 3.7.1
 url = https://github.com/craigahobbs/bare-script
 author = Craig A. Hobbs
 author_email = craigahobbs@gmail.com
@@ -13,7 +13,6 @@ classifiers =
 	Development Status :: 5 - Production/Stable
 	Intended Audience :: Developers
 	Operating System :: OS Independent
-	Programming Language :: Python :: 3.9
 	Programming Language :: Python :: 3.10
 	Programming Language :: Python :: 3.11
 	Programming Language :: Python :: 3.12

{bare_script-3.5.5 → bare_script-3.7.1}/src/bare_script/bare.py

@@ -40,7 +40,6 @@ def main(argv=None):
 
     status_code = 0
     inline_count = 0
-    error_name = None
     try:
         # Evaluate the global variable expression arguments
         globals_ = {}
@@ -66,21 +65,19 @@ def main(argv=None):
                     raise ValueError(f'Failed to load "{script_value}"')
             else:
                 inline_count += 1
-                script_name = f'-c {inline_count}'
+                script_name = f'<string{inline_count if inline_count > 1 else ""}>'
                 script_source = script_value
 
             # Parse the script source
-            error_name = script_name
-            script = parse_script(script_source)
+            script = parse_script(script_source, 1, script_name)
 
             # Run the bare-script linter?
             if args.static or args.debug:
                 warnings = lint_script(script)
-                warning_prefix = f'BareScript: Static analysis "{script_name}" ...'
                 if not warnings:
-                    print(f'{warning_prefix} OK')
+                    print(f'BareScript: Static analysis "{script_name}" ... OK')
                 else:
-                    print(f'{warning_prefix} {len(warnings)} warning{"s" if len(warnings) > 1 else ""}:')
+                    print(f'BareScript: Static analysis "{script_name}" ... {len(warnings)} warning{"s" if len(warnings) > 1 else ""}:')
                     for warning in warnings:
                         print(f'BareScript:     {warning}')
                     if args.static:
@@ -114,8 +111,6 @@ def main(argv=None):
                 break
 
     except Exception as exc:
-        if error_name is not None:
-            print(f'{error_name}:')
         print(str(exc).strip())
         status_code = 1
 

{bare_script-3.5.5 → bare_script-3.7.1}/src/bare_script/include/args.bare

@@ -67,7 +67,7 @@ function argsValidate(arguments):
             name = objectGet(argument, 'name')
             if objectHas(argNames, name):
                 validatedArguments = null
-                systemLogDebug('MarkdownUp - args.bare: Duplicate argument "' + name + '"')
+                systemLogDebug('args.bare: Duplicate argument "' + name + '"')
             else:
                 objectSet(argNames, name, true)
             endif
@@ -151,7 +151,7 @@ function argsURL(arguments, args, explicit, headerText, url):
     if args != null:
         for name in objectKeys(args):
             if !objectHas(argNames, name):
-                systemLogDebug('MarkdownUp - args.bare: Unknown argument "' + name + '"')
+                systemLogDebug('args.bare: Unknown argument "' + name + '"')
             endif
         endfor
     endif
@@ -279,7 +279,7 @@ function argsValidateValue(value, type, global, warn):
             value = !!value
         elif valueType != 'boolean':
             if warn != false:
-                systemLogDebug('MarkdownUp - args.bare: Invalid value ' + jsonStringify(value) + ' for URL argument "' + global + '"')
+                systemLogDebug('args.bare: Invalid value ' + jsonStringify(value) + ' for URL argument "' + global + '"')
             endif
             value = null
         endif
@@ -291,7 +291,7 @@ function argsValidateValue(value, type, global, warn):
         endif
         if valueType != 'datetime' || datetimeHour(value) != 0 || datetimeMinute(value) != 0 || datetimeSecond(value) != 0:
             if warn != false:
-                systemLogDebug('MarkdownUp - args.bare: Invalid value ' + jsonStringify(valueOrig) + ' for URL argument "' + global + '"')
+                systemLogDebug('args.bare: Invalid value ' + jsonStringify(valueOrig) + ' for URL argument "' + global + '"')
             endif
             value = null
         endif
@@ -303,21 +303,21 @@ function argsValidateValue(value, type, global, warn):
         endif
         if valueType != 'datetime':
             if warn != false:
-                systemLogDebug('MarkdownUp - args.bare: Invalid value ' + jsonStringify(valueOrig) + ' for URL argument "' + global + '"')
+                systemLogDebug('args.bare: Invalid value ' + jsonStringify(valueOrig) + ' for URL argument "' + global + '"')
             endif
             value = null
         endif
     elif type == 'float':
         if valueType != 'number':
             if warn != false:
-                systemLogDebug('MarkdownUp - args.bare: Invalid value ' + jsonStringify(value) + ' for URL argument "' + global + '"')
+                systemLogDebug('args.bare: Invalid value ' + jsonStringify(value) + ' for URL argument "' + global + '"')
             endif
             value = null
         endif
     elif type == 'int':
         if valueType != 'number' || value != mathFloor(value):
             if warn != false:
-                systemLogDebug('MarkdownUp - args.bare: Invalid value ' + jsonStringify(value) + ' for URL argument "' + global + '"')
+                systemLogDebug('args.bare: Invalid value ' + jsonStringify(value) + ' for URL argument "' + global + '"')
             endif
             value = null
         endif
@@ -325,7 +325,7 @@ function argsValidateValue(value, type, global, warn):
         # type == 'string'
         if valueType != 'string':
             if warn != false:
-                systemLogDebug('MarkdownUp - args.bare: Invalid value ' + jsonStringify(value) + ' for URL argument "' + global + '"')
+                systemLogDebug('args.bare: Invalid value ' + jsonStringify(value) + ' for URL argument "' + global + '"')
             endif
             value = null
         endif

bare_script-3.7.1/src/bare_script/include/dataTable.bare

@@ -0,0 +1,211 @@
+# Licensed under the MIT License
+# https://github.com/craigahobbs/markdown-up/blob/main/LICENSE
+
+
+# Include sentinel
+if systemGlobalGet('dataTableSentinel'):
+    return
+endif
+dataTableSentinel = true
+
+
+# The data table model's Schema Markdown
+dataTableTypes = schemaParse( \
+    'group "Data Table"', \
+    '', \
+    '', \
+    '# A data table model', \
+    'struct DataTable', \
+    '', \
+    "    # The table's fields", \
+    '    optional string[len > 0] fields', \
+    '', \
+    "    # The table's category fields", \
+    '    optional string[len > 0] categories', \
+    '', \
+    '    # The field formatting for "categories" and "fields"', \
+    '    optional DataTableFieldFormat{len > 0} formats', \
+    '', \
+    '    # The numeric formatting precision (default is 2)', \
+    '    optional int(>= 0) precision', \
+    '', \
+    '    # The datetime format', \
+    '    optional DataTableDatetimeFormat datetime', \
+    '', \
+    '    # If true, trim formatted values (default is true)', \
+    '    optional bool trim', \
+    '', \
+    '', \
+    '# A data table field formatting model', \
+    'struct DataTableFieldFormat', \
+    '', \
+    '    # The field alignment', \
+    '    optional DataTableFieldAlignment align', \
+    '', \
+    "    # If true, don't wrap text", \
+    '    optional bool nowrap', \
+    '', \
+    '    # If true, format the field as Markdown', \
+    '    optional bool markdown', \
+    '', \
+    '    # The field header (default is the field name)', \
+    '    optional string header', \
+    '', \
+    '', \
+    '# A field alignment', \
+    'enum DataTableFieldAlignment', \
+    '    left', \
+    '    right', \
+    '    center', \
+    '', \
+    '', \
+    '# A datetime format', \
+    'enum DataTableDatetimeFormat', \
+    '', \
+    '    # ISO datetime year format', \
+    '    year', \
+    '', \
+    '    # ISO datetime month format', \
+    '    month', \
+    '', \
+    '    # ISO datetime day format', \
+    '    day' \
+)
+
+
+# $function: dataTableMarkdown
+# $group: dataTable.bare
+# $doc: Create the array of Markdown table line strings
+# $arg data: The array of row objects
+# $arg model: The [data table model](includeModel.html#var.vName='DataTable')
+# $return: The array of Markdown table line strings
+function dataTableMarkdown(data, model):
+    # Validate the data
+    data = dataValidate(data)
+    if data == null:
+        return null
+    endif
+
+    # Validate the table model
+    if model != null && !schemaValidate(dataTableTypes, 'DataTable', model):
+        return null
+    endif
+
+    # Determine the table fields
+    fields = arrayNew()
+    modelFields = if(model != null, objectGet(model, 'fields'))
+    modelCategories = if(model != null, objectGet(model, 'categories'))
+    if modelFields != null || modelCategories != null:
+        if modelCategories != null:
+            arrayExtend(fields, modelCategories)
+        endif
+        if modelFields != null:
+            arrayExtend(fields, modelFields)
+        endif
+    elif arrayLength(data) > 0:
+        arrayExtend(fields, objectKeys(arrayGet(data, 0)))
+    endif
+    if !arrayLength(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)
+    formats = if(model != null, objectGet(model, 'formats'))
+
+    # Compute the field header widths
+    widths = objectNew()
+    for field in fields:
+        fieldWidth = stringLength(field)
+        if !objectHas(widths, field) || fieldWidth > objectGet(widths, field):
+            objectSet(widths, field, fieldWidth)
+        endif
+    endfor
+
+    # Compute the formatted field value strings and widths
+    dataFormat = arrayNew()
+    for row in data:
+        rowFormat = objectNew()
+        arrayPush(dataFormat, rowFormat)
+        for field in fields:
+            # Format the value
+            value = objectGet(row, field)
+            valueType = systemType(value)
+            if valueType == 'string':
+                valueFormat = value
+            elif valueType == 'number':
+                valueFormat = numberToFixed(value, precisionNumber, precisionTrim)
+            elif valueType == 'datetime':
+                valueFormat = datetimeISOFormat(value, precisionDatetime != null)
+            else:
+                valueFormat = stringNew(value)
+            endif
+            objectSet(rowFormat, field, valueFormat)
+
+            # Update the field width
+            valueWidth = stringLength(valueFormat)
+            if !objectHas(widths, field) || valueWidth > objectGet(widths, field):
+                objectSet(widths, field, valueWidth)
+            endif
+        endfor
+    endfor
+
+    # Compute the field header separator
+    headerSeparator = ''
+    for field in fields:
+        width = objectGet(widths, field)
+        format = if(formats != null, objectGet(formats, field))
+        align = if(format != null, objectGet(format, 'align'))
+        alignLeft = if(align == 'center', ':', '-')
+        alignRight = if(align == 'center' || align == 'right', ':', '-')
+        headerSeparator = headerSeparator + '|' + alignLeft + dataTableMarkdownField('', width, align, '-') + alignRight
+    endfor
+    headerSeparator = headerSeparator + '|'
+
+    # Compute the table header fields
+    headerFields = ''
+    for field in fields:
+        width = objectGet(widths, field)
+        format = if(formats != null, objectGet(formats, field))
+        align = if(format != null, objectGet(format, 'align'))
+        header = if(format != null, objectGet(format, 'header', field), field)
+        headerFields = headerFields + '| ' + dataTableMarkdownField(header, width, align, ' ') + ' '
+    endfor
+    headerFields = headerFields + '|'
+
+    # Output the table header
+    lines = arrayNew()
+    arrayPush(lines, headerFields)
+    arrayPush(lines, headerSeparator)
+
+    # Output each row
+    for row in dataFormat:
+        line = ''
+        for field in fields:
+            width = objectGet(widths, field)
+            format = if(formats != null, objectGet(formats, field))
+            align = if(format != null, objectGet(format, 'align'))
+            line = line + '| ' + dataTableMarkdownField(objectGet(row, field), width, align, ' ') + ' '
+        endfor
+        line = line + '|'
+        arrayPush(lines, line)
+    endfor
+
+    return lines
+endfunction
+
+
+# Helper to generate the Markdown field text
+function dataTableMarkdownField(value, width, align, fill):
+    spaces = width - stringLength(value)
+    if align == 'right':
+        return stringRepeat(fill, spaces) + value
+    elif align == 'center':
+        spacesLeft = mathFloor(spaces / 2)
+        spacesRight = spaces - spacesLeft
+        return stringRepeat(fill, spacesLeft) + value + stringRepeat(fill, spacesRight)
+    endif
+    return value + stringRepeat(fill, spaces)
+endfunction

{bare_script-3.5.5 → bare_script-3.7.1}/src/bare_script/include/diff.bare

@@ -99,7 +99,7 @@ function diffLines(left, right):
             ixRight = ixRight + 1
         endwhile
         if identicalLines:
-            arrayPush(objectdiffs, objectNew('type', 'Identical', 'lines', identicalLines))
+            arrayPush(diffs, objectNew('type', 'Identical', 'lines', identicalLines))
             continue
         endif