bare-script 5.0.4__tar.gz → 5.1.0__tar.gz

{bare_script-5.0.4/src/bare_script.egg-info → bare_script-5.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bare-script
-Version: 5.0.4
+Version: 5.1.0
 Summary: bare-script
 Home-page: https://github.com/craigahobbs/bare-script
 Author: Craig A. Hobbs
@@ -55,16 +55,16 @@ confident that BareScript will execute the same regardless of the underlying run
 ## Executing BareScript Scripts
 
 To execute a BareScript script, parse the script using the
-[parse_script](https://craigahobbs.github.io/bare-script-py/scripts.html#parse-script)
+[barescript_parse_script](https://craigahobbs.github.io/bare-script-py/scripts.html#barescript-parse-script)
 function. Then execute the script using the
 [execute_script](https://craigahobbs.github.io/bare-script-py/scripts.html#execute-script)
 function. For example:
 
 ``` python
-from bare_script import execute_script, parse_script
+from bare_script import barescript_parse_script, execute_script
 
 # Parse the script
-script = parse_script('''\
+script = barescript_parse_script('''\
 # Double a number
 function double(n):
     return n * 2
@@ -99,10 +99,10 @@ functions.
 ``` python
 import urllib.request
 
-from bare_script import execute_script, fetch_http, parse_script
+from bare_script import barescript_parse_script, execute_script, fetch_http
 
 # Parse the script
-script = parse_script('''\
+script = barescript_parse_script('''\
 # Fetch the BareScript builtin library documentation JSON
 docs = jsonParse(systemFetch('https://craigahobbs.github.io/bare-script-py/library/library-builtin.json'))
 
@@ -126,7 +126,7 @@ The BareScript Library has 108 builtin functions
 To evaluate a
 [BareScript expression](https://craigahobbs.github.io/bare-script-py/language/#expressions),
 parse the expression using the
-[parse_expression](https://craigahobbs.github.io/bare-script-py/expressions.html#parse-expression)
+[barescript_parse_expression](https://craigahobbs.github.io/bare-script-py/expressions.html#barescript-parse-expression)
 function. Then evaluate the expression using the
 [evaluate_expression](https://craigahobbs.github.io/bare-script-py/expressions.html#evaluate-expression)
 function.
@@ -138,10 +138,10 @@ a set of built-in, spreadsheet-like functions.
 For example:
 
 ``` python
-from bare_script import evaluate_expression, parse_expression
+from bare_script import barescript_parse_expression, evaluate_expression
 
 # Parse the expression
-expr = parse_expression('2 * max(a, b, c)')
+expr = barescript_parse_expression('2 * max(a, b, c)')
 
 # Evaluate the expression
 variables = {'a': 1, 'b': 2, 'c': 3}
@@ -251,21 +251,21 @@ without a native Python equivalent are omitted.
 
 | Test             | Language         | Time (ms) | Multiple |
 | ---------------- | ---------------- | --------: | -------: |
-| mandelbrot       | Python           |    4793.6 |          |
-|                  | BareScript (PyC) |   11400.0 |     2.4x |
-|                  | BareScript (Py)  |  338000.0 |    70.5x |
-| schemaValidate   | Python           |      21.2 |          |
-|                  | BareScript (PyC) |      98.4 |     4.6x |
-|                  | BareScript (Py)  |    1437.6 |    67.7x |
+| mandelbrot       | Python           |    4720.8 |          |
+|                  | BareScript (PyC) |   10800.0 |     2.3x |
+|                  | BareScript (Py)  |  334100.0 |    70.8x |
+| schemaValidate   | Python           |      21.0 |          |
+|                  | BareScript (PyC) |     101.6 |     4.8x |
+|                  | BareScript (Py)  |    1404.8 |    67.0x |
 | urlEncode        | Python           |       1.1 |          |
-|                  | BareScript (PyC) |       5.5 |     5.1x |
-|                  | BareScript (Py)  |      38.5 |    36.3x |
-| schemaParse      | Python           |      17.7 |          |
-|                  | BareScript (PyC) |     128.0 |     7.2x |
-|                  | BareScript (Py)  |     912.8 |    51.5x |
+|                  | BareScript (PyC) |       5.6 |     5.3x |
+|                  | BareScript (Py)  |      39.1 |    37.1x |
+| schemaParse      | Python           |      17.1 |          |
+|                  | BareScript (PyC) |     120.4 |     7.1x |
+|                  | BareScript (Py)  |     882.4 |    51.7x |
 | urlDecode        | Python           |       1.2 |          |
-|                  | BareScript (PyC) |      12.6 |    10.7x |
-|                  | BareScript (Py)  |      64.7 |    55.0x |
+|                  | BareScript (PyC) |      13.1 |    10.8x |
+|                  | BareScript (Py)  |      68.5 |    56.6x |
 
 
 ## Using BareScript with an AI Assistant

{bare_script-5.0.4 → bare_script-5.1.0}/README.md

@@ -31,16 +31,16 @@ confident that BareScript will execute the same regardless of the underlying run
 ## Executing BareScript Scripts
 
 To execute a BareScript script, parse the script using the
-[parse_script](https://craigahobbs.github.io/bare-script-py/scripts.html#parse-script)
+[barescript_parse_script](https://craigahobbs.github.io/bare-script-py/scripts.html#barescript-parse-script)
 function. Then execute the script using the
 [execute_script](https://craigahobbs.github.io/bare-script-py/scripts.html#execute-script)
 function. For example:
 
 ``` python
-from bare_script import execute_script, parse_script
+from bare_script import barescript_parse_script, execute_script
 
 # Parse the script
-script = parse_script('''\
+script = barescript_parse_script('''\
 # Double a number
 function double(n):
     return n * 2
@@ -75,10 +75,10 @@ functions.
 ``` python
 import urllib.request
 
-from bare_script import execute_script, fetch_http, parse_script
+from bare_script import barescript_parse_script, execute_script, fetch_http
 
 # Parse the script
-script = parse_script('''\
+script = barescript_parse_script('''\
 # Fetch the BareScript builtin library documentation JSON
 docs = jsonParse(systemFetch('https://craigahobbs.github.io/bare-script-py/library/library-builtin.json'))
 
@@ -102,7 +102,7 @@ The BareScript Library has 108 builtin functions
 To evaluate a
 [BareScript expression](https://craigahobbs.github.io/bare-script-py/language/#expressions),
 parse the expression using the
-[parse_expression](https://craigahobbs.github.io/bare-script-py/expressions.html#parse-expression)
+[barescript_parse_expression](https://craigahobbs.github.io/bare-script-py/expressions.html#barescript-parse-expression)
 function. Then evaluate the expression using the
 [evaluate_expression](https://craigahobbs.github.io/bare-script-py/expressions.html#evaluate-expression)
 function.
@@ -114,10 +114,10 @@ a set of built-in, spreadsheet-like functions.
 For example:
 
 ``` python
-from bare_script import evaluate_expression, parse_expression
+from bare_script import barescript_parse_expression, evaluate_expression
 
 # Parse the expression
-expr = parse_expression('2 * max(a, b, c)')
+expr = barescript_parse_expression('2 * max(a, b, c)')
 
 # Evaluate the expression
 variables = {'a': 1, 'b': 2, 'c': 3}
@@ -227,21 +227,21 @@ without a native Python equivalent are omitted.
 
 | Test             | Language         | Time (ms) | Multiple |
 | ---------------- | ---------------- | --------: | -------: |
-| mandelbrot       | Python           |    4793.6 |          |
-|                  | BareScript (PyC) |   11400.0 |     2.4x |
-|                  | BareScript (Py)  |  338000.0 |    70.5x |
-| schemaValidate   | Python           |      21.2 |          |
-|                  | BareScript (PyC) |      98.4 |     4.6x |
-|                  | BareScript (Py)  |    1437.6 |    67.7x |
+| mandelbrot       | Python           |    4720.8 |          |
+|                  | BareScript (PyC) |   10800.0 |     2.3x |
+|                  | BareScript (Py)  |  334100.0 |    70.8x |
+| schemaValidate   | Python           |      21.0 |          |
+|                  | BareScript (PyC) |     101.6 |     4.8x |
+|                  | BareScript (Py)  |    1404.8 |    67.0x |
 | urlEncode        | Python           |       1.1 |          |
-|                  | BareScript (PyC) |       5.5 |     5.1x |
-|                  | BareScript (Py)  |      38.5 |    36.3x |
-| schemaParse      | Python           |      17.7 |          |
-|                  | BareScript (PyC) |     128.0 |     7.2x |
-|                  | BareScript (Py)  |     912.8 |    51.5x |
+|                  | BareScript (PyC) |       5.6 |     5.3x |
+|                  | BareScript (Py)  |      39.1 |    37.1x |
+| schemaParse      | Python           |      17.1 |          |
+|                  | BareScript (PyC) |     120.4 |     7.1x |
+|                  | BareScript (Py)  |     882.4 |    51.7x |
 | urlDecode        | Python           |       1.2 |          |
-|                  | BareScript (PyC) |      12.6 |    10.7x |
-|                  | BareScript (Py)  |      64.7 |    55.0x |
+|                  | BareScript (PyC) |      13.1 |    10.8x |
+|                  | BareScript (Py)  |      68.5 |    56.6x |
 
 
 ## Using BareScript with an AI Assistant

{bare_script-5.0.4 → bare_script-5.1.0}/setup.cfg

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

{bare_script-5.0.4 → bare_script-5.1.0}/src/bare_script/__init__.py

@@ -7,13 +7,6 @@ bare-script package
 
 import os
 
-from .lint import \
-    lint_script
-
-from .model import \
-    validate_expression, \
-    validate_script
-
 from .options import \
     fetch_http, \
     fetch_read_only, \
@@ -21,13 +14,12 @@ from .options import \
     log_stdout, \
     url_file_relative
 
-from .parser import \
-    BareScriptParserError, \
-    parse_expression, \
-    parse_script
-
 from .runtime import \
-    BareScriptRuntimeError
+    BareScriptParserError, \
+    BareScriptRuntimeError, \
+    barescript_lint_script, \
+    barescript_parse_expression, \
+    barescript_parse_script
 
 if not os.environ.get('BARESCRIPT_RUNTIME_PY'): # pragma: no cover
     try:

{bare_script-5.0.4 → bare_script-5.1.0}/src/bare_script/bare.py

@@ -11,10 +11,8 @@ import os
 import sys
 import time
 
-from .lint import lint_script
 from .options import fetch_read_write, log_stdout, url_file_relative
-from .parser import parse_expression, parse_script
-from .runtime import SYSTEM_GLOBAL_INCLUDES_NAME
+from .runtime import SYSTEM_GLOBAL_INCLUDES_NAME, barescript_lint_script, barescript_parse_expression, barescript_parse_script
 from .value import value_boolean
 if not os.environ.get('BARESCRIPT_RUNTIME_PY'): # pragma: no cover
     try:
@@ -56,7 +54,7 @@ def main(argv=None):
         # Evaluate the global variable expression arguments
         globals_ = {}
         for var_name, var_expr in args.var:
-            globals_[var_name] = evaluate_expression(parse_expression(var_expr))
+            globals_[var_name] = evaluate_expression(barescript_parse_expression(var_expr))
 
         # Get the scripts to run
         scripts = args.scripts
@@ -102,7 +100,7 @@ def main(argv=None):
                 script_source = script_value
 
             # Parse the script source
-            script = parse_script(script_source, 1, script_name)
+            script = barescript_parse_script(script_source, 1, script_name)
 
             # Execute?
             static_globals = None
@@ -138,7 +136,7 @@ def main(argv=None):
 
             # Run the bare-script linter?
             if args.static and ix_script >= ix_user_script:
-                warnings = lint_script(script, static_globals)
+                warnings = barescript_lint_script(script, static_globals)
                 if not warnings:
                     print(f'BareScript static analysis "{script_name}" ... OK')
                 else:

{bare_script-5.0.4 → bare_script-5.1.0}/src/bare_script/include.py

@@ -22,6 +22,7 @@ execute_script(
     {
         'statements': [
             {'include': {'includes': [
+                {'url': 'barescriptModel.bare', 'system': True},
                 {'url': 'data.bare', 'system': True},
                 {'url': 'dataLineChart.bare', 'system': True},
                 {'url': 'dataTable.bare', 'system': True},
@@ -69,6 +70,56 @@ def _include_options():
     return {'globals': _INCLUDE_GLOBALS}
 
 
+#
+# barescriptModel.bare
+#
+
+
+def barescript_type_model():
+    """
+    Get the BareScript type model
+
+    :return: The BareScript `type model <https://craigahobbs.github.io/bare-script/model/>`__
+    :rtype: dict
+    """
+
+    return _INCLUDE_GLOBALS['barescriptTypeModel']([], _include_options())
+
+
+def barescript_validate_expression(expr):
+    """
+    Validate an expression model
+
+    :param expr: The `expression model <https://craigahobbs.github.io/bare-script/model/#var.vName='Expression'>`__
+    :type expr: dict
+    :return: The validated expression model
+    :rtype: dict
+    :raises SchemaValidationError: A validation error occurred
+    """
+
+    result = _INCLUDE_GLOBALS['barescriptValidateExpressionEx']([expr], _include_options())
+    if 'error' in result:
+        raise SchemaValidationError(result['error'], result['memberFqn'])
+    return result['result']
+
+
+def barescript_validate_script(script):
+    """
+    Validate a BareScript model
+
+    :param script: The `BareScript model <https://craigahobbs.github.io/bare-script/model/#var.vName='BareScript'>`__
+    :type script: dict
+    :return: The validated BareScript model
+    :rtype: dict
+    :raises SchemaValidationError: A validation error occurred
+    """
+
+    result = _INCLUDE_GLOBALS['barescriptValidateScriptEx']([script], _include_options())
+    if 'error' in result:
+        raise SchemaValidationError(result['error'], result['memberFqn'])
+    return result['result']
+
+
 #
 # data.bare
 #