bare-script 3.8.16__tar.gz → 3.8.17__tar.gz

{bare_script-3.8.16/src/bare_script.egg-info → bare_script-3.8.17}/PKG-INFO

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

{bare_script-3.8.16 → bare_script-3.8.17}/setup.cfg

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

{bare_script-3.8.16 → bare_script-3.8.17}/src/bare_script/include/args.bare

@@ -1,8 +1,6 @@
 # Licensed under the MIT License
 # https://github.com/craigahobbs/bare-script/blob/main/LICENSE
 
-include <dataTable.bare>
-
 
 # The URL arguments model
 argsTypes = schemaParse( \
@@ -183,7 +181,7 @@ endfunction
 # $doc: Generate the [arguments model's](model.html#var.vName='ArgsArguments') help content
 # $arg arguments: The [arguments model](model.html#var.vName='ArgsArguments')
 # $return: The array of help Markdown line strings
-function argsHelp(arguments):
+async function argsHelp(arguments):
     # Create the help data
     helpData = []
     anyDefault = false
@@ -210,6 +208,10 @@ function argsHelp(arguments):
         anyDescription = anyDescription || (description != null)
     endfor
 
+    # Dynamically include dataTable.bare
+    include <dataTable.bare>
+    dataTableMarkdown = systemGlobalGet('dataTableMarkdown')
+
     # Render the help table
     helpFields = ['Variable', 'Type']
     if anyDefault:

bare_script-3.8.17/src/bare_script/include/elementModel.bare

@@ -0,0 +1,178 @@
+# Licensed under the MIT License
+# https://github.com/craigahobbs/bare-script/blob/main/LICENSE
+
+
+# $function: elementModelValidate
+# $group: elementModel.bare
+# $doc: Validate an element model
+# $arg elements: The element model.
+# $arg elements: An element model is either null, an element object, or an array of any of these.
+# $return: The element model if valid, null otherwise
+function elementModelValidate(elements):
+    # Null?
+    if elements == null:
+        return elements
+    endif
+
+    # Array?
+    if systemType(elements) == 'array':
+        for subElements in elements:
+            if subElements != null && elementModelValidate(subElements) == null:
+                return null
+            endif
+        endfor
+        return elements
+    endif
+
+    # Non-object?
+    if systemType(elements) != 'object':
+        return null
+    endif
+
+    # Check for element tag members and unknown members
+    tagMembers = []
+    unknownMembers = []
+    for elementMember in objectKeys(elements):
+        if elementMember == 'html' || elementMember == 'svg' || elementMember == 'text':
+            arrayPush(tagMembers, elementMember)
+        endif
+        if elementMember != 'html' && elementMember != 'svg' && elementMember != 'text' && \
+           elementMember != 'attr' && elementMember != 'elem' && elementMember != 'callback':
+            arrayPush(unknownMembers, elementMember)
+        endif
+    endfor
+    if arrayLength(tagMembers) != 1:
+        return null
+    endif
+    if arrayLength(unknownMembers) != 0:
+        return null
+    endif
+
+    # Validate the tag
+    tagMember = arrayGet(tagMembers, 0)
+    tag = objectGet(elements, tagMember)
+    if tagMember != 'text' && (systemType(tag) != 'string' || stringLength(tag) == 0):
+        return null
+    endif
+
+    # Validate attributes
+    attr = objectGet(elements, 'attr')
+    if objectHas(elements, 'attr') && tagMember == 'text':
+        return null
+    endif
+    if attr != null:
+        if systemType(attr) != 'object':
+            return null
+        endif
+    endif
+
+    # Validate child elements
+    elem = objectGet(elements, 'elem')
+    if objectHas(elements, 'elem') && tagMember == 'text':
+        return null
+    endif
+    if elem != null:
+        if elementModelValidate(elem) == null:
+            return null
+        endif
+    endif
+
+    # Validate creation callback
+    callback = objectGet(elements, 'callback')
+    if callback != null && systemType(callback) != 'function':
+        return null
+    endif
+
+    return elements
+endfunction
+
+
+# $function: elementModelToString
+# $group: elementModel.bare
+# $doc: Render an element model to an HTML or SVG string
+# $arg elements: The element model.
+# $arg elements: An element model is either null, an element object, or an array of any of these.
+# $arg indent: Optional (default is null). The indentation string or number of spaces
+# $return: The HTML or SVG string
+function elementModelToString(elements, indent):
+    # Compute the indent string
+    indentStr = ''
+    if systemType(indent) == 'string':
+        indentStr = indent
+    elif systemType(indent) == 'number':
+        indentStr = stringRepeat(' ', mathMax(0, indent))
+    endif
+
+    # Render the element model as an HTML/SVG string
+    elementStr = elementModelToStringHelper(elements, indentStr, 0)
+    if stringStartsWith(elementStr, '<html'):
+        elementStr = '<!DOCTYPE html>' + stringFromCharCode(10) + elementStr
+    endif
+    return elementStr
+endfunction
+
+
+# Helper function to render elements to string
+function elementModelToStringHelper(elements, indentStr, level):
+    # Null?
+    if elements == null:
+        return ''
+    endif
+
+    # Array?
+    if systemType(elements) == 'array':
+        results = []
+        for element in elements:
+            arrayPush(results, elementModelToStringHelper(element, indentStr, level))
+        endfor
+        return arrayJoin(results, '')
+    endif
+
+    # Text node
+    indentPrefix = stringRepeat(indentStr, level)
+    newline = if(indentStr, stringFromCharCode(10), '')
+    if objectHas(elements, 'text'):
+        text = stringNew(objectGet(elements, 'text'))
+        text = stringReplace(text, '&', '&amp;')
+        text = stringReplace(text, '<', '&lt;')
+        text = stringReplace(text, '>', '&gt;')
+        text = stringReplace(text, '"', '&quot;')
+        text = stringReplace(text, "'", '&#039;')
+        return indentPrefix + text + newline
+    endif
+
+    # Attributes
+    tag = stringLower(objectGet(elements, 'html') || objectGet(elements, 'svg'))
+    attrStr = ''
+    attr = objectGet(elements, 'attr')
+    if tag == 'svg':
+        if attr == null:
+            attr = {}
+        endif
+        objectSet(attr, 'xmlns', 'http://www.w3.org/2000/svg')
+    endif
+    if attr != null:
+        attrNames = arraySort(objectKeys(attr))
+        for attrName in attrNames:
+            value = objectGet(attr, attrName)
+            if value != null:
+                attrStr = attrStr + ' ' + attrName + '="' + stringReplace(stringReplace(stringNew(value), '&', '&amp;'), '"', '&quot;') + '"'
+            endif
+        endfor
+    endif
+
+    # HTML void element?
+    isVoid = arrayIndexOf(elementModelVoidTags, tag) != -1
+    if isVoid:
+        return indentPrefix + '<' + tag + attrStr + ' />' + newline
+    endif
+
+    # Render the element
+    elem = objectGet(elements, 'elem')
+    childrenStr = if(elem != null, elementModelToStringHelper(elem, indentStr, level + 1), '')
+    return indentPrefix + '<' + tag + attrStr + '>' + newline + childrenStr + indentPrefix + '</' + tag + '>' + newline
+endfunction
+
+
+# Void elements (simplified list)
+elementModelVoidTags = ['area', 'base', 'br', 'col', 'embed', 'hr', 'img', 'input', 'keygen', 'link', 'meta', 'param', 'source', 'track', 'wbr']

{bare_script-3.8.16 → bare_script-3.8.17}/src/bare_script/include/qrcode.bare

@@ -32,12 +32,9 @@ function qrcodeDraw(message, x, y, size, level):
         while ixCol < qrcodeSize:
             pixelValue = arrayGet(arrayGet(matrix, ixRow), ixCol)
             if pixelValue:
-                drawPathRect( \
-                    mathRound(borderSize + x + ixCol * pixelSize, precision), \
-                    mathRound(borderSize + y + ixRow * pixelSize, precision), \
-                    pixelSizeRound, \
-                    pixelSizeRound \
-                )
+                pixelLeft = mathRound(borderSize + x + ixCol * pixelSize, precision)
+                pixelTop = mathRound(borderSize + y + ixRow * pixelSize, precision)
+                drawPathRect(pixelLeft, pixelTop, pixelSizeRound, pixelSizeRound)
             endif
             ixCol = ixCol + 1
         endwhile
@@ -46,6 +43,69 @@ function qrcodeDraw(message, x, y, size, level):
 endfunction
 
 
+# $function: qrcodeElements
+# $group: qrcode.bare
+# $doc: Generate the element model for a QR code
+# $arg message: The QR code message or the QR code matrix
+# $arg size: The size of the QR code, in pixels
+# $arg level: Optional (default is 'low'). The error correction level: 'low', 'medium', 'quartile', or 'high'.
+# $return: The QR code SVG [element model](https://github.com/craigahobbs/element-model#readme)
+function qrcodeElements(message, size, level):
+    # Get the QR code pixel matrix
+    matrix = if(systemType(message) == 'string', qrcodeMatrix(message, level), message)
+    qrcodeSize = arrayLength(matrix)
+
+    # Compute the black pixel paths
+    # Note: The standard recommendation is a 4-module quiet zone on all sides.
+    cellPaths = []
+    ixRow = 0
+    pixelSize = size / (qrcodeSize + 8)
+    borderSize = pixelSize * 4
+    precision = 6
+    while ixRow < qrcodeSize:
+        ixCol = 0
+        while ixCol < qrcodeSize:
+            pixelValue = arrayGet(arrayGet(matrix, ixRow), ixCol)
+            if pixelValue:
+                pixelLeft = borderSize + ixCol * pixelSize
+                pixelTop = borderSize + ixRow * pixelSize
+                arrayPush(cellPaths, arrayJoin([ \
+                    'M', numberToFixed(pixelLeft, precision), numberToFixed(pixelTop, precision), \
+                    'H', numberToFixed(pixelLeft + pixelSize, precision), \
+                    'V', numberToFixed(pixelTop + pixelSize, precision), \
+                    'H', numberToFixed(pixelLeft, precision), \
+                    'Z' \
+                ], ' '))
+            endif
+            ixCol = ixCol + 1
+        endwhile
+        ixRow = ixRow + 1
+    endwhile
+
+    # Create the QR code SVG element model
+    return { \
+        'svg': 'svg', \
+        'attr': {'width': size, 'height': size}, \
+        'elem': [ \
+            { \
+                'svg': 'rect', \
+                'attr': { \
+                    'x': '0', 'y': '0', 'width': size, 'height': size, \
+                    'fill': 'white', 'stroke': 'none', 'stroke-width': '0', 'stroke-dasharray': 'none' \
+                } \
+            }, \
+            { \
+                'svg': 'path', \
+                'attr': { \
+                    'fill': 'black', 'stroke': 'none', 'stroke-width': '0', 'stroke-dasharray': 'none', \
+                    'd': arrayJoin(cellPaths, ' ') \
+                } \
+            } \
+        ] \
+    }
+endfunction
+
+
 # $function: qrcodeMatrix
 # $group: qrcode.bare
 # $doc: Generate a QR code pixel matrix
@@ -55,90 +115,92 @@ endfunction
 function qrcodeMatrix(message, level):
     level = if(level != null, level, 'low')
 
-    # Find the QR code model
-    for qrcode in qrcodeVersions:
-        size = objectGet(qrcode, 'size')
-        alignmentPatterns = objectGet(qrcode, 'alignmentPatterns')
-        ecLevel = objectGet(qrcode, level)
-        totalCodewords = objectGet(ecLevel, 'totalCodewords')
-
-        # Create the pixel matrix
-        matrix = []
-        ixRow = 0
-        while ixRow < size:
-            arrayPush(matrix, arrayNewSize(size, null))
-            ixRow = ixRow + 1
-        endwhile
-
-        # Position squares
-        qrcodeMatrixPositionSquare(matrix, 3, 3)
-        qrcodeMatrixPositionSquare(matrix, 3, size - 4)
-        qrcodeMatrixPositionSquare(matrix, size - 4, 3)
-
-        # Alignment patterns
-        if alignmentPatterns:
-            ixLast = arrayLength(alignmentPatterns) - 1
-            for alignX, ixX in alignmentPatterns:
-                for alignY, ixY in alignmentPatterns:
-                    if !(ixX == 0 && ixY == 0) && !(ixX == 0 && ixY == ixLast) && !(ixX == ixLast && ixY == 0):
-                        qrcodeMatrixAlignmentPattern(matrix, alignX, alignY)
-                    endif
-                endfor
-            endfor
+    # Find the QR code model that fits the message bits (mode, version, message, terminator)
+    qrcode = null
+    for qrcodeFind in qrcodeVersions:
+        messageBits = qrcodeMessageBits(qrcodeFind, level, message)
+        if messageBits != null:
+            qrcode = qrcodeFind
+            break
         endif
+    endfor
+    if qrcode == null:
+        systemLogDebug('qrcode.bare: qrcodeMatrix - Message too long (' + stringLength(message) + ')')
+        return null
+    endif
+    size = objectGet(qrcode, 'size')
+    alignmentPatterns = objectGet(qrcode, 'alignmentPatterns')
+    totalCodewords = objectGet(objectGet(qrcode, level), 'totalCodewords')
 
-        # Timing strip
-        qrcodeMatrixTimingStrips(matrix)
+    # Create the pixel matrix
+    matrix = []
+    ixRow = 0
+    while ixRow < size:
+        arrayPush(matrix, arrayNewSize(size, null))
+        ixRow = ixRow + 1
+    endwhile
+
+    # Position squares
+    qrcodeMatrixPositionSquare(matrix, 3, 3)
+    qrcodeMatrixPositionSquare(matrix, 3, size - 4)
+    qrcodeMatrixPositionSquare(matrix, size - 4, 3)
+
+    # Alignment patterns
+    if alignmentPatterns:
+        ixLast = arrayLength(alignmentPatterns) - 1
+        for alignX, ixAX in alignmentPatterns:
+            for alignY, ixAY in alignmentPatterns:
+                if !(ixAX == 0 && ixAY == 0) && !(ixAX == 0 && ixAY == ixLast) && !(ixAX == ixLast && ixAY == 0):
+                    qrcodeMatrixAlignmentPattern(matrix, alignX, alignY)
+                endif
+            endfor
+        endfor
+    endif
 
-        # Format strips - use mask 0 as placeholder bits for qrcodeDataPixels
-        qrcodeMatrixFormatStrips(matrix, level, 0)
+    # Timing strips
+    qrcodeMatrixTimingStrips(matrix)
 
-        # Version blocks
-        qrcodeMatrixVersionBlocks(matrix, qrcode)
+    # Format strips - use mask 0 as placeholder bits for qrcodeDataPixels
+    qrcodeMatrixFormatStrips(matrix, level, 0)
 
-        # Get the message bits (mode, version, message, terminator) - non-null means we've found it
-        messageBits = qrcodeMessageBits(qrcode, level, message)
-        if messageBits != null:
-            # Compute the data pixels
-            dataPixels = qrcodeDataPixels(matrix)
+    # Version blocks
+    qrcodeMatrixVersionBlocks(matrix, qrcode)
 
-            # Compute the data bits
-            dataBits = qrcodeDataBits(qrcode, level, message)
+    # Compute the data pixels
+    dataPixels = qrcodeDataPixels(matrix)
 
-            # Add the data remainder bits
-            remainderLength = arrayLength(dataPixels) - totalCodewords * 8
-            if remainderLength > 0:
-                arrayExtend(dataBits, arrayNewSize(remainderLength, 0))
-            endif
+    # Compute the data bits
+    dataBits = qrcodeDataBits(qrcode, level, message)
 
-            # Compute the penalty for each mask
-            bestMatrix = null
-            bestPenalty = null
-            mask = 0
-            while mask < 8:
-                # Set full data bits with mask
-                maskMatrix = jsonParse(jsonStringify(matrix))
-                qrcodeMatrixPixels(maskMatrix, dataPixels, dataBits, mask)
-
-                # Set the format strips bits
-                qrcodeMatrixFormatStrips(maskMatrix, level, mask)
-
-                # Compute the mask's penalty
-                maskPenalty = qrcodeMatrixPenalty(maskMatrix)
-                if bestPenalty == null || maskPenalty < bestPenalty:
-                    bestMatrix = maskMatrix
-                    bestPenalty = maskPenalty
-                endif
-                mask = mask + 1
-            endwhile
+    # Add the data remainder bits
+    remainderLength = arrayLength(dataPixels) - totalCodewords * 8
+    if remainderLength > 0:
+        arrayExtend(dataBits, arrayNewSize(remainderLength, 0))
+    endif
 
-            return bestMatrix
+    # Compute the penalty for each mask
+    bestMatrix = null
+    bestPenalty = null
+    mask = 0
+    while mask < 8:
+        # Set full data bits with mask
+        maskMatrix = jsonParse(jsonStringify(matrix))
+        qrcodeMatrixPixels(maskMatrix, dataPixels, dataBits, mask)
+
+        # Set the format strips bits
+        qrcodeMatrixFormatStrips(maskMatrix, level, mask)
+
+        # Compute the mask's penalty
+        maskPenalty = qrcodeMatrixPenalty(maskMatrix)
+        if bestPenalty == null || maskPenalty < bestPenalty:
+            bestMatrix = maskMatrix
+            bestPenalty = maskPenalty
         endif
-    endfor
 
-    # Message too long
-    systemLogDebug('qrcode.bare: qrcodeMatrix - Message too long (' + stringLength(message) + ')')
-    return null
+        mask = mask + 1
+    endwhile
+
+    return bestMatrix
 endfunction
 
 
@@ -190,12 +252,13 @@ endfunction
 
 # Set the format strips pixels
 function qrcodeMatrixFormatStrips(matrix, level, mask):
-    # The "dark pixel"
     size = arrayLength(matrix)
+
+    # The "dark pixel"
     arraySet(arrayGet(matrix, size - 8), 8, 1)
 
     # Set the format strip bits
-    formatStripBits = objectGet(objectGet(qrcodeMatrixFormatStripsBitsLookup, level), stringNew(mask))
+    formatStripBits = objectGet(objectGet(qrcodeMatrixFormatStripsBitsTable, level), stringNew(mask))
     pixelsTopLeft = [ \
         [0, 8], [1, 8], [2, 8], [3, 8], [4, 8], [5, 8], [7, 8], [8, 8], \
         [8, 7], [8, 5], [8, 4], [8, 3], [8, 2], [8, 1], [8, 0] \
@@ -210,7 +273,7 @@ endfunction
 
 
 # Format strip bits lookup table
-qrcodeMatrixFormatStripsBitsLookup = { \
+qrcodeMatrixFormatStripsBitsTable = { \
     'low': { \
         '0': [1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 0, 0], \
         '1': [1, 1, 1, 0, 0, 1, 0, 1, 1, 1, 1, 0, 0, 1, 1], \
@@ -257,7 +320,7 @@ qrcodeMatrixFormatStripsBitsLookup = { \
 # Set the version blocks pixels
 function qrcodeMatrixVersionBlocks(matrix, qrcode):
     version = objectGet(qrcode, 'version')
-    versionBits = objectGet(qrcodeMatrixVersionBitsLookup, stringNew(version))
+    versionBits = objectGet(qrcodeMatrixVersionBitsTable, stringNew(version))
     if versionBits:
         size = arrayLength(matrix)
         bottomLeftPixels = [ \
@@ -277,7 +340,7 @@ endfunction
 
 
 # Version bits lookup table
-qrcodeMatrixVersionBitsLookup = { \
+qrcodeMatrixVersionBitsTable = { \
     '7': [0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 1, 0, 1, 0, 0], \
     '10': [0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1, 1], \
     '15': [0, 0, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 1, 0, 1, 0, 0, 0] \
@@ -438,8 +501,7 @@ endfunction
 # Get the terminated message bits (mode, size, message, terminator)
 function qrcodeMessageBits(qrcode, level, message):
     version = objectGet(qrcode, 'version')
-    ecLevel = objectGet(qrcode, level)
-    totalMessageCodewords = objectGet(ecLevel, 'totalMessageCodewords')
+    totalMessageCodewords = objectGet(objectGet(qrcode, level), 'totalMessageCodewords')
 
     # Determine the message mode
     # Note: Kanji and ECI modes not supported
@@ -573,60 +635,54 @@ function qrcodeMatrixPenalty(matrix):
     size = arrayLength(matrix)
     penalty = 0
 
-    # Add the string rows
-    stringRowsAndColumns = []
+    # Compute row penalties
     for row in matrix:
-        arrayPush(stringRowsAndColumns, arrayJoin(row, ''))
+        stringRow = arrayJoin(row, '')
+
+        # Penalty 1: Five or more same-colored modules in a row
+        for runMatch in regexMatchAll(qrcodeMatrixPenaltyRunRegex, stringRow):
+            penalty = penalty + 3 + (stringLength(objectGet(objectGet(runMatch, 'groups'), '0')) - 5)
+        endfor
+
+        # Penalty 3: Finder-like patterns (1011101 with 4 white modules on either side)
+        penalty = penalty + 40 * arrayLength(regexMatchAll(qrcodeMatrixPenaltyPatternRegex, stringRow))
     endfor
 
-    # Add the string columns - also compute the 2x2 count and "dark" count
-    twoByCount = 0
-    twoBySize = size - 1
+    # Compute column penalties - also count dark modules
     darkCount = 0
+    twoBySize = size - 1
     ix = 0
     while ix < size:
         column = []
         iy = 0
         while iy < size:
             row = arrayGet(matrix, iy)
-            row2 = if(ix < twoBySize && iy < twoBySize, arrayGet(matrix, iy + 1))
             bit = arrayGet(row, ix)
-
-            # Add the column bit
             arrayPush(column, bit)
 
-            # Count the 2x2 blocks
+            # Penalty 2: 2x2 blocks of same color
+            row2 = if(ix < twoBySize && iy < twoBySize, arrayGet(matrix, iy + 1))
             if row2 && bit == arrayGet(row, ix + 1) && bit == arrayGet(row2, ix) && bit == arrayGet(row2, ix + 1):
-                twoByCount = twoByCount + 1
+                penalty = penalty + 3
             endif
 
             # Count "dark" pixels
-            if bit:
-                darkCount = darkCount + 1
-            endif
+            darkCount = darkCount + bit
 
             iy = iy + 1
         endwhile
+        stringColumn = arrayJoin(column, '')
 
-        # Add the column string
-        arrayPush(stringRowsAndColumns, arrayJoin(column, ''))
-        ix = ix + 1
-    endwhile
-
-    # Penalty 1: Five or more same-colored modules in a row/column
-    for stringRow in stringRowsAndColumns:
-        for runMatch in regexMatchAll(qrcodeMatrixPenaltyRunRegex, stringRow):
+        # Penalty 1: Five or more same-colored modules in a column
+        for runMatch in regexMatchAll(qrcodeMatrixPenaltyRunRegex, stringColumn):
             penalty = penalty + 3 + (stringLength(objectGet(objectGet(runMatch, 'groups'), '0')) - 5)
         endfor
-    endfor
 
-    # Penalty 2: 2x2 blocks of same color
-    penalty = penalty + 3 * twoByCount
+        # Penalty 3: Finder-like patterns (1011101 with 4 white modules on either side)
+        penalty = penalty + 40 * arrayLength(regexMatchAll(qrcodeMatrixPenaltyPatternRegex, stringColumn))
 
-    # Penalty 3: Finder-like patterns (1011101 with 4 white modules on either side)
-    for stringRow in stringRowsAndColumns:
-        penalty = penalty + 40 * arrayLength(regexMatchAll(qrcodeMatrixPenaltyPatternRegex, stringRow))
-    endfor
+        ix = ix + 1
+    endwhile
 
     # Penalty 4: Proportion of dark modules
     darkPercent = (darkCount * 100) / (size * size)
@@ -675,9 +731,11 @@ function qrcodeRSEncode(bytesIn, numCodewords):
 
                 # XOR with existing value (subtraction in GF(2^8))
                 arraySet(bytesOut, i + j, oldVal ^ product)
+
                 j = j + 1
             endwhile
         endif
+
         i = i + 1
     endwhile
 

{bare_script-3.8.16 → bare_script-3.8.17}/src/bare_script/include/schemaDoc.bare

@@ -3,7 +3,6 @@
 
 include <args.bare>
 include <dataTable.bare>
-include <schemaDoc.bare>
 
 
 # $function: schemaDocMain

{bare_script-3.8.16 → bare_script-3.8.17}/src/bare_script/library.py

@@ -1596,6 +1596,25 @@ _SCHEMA_VALIDATE_TYPE_MODEL_ARGS = value_args_model([
 #
 
 
+# $function: stringCharAt
+# $group: string
+# $doc: Get a string index's character code
+# $arg string: The string
+# $arg index: The character index
+# $return: The character code
+def _string_char_at(args, unused_options):
+    string, index = value_args_validate(_STRING_CHAR_AT_ARGS, args)
+    if index >= len(string):
+        raise ValueArgsError('index', index)
+
+    return string[int(index)]
+
+_STRING_CHAR_AT_ARGS = value_args_model([
+    {'name': 'string', 'type': 'string'},
+    {'name': 'index', 'type': 'number', 'integer': True, 'gte': 0}
+])
+
+
 # $function: stringCharCodeAt
 # $group: string
 # $doc: Get a string index's character code
@@ -1681,7 +1700,7 @@ def _string_from_char_code(char_codes, unused_options):
 # $return: The first index of the search string; -1 if not found.
 def _string_index_of(args, unused_options):
     string, search, index = value_args_validate(_STRING_INDEX_OF_ARGS, args, -1)
-    if index >= len(string):
+    if index > len(string):
         raise ValueArgsError('index', index, -1)
 
     return string.find(search, int(index))
@@ -1703,7 +1722,7 @@ _STRING_INDEX_OF_ARGS = value_args_model([
 def _string_last_index_of(args, unused_options):
     string, search, index = value_args_validate(_STRING_LAST_INDEX_OF_ARGS, args, -1)
     index = index if index is not None else len(string) - 1
-    if index >= len(string):
+    if index > len(string):
         raise ValueArgsError('index', index, -1)
 
     return string.rfind(search, 0, int(index) + len(search))
@@ -2251,6 +2270,7 @@ SCRIPT_FUNCTIONS = {
     'schemaTypeModel': _schema_type_model,
     'schemaValidate': _schema_validate,
     'schemaValidateTypeModel': _schema_validate_type_model,
+    'stringCharAt': _string_char_at,
     'stringCharCodeAt': _string_char_code_at,
     'stringDecode': _string_decode,
     'stringEncode': _string_encode,

{bare_script-3.8.16 → bare_script-3.8.17/src/bare_script.egg-info}/PKG-INFO

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

{bare_script-3.8.16 → bare_script-3.8.17}/src/bare_script.egg-info/SOURCES.txt

@@ -25,6 +25,7 @@ src/bare_script/include/baredoc.bare
 src/bare_script/include/dataLineChart.bare
 src/bare_script/include/dataTable.bare
 src/bare_script/include/diff.bare
+src/bare_script/include/elementModel.bare
 src/bare_script/include/forms.bare
 src/bare_script/include/markdownUp.bare
 src/bare_script/include/pager.bare