bare-script 4.2.7__tar.gz → 4.2.9__tar.gz

{bare_script-4.2.7/src/bare_script.egg-info → bare_script-4.2.9}/PKG-INFO

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

{bare_script-4.2.7 → bare_script-4.2.9}/setup.cfg

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

{bare_script-4.2.7 → bare_script-4.2.9}/src/bare_script/include/markdownUp.bare

@@ -147,6 +147,7 @@ endfunction
 # $doc:
 # $doc: **Note:** Element model "callback" members are a map of event name (e.g., "click") to
 # $doc: event callback function. The following events have callback arguments:
+# $doc: - **click** - For an SVG element, the click's x and y coordinates and the SVG's width and height
 # $doc: - **keydown** - keyCode
 # $doc: - **keypress** - keyCode
 # $doc: - **keyup** - keyCode

{bare_script-4.2.7 → bare_script-4.2.9}/src/bare_script/library.py

@@ -149,8 +149,6 @@ _ARRAY_GET_ARGS = value_args_model([
 # $return: The first index of the value in the array; -1 if not found.
 def _array_index_of(args, options):
     array, value, index = value_args_validate(_ARRAY_INDEX_OF_ARGS, args, -1)
-    if index >= len(array):
-        raise ValueArgsError('index', index, -1)
 
     # Value function?
     if value_type(value) == 'function':
@@ -196,10 +194,8 @@ _ARRAY_JOIN_ARGS = value_args_model([
 # $return: The last index of the value in the array; -1 if not found.
 def _array_last_index_of(args, options):
     array, value, index = value_args_validate(_ARRAY_LAST_INDEX_OF_ARGS, args, -1)
-    if index is None:
+    if index is None or index >= len(array):
         index = len(array) - 1
-    if index >= len(array):
-        raise ValueArgsError('index', index, -1)
 
     # Value function?
     if value_type(value) == 'function':
@@ -2208,3 +2204,17 @@ EXPRESSION_FUNCTIONS = dict(
     (expr_fn_name, SCRIPT_FUNCTIONS[script_fn_name])
     for expr_fn_name, script_fn_name in EXPRESSION_FUNCTION_MAP.items()
 )
+
+
+# Library functions with an inline "intrinsic" fast path in the runtime call dispatch. Membership is by
+# function-object identity, so any override (a user function, an options global, or an unittestMock
+# systemGlobalSet) is a different object that misses the set and takes the normal call path. Kept small
+# on purpose: these hot, validation-heavy accessors measured as ~all of the include-test speedup.
+# Defined here, next to SCRIPT_FUNCTIONS, mirroring the JavaScript implementation.
+INTRINSICS = frozenset((
+    SCRIPT_FUNCTIONS['arrayGet'],
+    SCRIPT_FUNCTIONS['arrayPush'],
+    SCRIPT_FUNCTIONS['arraySet'],
+    SCRIPT_FUNCTIONS['objectGet'],
+    SCRIPT_FUNCTIONS['objectSet'],
+))

{bare_script-4.2.7 → bare_script-4.2.9}/src/bare_script/parser.py

@@ -764,7 +764,7 @@ def _parse_unary_expression(expr_text, array_literals):
 # BareScript expression regex
 _R_EXPR_BINARY_OP = re.compile(r'^\s*(\*\*|\*|\/|%|\+|-|<<|>>|<=|<|>=|>|==|!=|&&|\|\||&|\^|\|)')
 _R_EXPR_UNARY_OP = re.compile(r'^\s*(!|-|~)')
-_R_EXPR_FUNCTION_OPEN = re.compile(r'^\s*([A-Za-z_]\w+)\s*\(')
+_R_EXPR_FUNCTION_OPEN = re.compile(r'^\s*([A-Za-z_]\w*)\s*\(')
 _R_EXPR_FUNCTION_SEPARATOR = re.compile(r'^\s*,')
 _R_EXPR_FUNCTION_CLOSE = re.compile(r'^\s*\)')
 _R_EXPR_GROUP_OPEN = re.compile(r'^\s*\(')

{bare_script-4.2.7 → bare_script-4.2.9}/src/bare_script/runtime.py

@@ -8,7 +8,7 @@ The BareScript runtime
 import datetime
 import functools
 
-from .library import EXPRESSION_FUNCTIONS, SCRIPT_FUNCTIONS
+from .library import EXPRESSION_FUNCTIONS, INTRINSICS, SCRIPT_FUNCTIONS
 from .model import lint_script
 from .options import url_file_relative
 from .parser import parse_script
@@ -315,6 +315,109 @@ def evaluate_expression(expr, options=None, locals_=None, builtins=True, script=
         if func_value is not None:
             # Call the function
             try:
+                # Intrinsic fast path: run the body inline, skipping value_args_validate and the
+                # call frame. Bad arguments raise ValueArgsError, handled by the except below exactly
+                # as the normal call would; a call reaching one of these under a different name (an
+                # alias) matches no branch and falls through to the normal call.
+                if func_value in INTRINSICS:
+                    func_args_length = len(func_args)
+                    if func_name == 'arrayGet':
+                        if func_args_length < 1:
+                            raise ValueArgsError('array', None)
+                        array_value = func_args[0]
+                        array_type = type(array_value)
+                        if array_type is not list:
+                            raise ValueArgsError('array', array_value)
+                        if func_args_length < 2:
+                            raise ValueArgsError('index', None)
+                        index_value = func_args[1]
+                        index_type = type(index_value)
+                        if index_type is float:
+                            if index_value < 0 or not index_value.is_integer():
+                                raise ValueArgsError('index', index_value)
+                            index_value = int(index_value)
+                        elif index_type is int:
+                            if index_value < 0:
+                                raise ValueArgsError('index', index_value)
+                        else:
+                            raise ValueArgsError('index', index_value)
+                        if func_args_length > 2:
+                            raise ValueArgsError(None, func_args_length)
+                        if index_value >= len(array_value):
+                            raise ValueArgsError('index', index_value)
+                        return array_value[index_value]
+                    if func_name == 'arrayPush':
+                        if func_args_length < 1:
+                            raise ValueArgsError('array', None)
+                        array_value = func_args[0]
+                        array_type = type(array_value)
+                        if array_type is not list:
+                            raise ValueArgsError('array', array_value)
+                        array_value.extend(func_args[1:])
+                        return array_value
+                    if func_name == 'arraySet':
+                        if func_args_length < 1:
+                            raise ValueArgsError('array', None)
+                        array_value = func_args[0]
+                        array_type = type(array_value)
+                        if array_type is not list:
+                            raise ValueArgsError('array', array_value)
+                        if func_args_length < 2:
+                            raise ValueArgsError('index', None)
+                        index_value = func_args[1]
+                        index_type = type(index_value)
+                        if index_type is float:
+                            if index_value < 0 or not index_value.is_integer():
+                                raise ValueArgsError('index', index_value)
+                            index_value = int(index_value)
+                        elif index_type is int:
+                            if index_value < 0:
+                                raise ValueArgsError('index', index_value)
+                        else:
+                            raise ValueArgsError('index', index_value)
+                        if func_args_length > 3:
+                            raise ValueArgsError(None, func_args_length)
+                        if index_value >= len(array_value):
+                            raise ValueArgsError('index', index_value)
+                        set_value = func_args[2] if func_args_length >= 3 else None
+                        array_value[index_value] = set_value
+                        return set_value
+                    if func_name == 'objectGet':
+                        default_value = func_args[2] if func_args_length >= 3 else None
+                        if func_args_length < 1:
+                            raise ValueArgsError('object', None, default_value)
+                        object_value = func_args[0]
+                        object_type = type(object_value)
+                        if object_type is not dict:
+                            raise ValueArgsError('object', object_value, default_value)
+                        if func_args_length < 2:
+                            raise ValueArgsError('key', None, default_value)
+                        key_value = func_args[1]
+                        key_type = type(key_value)
+                        if key_type is not str:
+                            raise ValueArgsError('key', key_value, default_value)
+                        if func_args_length > 3:
+                            raise ValueArgsError(None, func_args_length, default_value)
+                        return object_value.get(key_value, default_value)
+                    if func_name == 'objectSet':
+                        if func_args_length < 1:
+                            raise ValueArgsError('object', None)
+                        object_value = func_args[0]
+                        object_type = type(object_value)
+                        if object_type is not dict:
+                            raise ValueArgsError('object', object_value)
+                        if func_args_length < 2:
+                            raise ValueArgsError('key', None)
+                        key_value = func_args[1]
+                        key_type = type(key_value)
+                        if key_type is not str:
+                            raise ValueArgsError('key', key_value)
+                        if func_args_length > 3:
+                            raise ValueArgsError(None, func_args_length)
+                        set_value = func_args[2] if func_args_length >= 3 else None
+                        object_value[key_value] = set_value
+                        return set_value
+
                 return func_value(func_args, options)
             except BareScriptRuntimeError:
                 raise

{bare_script-4.2.7 → bare_script-4.2.9/src/bare_script.egg-info}/PKG-INFO

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