jsonatapy 2.2.2__tar.gz → 2.2.3__tar.gz

{jsonatapy-2.2.2 → jsonatapy-2.2.3}/CHANGELOG.md

@@ -19,6 +19,37 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Security
 
+## [2.2.3] - 2026-07-12
+
+### Added
+- `evaluate_json_or_none()`'s `json_str` parameter now accepts `None` (in addition to a JSON
+  string), binding the top-level context (`$`) to a true JSONata `Undefined` rather than an
+  explicit `null`. (#68)
+- `docs/cli.md`: a full command-line reference for both `jsonata` (Rust) and `jsonatapy`
+  (Python), covering flags, input resolution, output/exit-code semantics, and the MCP
+  subcommand — previously undocumented outside internal spec/plan files. (#68)
+
+### Changed
+- Release CLI binary archives are now named `jsonata-v<version>-<target>.tar.gz`/`.zip`
+  (previously `jsonata-<target>.tar.gz`/`.zip` with no version embedded).
+
+### Deprecated
+
+### Removed
+
+### Fixed
+- The Python CLI's `-n`/`--null-input` now binds `$` to a true `Undefined`, matching the Rust
+  CLI exactly (`jsonatapy -n '$'` now prints nothing, as `jsonata -n '$'` already did). It
+  previously passed an explicit JSON `null` context instead, observable only for expressions
+  referencing `$` directly. (#68)
+- Release workflow: `publish-pypi` and `publish-crates` now require `build-cli-binaries` to
+  succeed first. Previously the two registry publishes were independent of the CLI binary
+  build, so a CLI build failure (untested in a real release prior to this) would have shipped
+  a version to PyPI/crates.io with no CLI binaries attached and no way to reuse that version
+  number.
+
+### Security
+
 ## [2.2.2] - 2026-07-09
 
 ### Added

{jsonatapy-2.2.2 → jsonatapy-2.2.3}/Cargo.lock

@@ -41,12 +41,56 @@ version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
 
+[[package]]
+name = "anstream"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "824a212faf96e9acacdbd09febd34438f8f711fb84e09a8916013cd7815ca28d"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "is_terminal_polyfill",
+ "utf8parse",
+]
+
 [[package]]
 name = "anstyle"
 version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "940b3a0ca603d1eade50a4846a2afffd5ef57a9feac2c0e2ec2e14f9ead76000"
 
+[[package]]
+name = "anstyle-parse"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52ce7f38b242319f7cabaa6813055467063ecdc9d355bbb4ce0c68908cd8130e"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc"
+dependencies = [
+ "windows-sys",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "3.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d"
+dependencies = [
+ "anstyle",
+ "once_cell_polyfill",
+ "windows-sys",
+]
+
 [[package]]
 name = "ar_archive_writer"
 version = "0.5.2"
@@ -56,6 +100,21 @@ dependencies = [
  "object",
 ]
 
+[[package]]
+name = "assert_cmd"
+version = "2.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2aa3a22042e45de04255c7bf3626e239f450200fd0493c1e382263544b20aea6"
+dependencies = [
+ "anstyle",
+ "bstr",
+ "libc",
+ "predicates",
+ "predicates-core",
+ "predicates-tree",
+ "wait-timeout",
+]
+
 [[package]]
 name = "autocfg"
 version = "1.5.1"
@@ -89,6 +148,17 @@ version = "2.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4388bee8683e3d04af747c73422af53102d2bd24d9eadb6cbc100baef4b43f8"
 
+[[package]]
+name = "bstr"
+version = "1.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5cee35f73844aa3014bb606320a6c1f010249dbdf43342fe54b5a4f6a8ed4b79"
+dependencies = [
+ "memchr",
+ "regex-automata",
+ "serde_core",
+]
+
 [[package]]
 name = "bumpalo"
 version = "3.20.3"
@@ -175,6 +245,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1ddb117e43bbf7dacf0a4190fef4d345b9bad68dfc649cb349e7d17d28428e51"
 dependencies = [
  "clap_builder",
+ "clap_derive",
 ]
 
 [[package]]
@@ -183,8 +254,22 @@ version = "4.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "714a53001bf66416adb0e2ef5ac857140e7dc3a0c48fb28b2f10762fc4b5069f"
 dependencies = [
+ "anstream",
  "anstyle",
  "clap_lex",
+ "strsim",
+]
+
+[[package]]
+name = "clap_derive"
+version = "4.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2ce8604710f6733aa641a2b3731eaa1e8b3d9973d5e3565da11800813f997a9"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "syn",
 ]
 
 [[package]]
@@ -193,6 +278,12 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c8d4a3bb8b1e0c1050499d1815f5ab16d04f0959b233085fb31653fbfc9d98f9"
 
+[[package]]
+name = "colorchoice"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d07550c9036bf2ae0c684c4297d503f838287c83c53686d05370d0e139ae570"
+
 [[package]]
 name = "core-foundation-sys"
 version = "0.8.7"
@@ -274,6 +365,12 @@ version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5"
 
+[[package]]
+name = "difflib"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8"
+
 [[package]]
 name = "either"
 version = "1.16.0"
@@ -455,6 +552,12 @@ dependencies = [
  "hashbrown 0.17.1",
 ]
 
+[[package]]
+name = "is_terminal_polyfill"
+version = "1.70.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695"
+
 [[package]]
 name = "itertools"
 version = "0.13.0"
@@ -483,14 +586,17 @@ dependencies = [
 
 [[package]]
 name = "jsonata-core"
-version = "2.2.2"
+version = "2.2.3"
 dependencies = [
+ "assert_cmd",
  "base64",
  "chrono",
+ "clap",
  "criterion",
  "indexmap",
  "num-traits",
  "percent-encoding",
+ "predicates",
  "proptest",
  "pyo3",
  "rand 0.10.2",
@@ -526,6 +632,12 @@ version = "2.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98"
 
+[[package]]
+name = "normalize-line-endings"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be"
+
 [[package]]
 name = "num-traits"
 version = "0.2.19"
@@ -550,6 +662,12 @@ version = "1.21.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50"
 
+[[package]]
+name = "once_cell_polyfill"
+version = "1.70.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe"
+
 [[package]]
 name = "oorandom"
 version = "11.1.5"
@@ -621,6 +739,36 @@ dependencies = [
  "zerocopy",
 ]
 
+[[package]]
+name = "predicates"
+version = "3.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ada8f2932f28a27ee7b70dd6c1c39ea0675c55a36879ab92f3a715eaa1e63cfe"
+dependencies = [
+ "anstyle",
+ "difflib",
+ "float-cmp",
+ "normalize-line-endings",
+ "predicates-core",
+ "regex",
+]
+
+[[package]]
+name = "predicates-core"
+version = "1.0.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cad38746f3166b4031b1a0d39ad9f954dd291e7854fcc0eed52ee41a0b50d144"
+
+[[package]]
+name = "predicates-tree"
+version = "1.0.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0de1b847b39c8131db0467e9df1ff60e6d0562ab8e9a16e568ad0fdb372e2f2"
+dependencies = [
+ "predicates-core",
+ "termtree",
+]
+
 [[package]]
 name = "proc-macro2"
 version = "1.0.106"
@@ -1002,6 +1150,12 @@ dependencies = [
  "windows-sys",
 ]
 
+[[package]]
+name = "strsim"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
+
 [[package]]
 name = "syn"
 version = "2.0.118"
@@ -1032,6 +1186,12 @@ dependencies = [
  "windows-sys",
 ]
 
+[[package]]
+name = "termtree"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f50febec83f5ee1df3015341d8bd429f2d1cc62bcba7ea2076759d315084683"
+
 [[package]]
 name = "thiserror"
 version = "2.0.18"
@@ -1074,6 +1234,12 @@ version = "1.0.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75"
 
+[[package]]
+name = "utf8parse"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
+
 [[package]]
 name = "value-trait"
 version = "0.12.1"

{jsonatapy-2.2.2 → jsonatapy-2.2.3}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "jsonata-core"
-version = "2.2.2"
+version = "2.2.3"
 edition = "2021"
 authors = ["txjmb <txjmb@users.noreply.github.com>"]
 description = "High-performance Rust implementation of JSONata query and transformation language"
@@ -36,6 +36,11 @@ exclude = [
 name = "jsonata_core"
 crate-type = ["cdylib", "rlib"]
 
+[[bin]]
+name = "jsonata"
+path = "src/bin/jsonata/main.rs"
+required-features = ["cli"]
+
 [dependencies]
 pyo3 = { version = "0.29", optional = true }
 serde = { version = "1.0", features = ["derive"] }
@@ -50,16 +55,20 @@ percent-encoding = "2.3"
 rand = "0.10"
 stacker = "0.1"
 simd-json = { version = "0.17", optional = true }
+clap = { version = "4.6", features = ["derive"], optional = true }
 
 [features]
 default = ["simd"]
 simd = ["dep:simd-json"]
 python = ["dep:pyo3"]
+cli = ["dep:clap"]
 bench = []   # exposes _bench facade for Criterion benchmarks
 
 [dev-dependencies]
 criterion = "0.8"
 proptest = "1.10"
+assert_cmd = "2.0"
+predicates = "3.1"
 
 [[bench]]
 name = "evaluator_bench"

{jsonatapy-2.2.2 → jsonatapy-2.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jsonatapy
-Version: 2.2.2
+Version: 2.2.3
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
@@ -20,16 +20,20 @@ Requires-Dist: matplotlib>=3.5 ; extra == 'bench'
 Requires-Dist: pytest>=7.0 ; extra == 'dev'
 Requires-Dist: pytest-cov>=4.0 ; extra == 'dev'
 Requires-Dist: pytest-xdist>=3.0 ; extra == 'dev'
+Requires-Dist: pytest-asyncio>=0.24 ; extra == 'dev'
 Requires-Dist: ruff>=0.3.0 ; extra == 'dev'
 Requires-Dist: mypy>=1.0 ; extra == 'dev'
 Requires-Dist: maturin>=1.0 ; extra == 'dev'
+Requires-Dist: fastmcp>=3.0 ; extra == 'dev'
 Requires-Dist: mkdocs>=1.5 ; extra == 'docs'
 Requires-Dist: mkdocs-material>=9.0 ; extra == 'docs'
 Requires-Dist: mkdocstrings[python]>=0.24 ; extra == 'docs'
 Requires-Dist: pymdown-extensions>=10.0 ; extra == 'docs'
+Requires-Dist: fastmcp>=3.0 ; extra == 'mcp'
 Provides-Extra: bench
 Provides-Extra: dev
 Provides-Extra: docs
+Provides-Extra: mcp
 License-File: LICENSE
 Summary: High-performance Python/Rust implementation of JSONata query and transformation language
 Keywords: jsonata,json,query,transform
@@ -50,7 +54,7 @@ High-performance [JSONata](https://jsonata.org/) implementation in Rust, with Py
 Much of this project was built using Claude Code with significant human oversight. There was no performant
 JSONata implementation in Python, so the goal was to port JSONata to Rust (with a PyO3 wrapper
 for Python) and see how fast it could go. The answer: faster than V8 for most expression
-workloads, and faster than the next pure-Rust implementation.
+workloads, and faster than the next pure-Rust implementation.  The rust versions are published on crates.io, and the python wheels on pypi.
 
 Many, many thanks to the incredible work of all the maintainers of the [JSONata](https://github.com/jsonata-js/jsonata) reference library.  JSONata is a very powerful, well-designed, and useful language that has made an impact on many projects.  This project leverages their outstanding work to extend that capability to Python and Rust and would not be possible without that project.  The implementation in Rust was strongly influenced by their implementation.  The 1600+ tests they created provided the scaffolding and validation for all of this project.  This project will continue to follow and be a derivative of the reference project as the JSONata reference library evolves.
 
@@ -135,6 +139,20 @@ Supports Python 3.10, 3.11, 3.12, 3.13, 3.14 on Linux, macOS (Intel & ARM), and
 
 ---
 
+## Command-line quick start
+
+Both packages also ship a CLI, `jq`-shaped, with an identical contract:
+
+```bash
+pip install jsonatapy
+echo '{"orders":[{"product":"Laptop","price":1200}]}' | jsonatapy 'orders[price > 100].product'
+# "Laptop"
+```
+
+See [CLI Reference](docs/cli.md) for the full flag/exit-code contract.
+
+---
+
 ## What is JSONata?
 
 JSONata is a query and transformation language for JSON data:
@@ -189,6 +207,7 @@ benchmark methodology.
 - [Installation](docs/installation.md)
 - [API Reference](docs/api.md)
 - [Usage Guide](docs/usage.md)
+- [CLI Reference](docs/cli.md)
 - [Performance](docs/performance.md)
 - [Optimization Tips](docs/optimization-tips.md)
 - [Building from Source](docs/development/building.md)

{jsonatapy-2.2.2 → jsonatapy-2.2.3}/README.md

@@ -5,7 +5,7 @@ High-performance [JSONata](https://jsonata.org/) implementation in Rust, with Py
 Much of this project was built using Claude Code with significant human oversight. There was no performant
 JSONata implementation in Python, so the goal was to port JSONata to Rust (with a PyO3 wrapper
 for Python) and see how fast it could go. The answer: faster than V8 for most expression
-workloads, and faster than the next pure-Rust implementation.
+workloads, and faster than the next pure-Rust implementation.  The rust versions are published on crates.io, and the python wheels on pypi.
 
 Many, many thanks to the incredible work of all the maintainers of the [JSONata](https://github.com/jsonata-js/jsonata) reference library.  JSONata is a very powerful, well-designed, and useful language that has made an impact on many projects.  This project leverages their outstanding work to extend that capability to Python and Rust and would not be possible without that project.  The implementation in Rust was strongly influenced by their implementation.  The 1600+ tests they created provided the scaffolding and validation for all of this project.  This project will continue to follow and be a derivative of the reference project as the JSONata reference library evolves.
 
@@ -90,6 +90,20 @@ Supports Python 3.10, 3.11, 3.12, 3.13, 3.14 on Linux, macOS (Intel & ARM), and
 
 ---
 
+## Command-line quick start
+
+Both packages also ship a CLI, `jq`-shaped, with an identical contract:
+
+```bash
+pip install jsonatapy
+echo '{"orders":[{"product":"Laptop","price":1200}]}' | jsonatapy 'orders[price > 100].product'
+# "Laptop"
+```
+
+See [CLI Reference](docs/cli.md) for the full flag/exit-code contract.
+
+---
+
 ## What is JSONata?
 
 JSONata is a query and transformation language for JSON data:
@@ -144,6 +158,7 @@ benchmark methodology.
 - [Installation](docs/installation.md)
 - [API Reference](docs/api.md)
 - [Usage Guide](docs/usage.md)
+- [CLI Reference](docs/cli.md)
 - [Performance](docs/performance.md)
 - [Optimization Tips](docs/optimization-tips.md)
 - [Building from Source](docs/development/building.md)

{jsonatapy-2.2.2 → jsonatapy-2.2.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "jsonatapy"
-version = "2.2.2"
+version = "2.2.3"
 description = "High-performance Python/Rust implementation of JSONata query and transformation language"
 authors = [
     {name = "txjmb", email = "txjmb@users.noreply.github.com"}
@@ -30,14 +30,22 @@ classifiers = [
 ]
 dependencies = []
 
+[project.scripts]
+jsonatapy = "jsonatapy.__main__:main"
+
 [project.optional-dependencies]
 dev = [
     "pytest>=7.0",
     "pytest-cov>=4.0",
     "pytest-xdist>=3.0",  # Parallel test execution
+    "pytest-asyncio>=0.24",  # Async tests for the FastMCP server (Task 9)
     "ruff>=0.3.0",        # Linting and formatting
     "mypy>=1.0",
     "maturin>=1.0",
+    "fastmcp>=3.0",       # So `dev` installs can run the full test suite (Task 9)
+]
+mcp = [
+    "fastmcp>=3.0",
 ]
 bench = [
     "jsonata>=0.2.0",     # jsonata-python for benchmarking
@@ -67,9 +75,11 @@ dev = [
     "pytest>=7.0",
     "pytest-cov>=4.0",
     "pytest-xdist>=3.0",
+    "pytest-asyncio>=0.24",
     "ruff>=0.3.0",
     "mypy>=1.0",
     "maturin>=1.0",
+    "fastmcp>=3.0",
 ]
 
 [tool.ruff]
@@ -112,6 +122,7 @@ python_files = "test_*.py"
 python_classes = "Test*"
 python_functions = "test_*"
 addopts = "-v --strict-markers"
+asyncio_mode = "auto"
 markers = [
     "slow: marks tests as slow (deselect with '-m \"not slow\"')",
     "compatibility: marks tests that verify JS compatibility",

{jsonatapy-2.2.2 → jsonatapy-2.2.3}/python/jsonatapy/__init__.py

@@ -230,6 +230,57 @@ class JsonataExpression:
             json_str, bindings, timeout, max_stack_depth, max_sequence_length
         )
 
+    def evaluate_json_or_none(
+        self,
+        json_str: str | None,
+        bindings: dict[str, Any] | None = None,
+        *,
+        timeout: int | None = None,
+        max_stack_depth: int | None = None,
+        max_sequence_length: int | None = None,
+    ) -> str | None:
+        """
+        Evaluate with JSON string input, distinguishing Undefined from null.
+
+        Unlike evaluate_json(), which serializes both a JSONata Undefined
+        result and an explicit JSON null result to the same text "null",
+        this method returns None (the Python value) for Undefined and the
+        string "null" for an explicit null result.
+
+        Args:
+            json_str: Input data as a JSON string, or None for no input
+                document at all -- the top-level context (`$`) is then a
+                true JSONata Undefined, distinct from passing "null" (an
+                explicit JSON null context).
+            bindings: Optional additional variable bindings
+            timeout: Maximum evaluation time in milliseconds (raises ValueError
+                with a D1012 code on timeout). Overrides any default set via
+                `compile(timeout=...)` for this call only.
+            max_stack_depth: Maximum recursion stack depth (raises ValueError
+                with a D1011 code when exceeded). Overrides any compile-time default.
+            max_sequence_length: Maximum length of a query-result sequence
+                (map/filter/wildcard/descendants/etc; raises ValueError with a
+                D2015 code when exceeded). Overrides any compile-time default.
+
+        Returns:
+            None if the result is JSONata Undefined, otherwise the result
+            as a JSON string (e.g. "null" for an explicit null result).
+
+        Raises:
+            ValueError: If JSON parsing or evaluation fails, or a guardrail is exceeded
+
+        Example:
+            >>> expr = compile("nonexistent")
+            >>> expr.evaluate_json_or_none('{"a": 1}') is None
+            True
+            >>> expr2 = compile("a")
+            >>> expr2.evaluate_json_or_none('{"a": null}')
+            'null'
+        """
+        return self._expr.evaluate_json_or_none(
+            json_str, bindings, timeout, max_stack_depth, max_sequence_length
+        )
+
     def evaluate_with_data(
         self,
         data: "JsonataData",

jsonatapy-2.2.3/python/jsonatapy/__main__.py

@@ -0,0 +1,46 @@
+"""Console-script entry point for the `jsonatapy` CLI.
+
+Dispatches to the MCP server subcommand (`jsonatapy mcp ...`) or evaluate
+mode (everything else). See study/cli_spec.md for the full contract.
+"""
+
+from __future__ import annotations
+
+import argparse
+import sys
+
+from ._cli.run import run
+
+
+def _run_mcp(argv: list[str]) -> int:
+    parser = argparse.ArgumentParser(prog="jsonatapy mcp", description="Run the JSONata MCP server")
+    parser.add_argument("--http", action="store_true", help="Serve over HTTP instead of stdio")
+    parser.add_argument(
+        "--port", type=int, default=None, metavar="N", help="HTTP port (default 8000)"
+    )
+    args = parser.parse_args(argv)
+
+    try:
+        from ._cli.mcp_server import serve
+    except ImportError:
+        print(
+            "error: the 'mcp' extra is not installed. Run:\n"
+            '  uvx --from "jsonatapy[mcp]" jsonatapy mcp\n'
+            "or: pip install jsonatapy[mcp]",
+            file=sys.stderr,
+        )
+        return 2
+
+    serve(args.http, args.port)
+    return 0
+
+
+def main() -> int:
+    argv = sys.argv[1:]
+    if argv[:1] == ["mcp"]:
+        return _run_mcp(argv[1:])
+    return run(argv)
+
+
+if __name__ == "__main__":
+    sys.exit(main())

jsonatapy-2.2.3/python/jsonatapy/_cli/__init__.py

@@ -0,0 +1 @@
+"""Internal CLI implementation for the `jsonatapy` console script. Not public API."""

jsonatapy-2.2.3/python/jsonatapy/_cli/bindings.py

@@ -0,0 +1,51 @@
+"""Parses --arg/--argjson CLI specs into a name -> value map for
+evaluate_json_or_none() bindings."""
+
+from __future__ import annotations
+
+import json
+import math
+from typing import Any
+
+
+class BindingError(Exception):
+    """Raised when an --arg/--argjson spec is malformed."""
+
+
+def _reject_constant(token: str) -> float:
+    raise ValueError(f"{token} is not valid JSON")
+
+
+def _finite_float(text: str) -> float:
+    value = float(text)
+    if not math.isfinite(value):
+        raise ValueError(f"{text} is not valid JSON")
+    return value
+
+
+def parse_bindings(arg: list[str], argjson: list[str]) -> dict[str, Any]:
+    """Parses --arg NAME=VALUE (string) and --argjson NAME=JSON (parsed) specs
+    into a single name -> value dict. --argjson wins on name collision
+    (applied second, matching src/bin/jsonata/bindings.rs's iteration order)."""
+    bindings: dict[str, Any] = {}
+    for spec in arg:
+        name, value = _split_name_value(spec, "--arg")
+        bindings[name] = value
+    for spec in argjson:
+        name, value = _split_name_value(spec, "--argjson")
+        try:
+            bindings[name] = json.loads(
+                value, parse_constant=_reject_constant, parse_float=_finite_float
+            )
+        except ValueError as e:
+            raise BindingError(f"--argjson {name}: invalid JSON value: {e}") from e
+    return bindings
+
+
+def _split_name_value(spec: str, flag: str) -> tuple[str, str]:
+    if "=" not in spec:
+        raise BindingError(f"{flag} expects NAME=VALUE, got: {spec}")
+    name, _, value = spec.partition("=")
+    if not name:
+        raise BindingError(f"{flag} expects NAME=VALUE, got: {spec}")
+    return name, value