jsonata-python 0.5.1__tar.gz → 0.5.3__tar.gz

{jsonata_python-0.5.1 → jsonata_python-0.5.3}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: jsonata-python
-Version: 0.5.1
+Version: 0.5.3
 Summary: Pure Python implementation of JSONata
 Project-URL: Homepage, https://github.com/rayokota/jsonata-python
 Project-URL: Bug Reports, https://github.com/rayokota/jsonata-python/issues
@@ -207,6 +207,7 @@ License: Apache License
            See the License for the specific language governing permissions and
            limitations under the License.
         
+License-File: LICENSE
 Keywords: json,jsonata
 Classifier: Development Status :: 4 - Beta
 Classifier: License :: OSI Approved :: Apache Software License
@@ -277,7 +278,7 @@ options:
   -f {auto,json,string}, --format {auto,json,string}
                         Input format (default=auto)
   -o <arg>, --output <arg>
-                        JSON output file (- for stdin)
+                        JSON output file (default=stdout)
   -oc <arg>, --ocharset <arg>
                         Output character set (default=utf-8)
   -time                 Print performance timers to stderr
@@ -286,7 +287,7 @@ options:
                         JSONata variable bindings
   -bf <file>, --bindings-file <file>
                         JSONata variable bindings file
-  -it, --interactive    Interactive REPL
+  -it, --interactive    Interactive REPL (requires input file)
 ```
 
 ### Examples
@@ -316,6 +317,11 @@ helloworld.json
     "frederic.smith@very-serious.com"
   ]
 }
+
+% python3 -m jsonata.cli -i helloworld.json -it
+Enter an expression to have it evaluated.
+JSONata> (a & b)
+hello world
 ```
 
 ## Running Tests

{jsonata_python-0.5.1 → jsonata_python-0.5.3}/README.md

@@ -61,7 +61,7 @@ options:
   -f {auto,json,string}, --format {auto,json,string}
                         Input format (default=auto)
   -o <arg>, --output <arg>
-                        JSON output file (- for stdin)
+                        JSON output file (default=stdout)
   -oc <arg>, --ocharset <arg>
                         Output character set (default=utf-8)
   -time                 Print performance timers to stderr
@@ -70,7 +70,7 @@ options:
                         JSONata variable bindings
   -bf <file>, --bindings-file <file>
                         JSONata variable bindings file
-  -it, --interactive    Interactive REPL
+  -it, --interactive    Interactive REPL (requires input file)
 ```
 
 ### Examples
@@ -100,6 +100,11 @@ helloworld.json
     "frederic.smith@very-serious.com"
   ]
 }
+
+% python3 -m jsonata.cli -i helloworld.json -it
+Enter an expression to have it evaluated.
+JSONata> (a & b)
+hello world
 ```
 
 ## Running Tests

{jsonata_python-0.5.1 → jsonata_python-0.5.3}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "jsonata-python"
-version = "0.5.1"
+version = "0.5.3"
 description = "Pure Python implementation of JSONata"
 readme = "README.md"
 requires-python = ">=3.9"

{jsonata_python-0.5.1 → jsonata_python-0.5.3}/src/jsonata/cli/__main__.py

@@ -34,7 +34,7 @@ def get_options(argv: Optional[list[str]] = None) -> argparse.ArgumentParser:
     """
     parser = argparse.ArgumentParser(prog="jsonata.cli", description="Pure Python JSONata CLI")
     parser.add_argument(
-        "-v", "--version", action='version', version='%(prog)s 0.5.1')
+        "-v", "--version", action='version', version='%(prog)s 0.5.3')
 
     parser.add_argument(
         "-e", "--expression", metavar="<file>",
@@ -54,7 +54,7 @@ def get_options(argv: Optional[list[str]] = None) -> argparse.ArgumentParser:
     )
     parser.add_argument(
         "-o", "--output", metavar="<arg>",
-        help="JSON output file (- for stdin)"
+        help="JSON output file (default=stdout)"
     )
     parser.add_argument(
         "-oc", "--ocharset", default="utf-8", metavar="<arg>",
@@ -78,7 +78,7 @@ def get_options(argv: Optional[list[str]] = None) -> argparse.ArgumentParser:
     )
     parser.add_argument(
         "-it", "--interactive", default=False, action="store_true",
-        help="Interactive REPL"
+        help="Interactive REPL (requires input file)"
     )
 
     # The expression
@@ -160,8 +160,9 @@ def main(argv: Optional[list[str]] = None) -> int:
     options = parser.parse_args(argv)
 
     if options.expression is None and options.expr is None:
-        parser.print_help()
-        return 1
+        if not options.interactive:
+            parser.print_help()
+            return 1
 
     icharset = options.icharset
     ocharset = options.icharset
@@ -187,6 +188,9 @@ def main(argv: Optional[list[str]] = None) -> int:
         bindings = json.loads(bindings_str)
 
     if options.input == '-' or options.input is None:
+        if options.interactive:
+            parser.print_help()
+            return 1
         input = sys.stdin.read()
     else:
         with open(options.input, 'r', encoding=icharset) as fd:

{jsonata_python-0.5.1 → jsonata_python-0.5.3}/src/jsonata/tokenizer.py

@@ -138,7 +138,10 @@ class Tokenizer:
                 start = self.position
                 while current_char == 'i' or current_char == 'm':
                     self.position += 1
-                    current_char = self.path[self.position]
+                    if self.position < self.length:
+                        current_char = self.path[self.position]
+                    else:
+                        current_char = None
                 flags = self.path[start:self.position] + 'g'
 
                 # Convert flags to Java Pattern flags

{jsonata_python-0.5.1 → jsonata_python-0.5.3}/tests/string_test.py

@@ -38,6 +38,10 @@ class TestString:
         assert jsonata.Jsonata("$replace('h.ello', '.', '')").evaluate(None) == "hello"
         assert jsonata.Jsonata("$replace('h.e.l.l.o', '.', '',2)").evaluate(None) == "hel.l.o"
 
+    def test_regex(self):
+        assert (jsonata.Jsonata("($matcher := $eval('/^' & 'foo' & '/i'); $.$spread()[$.$keys() ~> $matcher])")
+                .evaluate({"foo": 1, "bar": 2}) == {"foo": 1})
+
     #
     # Additional $split tests
     #