bare-script 4.2.1__tar.gz → 4.2.3__tar.gz

{bare_script-4.2.1/src/bare_script.egg-info → bare_script-4.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bare-script
-Version: 4.2.1
+Version: 4.2.3
 Summary: bare-script
 Home-page: https://github.com/craigahobbs/bare-script
 Author: Craig A. Hobbs
@@ -219,10 +219,19 @@ cp SKILL.md .claude/skills/bare-script/SKILL.md
 Use `~/.claude/skills/bare-script/SKILL.md` instead to make it available across all projects. For
 other assistants, include the file's contents in your system prompt or rules file.
 
-Once installed, you can prompt the assistant with tasks like:
+Once installed, prompt the assistant with a task like:
 
-> Build a MarkdownUp application that plays tic-tac-toe against the user, with a reset button
-> and a running win/loss/draw tally rendered as a bar chart.
+```
+claude "Build a MarkdownUp application that plays tic-tac-toe against the user, with a reset button and a running win/loss/draw tally rendered as a bar chart. Save it as ticTacToe.md"
+```
+
+To run the resulting MarkdownUp application locally, install the
+[markdown-up](https://pypi.org/project/markdown-up/) viewer and point it at the Markdown file:
+
+```
+pip install markdown-up
+markdown-up ticTacToe.md
+```
 
 The BareScript library is also documented as single-page Markdown, which can be fetched directly
 into an assistant's context alongside `SKILL.md`:

{bare_script-4.2.1 → bare_script-4.2.3}/README.md

@@ -194,10 +194,19 @@ cp SKILL.md .claude/skills/bare-script/SKILL.md
 Use `~/.claude/skills/bare-script/SKILL.md` instead to make it available across all projects. For
 other assistants, include the file's contents in your system prompt or rules file.
 
-Once installed, you can prompt the assistant with tasks like:
+Once installed, prompt the assistant with a task like:
 
-> Build a MarkdownUp application that plays tic-tac-toe against the user, with a reset button
-> and a running win/loss/draw tally rendered as a bar chart.
+```
+claude "Build a MarkdownUp application that plays tic-tac-toe against the user, with a reset button and a running win/loss/draw tally rendered as a bar chart. Save it as ticTacToe.md"
+```
+
+To run the resulting MarkdownUp application locally, install the
+[markdown-up](https://pypi.org/project/markdown-up/) viewer and point it at the Markdown file:
+
+```
+pip install markdown-up
+markdown-up ticTacToe.md
+```
 
 The BareScript library is also documented as single-page Markdown, which can be fetched directly
 into an assistant's context alongside `SKILL.md`:

{bare_script-4.2.1 → bare_script-4.2.3}/setup.cfg

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

{bare_script-4.2.1 → bare_script-4.2.3}/src/bare_script/include/data.bare

@@ -549,7 +549,10 @@ dataAggregationTypes = schemaParse( \
 # $group: data.bare
 # $doc: Sort a data array
 # $arg data: The data array
-# $arg sorts: The sort field-name/descending-sort tuples
+# $arg sorts: The array of sort tuples. Each tuple is a one- or two-element array, \[field\] or
+# $arg sorts: \[field, descending\]. "field" is the field name to sort by. "descending" is an
+# $arg sorts: optional boolean - if true, the field is sorted in descending order (default is
+# $arg sorts: ascending).
 # $return: The sorted data array
 function dataSort(data, sorts):
     return arraySort(data, systemPartial(dataSortCompare, sorts))
@@ -561,7 +564,7 @@ function dataSortCompare(sorts, row1, row2):
     result = 0
     for sort in sorts:
         field = arrayGet(sort, 0)
-        result = if(arrayGet(sort, 1), \
+        result = if(arrayLength(sort) >= 2 && arrayGet(sort, 1), \
             systemCompare(objectGet(row2, field), objectGet(row1, field)), \
             systemCompare(objectGet(row1, field), objectGet(row2, field)))
         if result != 0:

{bare_script-4.2.1 → bare_script-4.2.3}/src/bare_script/include/dataTable.bare

@@ -87,19 +87,26 @@ endfunction
 # $arg model: The [data table model](model.html#var.vName='DataTable')
 # $return: The array of Markdown table line strings
 function dataTableMarkdown(data, model):
-    # Determine the table fields
+    # Determine the table fields - categories first, then the value fields
     fields = []
     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)))
+    if modelCategories != null:
+        arrayExtend(fields, modelCategories)
+    endif
+    if modelFields != null:
+        arrayExtend(fields, modelFields)
+    else:
+        # Compute the data's fields (union of all row keys), excluding category fields
+        fieldNames = {}
+        for row in data:
+            for field in objectKeys(row):
+                if modelCategories == null || arrayIndexOf(modelCategories, field) == -1:
+                    objectSet(fieldNames, field, null)
+                endif
+            endfor
+        endfor
+        arrayExtend(fields, objectKeys(fieldNames))
     endif
     if !arrayLength(fields):
         return null
@@ -118,7 +125,6 @@ function dataTableMarkdown(data, model):
     endfor
 
     # Compute the formatted field value strings and widths
-    hasDatetimeFormat = precisionDatetime != null
     dataFormat = []
     for row in data:
         rowFormat = {}
@@ -127,10 +133,8 @@ function dataTableMarkdown(data, model):
             # Format the value (newline regex only on string/other types - numbers and datetimes can't contain newlines)
             value = objectGet(row, field)
             valueType = systemType(value)
-            if valueType == 'number':
-                valueFormat = numberToFixed(value, precisionNumber, precisionTrim)
-            elif valueType == 'datetime':
-                valueFormat = datetimeISOFormat(value, hasDatetimeFormat)
+            if valueType == 'number' || valueType == 'datetime':
+                valueFormat = dataUtilFormatValue(value, precisionNumber, precisionDatetime, precisionTrim)
             else:
                 valueFormat = if(valueType == 'string', stringTrim(value), stringNew(value))
                 valueFormat = regexReplace(dataTableMarkdownRegexMultipleNewline, valueFormat, '<br><br>')
@@ -148,7 +152,7 @@ function dataTableMarkdown(data, model):
         endfor
     endfor
 
-    # Precompute per-field rendering metadata: [field, width, align, header]
+    # Precompute per-field rendering metadata: [field, width, align, header, isCategory]
     fieldMeta = []
     for field in fields:
         format = if(formats != null, objectGet(formats, field))
@@ -156,7 +160,8 @@ function dataTableMarkdown(data, model):
             field, \
             objectGet(widths, field), \
             if(format != null, objectGet(format, 'align')), \
-            if(format != null, objectGet(format, 'header', field), field) \
+            if(format != null, objectGet(format, 'header', field), field), \
+            modelCategories != null && arrayIndexOf(modelCategories, field) != -1 \
         ])
     endfor
 
@@ -186,14 +191,24 @@ function dataTableMarkdown(data, model):
     arrayPush(lines, headerFields)
     arrayPush(lines, headerSeparator)
 
-    # Output each row
-    for row in dataFormat:
+    # Output each row, blanking duplicate leading category cell values
+    for row, ixRow in dataFormat:
+        rowRaw = arrayGet(data, ixRow)
+        rowPrevRaw = if(ixRow > 0, arrayGet(data, ixRow - 1))
+        skip = rowPrevRaw != null
         parts = []
         for meta in fieldMeta:
             field = arrayGet(meta, 0)
             width = arrayGet(meta, 1)
             align = arrayGet(meta, 2)
-            arrayPush(parts, dataTableMarkdownField(objectGet(row, field), width, align, ' '))
+
+            # Skip this value? (blank a category cell matching the previous row)
+            if skip:
+                isCategory = arrayGet(meta, 4)
+                skip = isCategory && systemCompare(objectGet(rowRaw, field), objectGet(rowPrevRaw, field)) == 0
+            endif
+
+            arrayPush(parts, dataTableMarkdownField(if(skip, '', objectGet(row, field)), width, align, ' '))
         endfor
         arrayPush(lines, '| ' + arrayJoin(parts, ' | ') + ' |')
     endfor

{bare_script-4.2.1 → bare_script-4.2.3/src/bare_script.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bare-script
-Version: 4.2.1
+Version: 4.2.3
 Summary: bare-script
 Home-page: https://github.com/craigahobbs/bare-script
 Author: Craig A. Hobbs
@@ -219,10 +219,19 @@ cp SKILL.md .claude/skills/bare-script/SKILL.md
 Use `~/.claude/skills/bare-script/SKILL.md` instead to make it available across all projects. For
 other assistants, include the file's contents in your system prompt or rules file.
 
-Once installed, you can prompt the assistant with tasks like:
+Once installed, prompt the assistant with a task like:
 
-> Build a MarkdownUp application that plays tic-tac-toe against the user, with a reset button
-> and a running win/loss/draw tally rendered as a bar chart.
+```
+claude "Build a MarkdownUp application that plays tic-tac-toe against the user, with a reset button and a running win/loss/draw tally rendered as a bar chart. Save it as ticTacToe.md"
+```
+
+To run the resulting MarkdownUp application locally, install the
+[markdown-up](https://pypi.org/project/markdown-up/) viewer and point it at the Markdown file:
+
+```
+pip install markdown-up
+markdown-up ticTacToe.md
+```
 
 The BareScript library is also documented as single-page Markdown, which can be fetched directly
 into an assistant's context alongside `SKILL.md`: