synx-format 3.7.1__tar.gz → 3.7.2__tar.gz

{synx_format-3.7.1 → synx_format-3.7.2}/Cargo.lock

@@ -89,7 +89,7 @@ dependencies = [
 
 [[package]]
 name = "as-cli"
-version = "3.7.1"
+version = "3.7.2"
 dependencies = [
  "clap",
  "dirs",
@@ -976,15 +976,6 @@ dependencies = [
  "hashbrown 0.16.1",
 ]
 
-[[package]]
-name = "indoc"
-version = "2.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79cf5c93f93228cf8efb3ba362535fb11199ac548a09ce117c9b1adc3030d706"
-dependencies = [
- "rustversion",
-]
-
 [[package]]
 name = "ipnet"
 version = "2.12.0"
@@ -1156,15 +1147,6 @@ version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79"
 
-[[package]]
-name = "memoffset"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
-dependencies = [
- "autocfg",
-]
-
 [[package]]
 name = "miniz_oxide"
 version = "0.8.9"
@@ -1466,38 +1448,32 @@ dependencies = [
 
 [[package]]
 name = "pyo3"
-version = "0.24.2"
+version = "0.29.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5203598f366b11a02b13aa20cab591229ff0a89fd121a308a5df751d5fc9219"
+checksum = "4688ddedf473e32662b9b067670129a8afb8c18e351482c70d62ba4a88171e8b"
 dependencies = [
- "cfg-if",
- "indoc",
  "libc",
- "memoffset",
  "once_cell",
  "portable-atomic",
  "pyo3-build-config",
  "pyo3-ffi",
  "pyo3-macros",
- "unindent",
 ]
 
 [[package]]
 name = "pyo3-build-config"
-version = "0.24.2"
+version = "0.29.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99636d423fa2ca130fa5acde3059308006d46f98caac629418e53f7ebb1e9999"
+checksum = "f41027e41b4bd03f6e60f9f417fe24a6341a6bb744edd62b6f709f2a52ea30e9"
 dependencies = [
- "once_cell",
- "python3-dll-a",
  "target-lexicon",
 ]
 
 [[package]]
 name = "pyo3-ffi"
-version = "0.24.2"
+version = "0.29.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78f9cf92ba9c409279bc3305b5409d90db2d2c22392d443a87df3a1adad59e33"
+checksum = "e591a95526fead067432c3b3a33fc74770b87b1e04e73671090d9c2055a2b327"
 dependencies = [
  "libc",
  "pyo3-build-config",
@@ -1505,9 +1481,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros"
-version = "0.24.2"
+version = "0.29.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b999cb1a6ce21f9a6b147dcf1be9ffedf02e0043aec74dc390f3007047cecd9"
+checksum = "73225868fc1cd84eef2c3c230ddb91273bf1de46aeb8a4248da76d32a0924a1c"
 dependencies = [
  "proc-macro2",
  "pyo3-macros-backend",
@@ -1517,26 +1493,16 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros-backend"
-version = "0.24.2"
+version = "0.29.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "822ece1c7e1012745607d5cf0bcb2874769f0f7cb34c4cde03b9358eb9ef911a"
+checksum = "571575aa3749fa6216757dd47d2a3e7ef360f329a40f0666a9fbd14889024952"
 dependencies = [
  "heck",
  "proc-macro2",
- "pyo3-build-config",
  "quote",
  "syn",
 ]
 
-[[package]]
-name = "python3-dll-a"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d381ef313ae70b4da5f95f8a4de773c6aa5cd28f73adec4b4a31df70b66780d8"
-dependencies = [
- "cc",
-]
-
 [[package]]
 name = "quote"
 version = "1.0.45"
@@ -2038,7 +2004,7 @@ dependencies = [
 
 [[package]]
 name = "synx-bench"
-version = "3.7.1"
+version = "3.7.2"
 dependencies = [
  "criterion",
  "synx-core",
@@ -2046,7 +2012,7 @@ dependencies = [
 
 [[package]]
 name = "synx-c"
-version = "3.7.1"
+version = "3.7.2"
 dependencies = [
  "serde_json",
  "synx-core",
@@ -2054,7 +2020,7 @@ dependencies = [
 
 [[package]]
 name = "synx-cli"
-version = "3.7.1"
+version = "3.7.2"
 dependencies = [
  "clap",
  "dirs",
@@ -2069,7 +2035,7 @@ dependencies = [
 
 [[package]]
 name = "synx-core"
-version = "3.7.1"
+version = "3.7.2"
 dependencies = [
  "ed25519-dalek",
  "itoa",
@@ -2087,14 +2053,14 @@ dependencies = [
 
 [[package]]
 name = "synx-format"
-version = "3.7.1"
+version = "3.7.2"
 dependencies = [
  "synx-core",
 ]
 
 [[package]]
 name = "synx-lsp"
-version = "3.7.1"
+version = "3.7.2"
 dependencies = [
  "serde_json",
  "synx-core",
@@ -2104,7 +2070,7 @@ dependencies = [
 
 [[package]]
 name = "synx-node"
-version = "3.7.1"
+version = "3.7.2"
 dependencies = [
  "napi",
  "napi-build",
@@ -2114,7 +2080,7 @@ dependencies = [
 
 [[package]]
 name = "synx-python"
-version = "3.7.1"
+version = "3.7.2"
 dependencies = [
  "pyo3",
  "serde_json",
@@ -2123,7 +2089,7 @@ dependencies = [
 
 [[package]]
 name = "synx-wasm"
-version = "3.7.1"
+version = "3.7.2"
 dependencies = [
  "serde-wasm-bindgen",
  "serde_json",
@@ -2387,12 +2353,6 @@ version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
 
-[[package]]
-name = "unindent"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7264e107f553ccae879d21fbea1d6724ac785e8c3bfc762137959b5802826ef3"
-
 [[package]]
 name = "untrusted"
 version = "0.9.0"

{synx_format-3.7.1 → synx_format-3.7.2}/Cargo.toml

@@ -7,7 +7,7 @@ exclude = [
 ]
 
 [workspace.package]
-version = "3.7.1"
+version = "3.7.2"
 edition = "2021"
 license = "MIT"
 

{synx_format-3.7.1 → synx_format-3.7.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: synx-format
-Version: 3.7.1
+Version: 3.7.2
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Rust
 Classifier: License :: OSI Approved :: MIT License

{synx_format-3.7.1 → synx_format-3.7.2}/bindings/python/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "synx-python"
-version = "3.7.1"
+version = "3.7.2"
 edition = "2021"
 authors = ["APERTURESyndicate <support@aperturesyndicate.com>"]
 description = "SYNX Python native module via PyO3"
@@ -22,5 +22,9 @@ synx-core = { path = "../../crates/synx-core", features = ["serde", "wasm"] }
 # Windows linker needs a python3x.lib, and without this feature maturin stops
 # with "compiling for Windows without an interpreter requires PyO3's
 # generate-import-lib feature" — which is what failed the 3.7.0 run.
-pyo3 = { version = "0.24", features = ["generate-import-lib"] }
+#
+# 0.29 is the first line that knows CPython 3.14; 0.24 refused to build against
+# it at all, and the `PYO3_USE_ABI3_FORWARD_COMPATIBILITY` escape hatch that
+# worked around that is no longer needed.
+pyo3 = { version = "0.29", features = ["generate-import-lib"] }
 serde_json = "1"

{synx_format-3.7.1 → synx_format-3.7.2}/bindings/python/src/lib.rs

@@ -2,6 +2,7 @@
 //! SYNXL ("SYNX Lines") lives in [`synxl`].
 
 use pyo3::prelude::*;
+use pyo3::exceptions::{PyTypeError, PyValueError};
 use pyo3::types::{PyDict, PyList};
 use synx_core::{self, Value, Mode, Options};
 
@@ -33,7 +34,7 @@ fn encode_hex(bytes: &[u8]) -> String {
 }
 
 /// Convert synx_core::Value to a Python object.
-fn value_to_py(py: Python<'_>, val: &Value) -> PyObject {
+fn value_to_py(py: Python<'_>, val: &Value) -> Py<PyAny> {
     match val {
         Value::Null => py.None(),
         Value::Bool(b) => b.into_pyobject(py).unwrap().to_owned().into_any().unbind(),
@@ -42,7 +43,7 @@ fn value_to_py(py: Python<'_>, val: &Value) -> PyObject {
         Value::String(s) => s.into_pyobject(py).unwrap().into_any().unbind(),
         Value::Secret(_) => "[SECRET]".into_pyobject(py).unwrap().into_any().unbind(),
         Value::Array(arr) => {
-            let items: Vec<PyObject> = arr.iter().map(|v| value_to_py(py, v)).collect();
+            let items: Vec<Py<PyAny>> = arr.iter().map(|v| value_to_py(py, v)).collect();
             let list = PyList::new(py, &items).unwrap();
             list.into_pyobject(py).unwrap().into_any().unbind()
         }
@@ -56,39 +57,83 @@ fn value_to_py(py: Python<'_>, val: &Value) -> PyObject {
     }
 }
 
+/// Nesting depth accepted when converting a Python value.
+///
+/// Matched to the SYNX parser's own cap, so anything this crate can *parse*
+/// can also be converted back. Past it the conversion errors out instead of
+/// recursing: `py_to_value` walks the object graph, and Python containers can
+/// be arbitrarily deep or outright cyclic (`x["self"] = x`), neither of which
+/// the caller can catch once the native stack is gone.
+const MAX_PY_VALUE_DEPTH: usize = 128;
+
 /// Convert a Python object back to synx_core::Value.
 fn py_to_value(py: Python<'_>, obj: &Bound<'_, PyAny>) -> PyResult<Value> {
+    py_to_value_at(py, obj, 0)
+}
+
+fn py_to_value_at(py: Python<'_>, obj: &Bound<'_, PyAny>, depth: usize) -> PyResult<Value> {
+    if depth > MAX_PY_VALUE_DEPTH {
+        // A cycle reaches this too: it has no bottom, so it hits the cap. The
+        // alternative is a stack overflow, which on Windows kills the process
+        // outright — no traceback, nothing for `except` to catch.
+        return Err(PyValueError::new_err(format!(
+            "value nests deeper than {} levels, or contains a reference cycle",
+            MAX_PY_VALUE_DEPTH
+        )));
+    }
     if obj.is_none() {
         Ok(Value::Null)
     } else if let Ok(b) = obj.extract::<bool>() {
         Ok(Value::Bool(b))
     } else if let Ok(n) = obj.extract::<i64>() {
         Ok(Value::Int(n))
+    } else if obj.is_instance_of::<pyo3::types::PyInt>() {
+        // A Python int that did not fit i64. Falling through to `f64` would
+        // round it — a 20-digit id becomes a different id — and then to the
+        // catch-all, which would turn it into a string. Neither is a number
+        // the caller wrote, so this is refused instead.
+        Err(PyValueError::new_err(
+            "integer is outside the i64 range SYNX can represent",
+        ))
     } else if let Ok(f) = obj.extract::<f64>() {
         Ok(Value::Float(f))
     } else if let Ok(s) = obj.extract::<String>() {
         Ok(Value::String(s))
-    } else if let Ok(list) = obj.downcast::<PyList>() {
+    } else if let Ok(list) = obj.cast::<PyList>() {
         let mut arr = Vec::new();
         for item in list.iter() {
-            arr.push(py_to_value(py, &item)?);
+            arr.push(py_to_value_at(py, &item, depth + 1)?);
+        }
+        Ok(Value::Array(arr))
+    } else if let Ok(tuple) = obj.cast::<pyo3::types::PyTuple>() {
+        // A tuple is a sequence, so it maps to an array. The catch-all below
+        // would have stringified it to `(1, 2, 3)`.
+        let mut arr = Vec::new();
+        for item in tuple.iter() {
+            arr.push(py_to_value_at(py, &item, depth + 1)?);
         }
         Ok(Value::Array(arr))
-    } else if let Ok(dict) = obj.downcast::<PyDict>() {
+    } else if let Ok(dict) = obj.cast::<PyDict>() {
         let mut map = std::collections::HashMap::new();
         for (k, v) in dict.iter() {
             let key: String = k.extract()?;
-            map.insert(key, py_to_value(py, &v)?);
+            map.insert(key, py_to_value_at(py, &v, depth + 1)?);
         }
         Ok(Value::Object(map))
     } else {
-        Ok(Value::String(format!("{}", obj)))
+        // Anything else has no SYNX representation. `str(obj)` used to stand in
+        // for one, which silently turned a `set`, a `bytes` or a custom class
+        // into its repr and wrote that to disk as if it were data.
+        Err(PyTypeError::new_err(format!(
+            "cannot convert {} to a SYNX value; pass a str, int, float, bool, None, list, tuple or dict",
+            obj.get_type().name()?
+        )))
     }
 }
 
 /// Parse a SYNX string and return a Python dict.
 #[pyfunction]
-fn parse(py: Python<'_>, text: &str) -> PyResult<PyObject> {
+fn parse(py: Python<'_>, text: &str) -> PyResult<Py<PyAny>> {
     let result = synx_core::parse(text);
     Ok(value_to_py(py, &result.root))
 }
@@ -193,7 +238,7 @@ fn parse_active(
     text: &str,
     env: Option<std::collections::HashMap<String, String>>,
     base_path: Option<String>,
-) -> PyResult<PyObject> {
+) -> PyResult<Py<PyAny>> {
     let mut result = synx_core::parse(text);
     if result.mode == Mode::Active {
         let mut opts = Options::default();
@@ -218,7 +263,7 @@ fn parse_tool(
     text: &str,
     env: Option<std::collections::HashMap<String, String>>,
     base_path: Option<String>,
-) -> PyResult<PyObject> {
+) -> PyResult<Py<PyAny>> {
     let mut result = synx_core::parse(text);
     if result.mode == Mode::Active {
         let mut opts = Options::default();
@@ -285,7 +330,7 @@ fn to_prompt_block(text: &str, label: &str) -> PyResult<String> {
 /// Structural diff between two parsed SYNX dicts.
 /// Returns `{ "added": {...}, "removed": {...}, "changed": {...}, "unchanged": [...] }`.
 #[pyfunction]
-fn diff(py: Python<'_>, a: &Bound<'_, PyAny>, b: &Bound<'_, PyAny>) -> PyResult<PyObject> {
+fn diff(py: Python<'_>, a: &Bound<'_, PyAny>, b: &Bound<'_, PyAny>) -> PyResult<Py<PyAny>> {
     let val_a = py_to_value(py, a)?;
     let val_b = py_to_value(py, b)?;
     let map_a = match val_a { Value::Object(m) => m, _ => std::collections::HashMap::new() };
@@ -307,7 +352,7 @@ fn diff_json(text_a: &str, text_b: &str) -> PyResult<String> {
 
 /// Load and parse a .synx file. Returns a Python dict.
 #[pyfunction]
-fn load(py: Python<'_>, file_path: &str) -> PyResult<PyObject> {
+fn load(py: Python<'_>, file_path: &str) -> PyResult<Py<PyAny>> {
     let text = std::fs::read_to_string(file_path)
         .map_err(|e| PyErr::new::<pyo3::exceptions::PyIOError, _>(e.to_string()))?;
     let map = synx_core::Synx::parse(&text);
@@ -317,7 +362,7 @@ fn load(py: Python<'_>, file_path: &str) -> PyResult<PyObject> {
 /// Load, parse and resolve a .synx file with !active engine. Returns a Python dict.
 #[pyfunction]
 #[pyo3(signature = (file_path, base_path=None))]
-fn load_active(py: Python<'_>, file_path: &str, base_path: Option<&str>) -> PyResult<PyObject> {
+fn load_active(py: Python<'_>, file_path: &str, base_path: Option<&str>) -> PyResult<Py<PyAny>> {
     let text = std::fs::read_to_string(file_path)
         .map_err(|e| PyErr::new::<pyo3::exceptions::PyIOError, _>(e.to_string()))?;
     let mut opts = synx_core::Options::default();