[fix wasm sampling] no more u64 (#34)

ostrowr · web-flow · commit 33d40cc7f8db · 2025-07-03T22:05:20.000-07:00
* no more u64

* fix python local dev
diff --git a/Justfile b/Justfile
@@ -13,11 +13,7 @@ check:
 # ---- Basic python smoke test ----
 
 python-demo:
-  @command -v maturin >/dev/null 2>&1 || (echo "error: maturin not found (install with 'pip install maturin' or 'cargo install maturin --locked')" >&2 && exit 1)
-  @echo "[just] building Python extension via maturin …"
-  maturin develop -q -m python/Cargo.toml
-  @echo "[just] running Python demo …"
-  @python examples/python/basic/demo.py
+  uv run --reinstall-package jsoncompat examples/python/basic/demo.py
 
 # ---- Basic javascript smoke test ----
 
diff --git a/examples/python/basic/demo.py b/examples/python/basic/demo.py
@@ -1,8 +1,8 @@
 # /// script
 # requires-python = ">=3.12"
-# dependencies = [
-#     "jsoncompat==0.1.8a9",
-# ]
+# dependencies = ["jsoncompat"]
+# [tool.uv.sources]
+# jsoncompat = { path = "../../../python", editable = true }
 # ///
 """End-to-end demo for the Python bindings of jsoncompat.
 
@@ -17,8 +17,21 @@
 
 
 def main() -> None:
-    old_schema = '{"type": "string"}'
-    new_schema = '{"type": "number"}'
+    new_schema = """{
+  "type": "object",
+  "properties": {
+    "name": { "type": "string", "minLength": 5 },
+    "age": { "type": "integer", "minimum": 18 }
+  },
+  "required": ["name"]
+}"""
+    old_schema = """{
+  "type": "object",
+  "properties": {
+    "name": { "type": "string", "minLength": 5 },
+    "age": { "type": "integer", "minimum": 18 }
+  }
+}"""
 
     print("=== Compatibility checks ===")
     roles: list[jsc.RoleLiteral] = [
diff --git a/examples/wasm/demo.html b/examples/wasm/demo.html
@@ -10,28 +10,40 @@
   </head>
   <body>
     <h1>json_schema_wasm - browser demo</h1>
-    <pre id="out">initialising …</pre>
+    <pre id="out">initializing …</pre>
 
     <script type="module">
       // The Wasm package is built into `pkg/` by `just wasm-demo` with
       //   wasm-pack build wasm --target web --out-dir examples/wasm/pkg
-import init, { check_compat, generate_value } from "../../wasm/pkg/jsoncompat_wasm.js";
+      import init, { check_compat, generate_value } from "../../wasm/pkg/jsoncompat_wasm.js";
 
       const out = document.getElementById('out');
 
       (async () => {
         await init();
+        const oldSchema = `{
+  "type": "object",
+  "properties": {
+    "name": { "type": "string" },
+    "age": { "type": "integer", "minimum": 18 }
+  },
+  "required": ["name"]
+}`;
+        const newSchema = `{
+  "type": "object",
+  "properties": {
+    "name": { "type": "string", "minLength": 5 },
+    "age": { "type": "integer", "minimum": 18 }
+  }
+}`;
 
-        const oldSchema = '{"type":"string"}';
-        const newSchema = '{"type":"number"}';
 
         const lines = [];
         lines.push('=== Compatibility checks ===');
         for (const role of ['serializer','deserializer','both']) {
           const ok = await check_compat(oldSchema, newSchema, role);
           lines.push(`${role.padEnd(12)}: ${ok}`);
         }
-
         lines.push('\n=== Example value generation ===');
         const sample = await generate_value(oldSchema, 3);
         lines.push(sample);
diff --git a/fuzz/src/lib.rs b/fuzz/src/lib.rs
@@ -342,8 +342,8 @@ pub fn generate_value(schema: &SchemaNode, rng: &mut impl Rng, depth: u8) -> Val
             }
 
             // Determine the desired object size bounds if specified.
-            let min_p: usize = min_properties.unwrap_or(0).try_into().unwrap();
-            let max_p: usize = max_properties.unwrap_or(u64::MAX).try_into().unwrap();
+            let min_p: usize = min_properties.unwrap_or(0);
+            let max_p: usize = max_properties.unwrap_or(usize::MAX);
 
             // Random extra properties if allowed and we have not reached min_properties.
 
diff --git a/python/Cargo.toml b/python/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2021"
 publish = false # This crate is not published to crates.io; only PyPI.
 
 [lib]
-name = "jsoncompat_py"
+name = "jsoncompat"
 crate-type = ["cdylib"]
 
 [dependencies]
diff --git a/schema/src/ast.rs b/schema/src/ast.rs
@@ -50,8 +50,8 @@ pub enum SchemaNode {
         additional: Box<SchemaNode>,
 
         // Validation keywords for objects
-        min_properties: Option<u64>,
-        max_properties: Option<u64>,
+        min_properties: Option<usize>,
+        max_properties: Option<usize>,
         dependent_required: std::collections::HashMap<String, Vec<String>>,
 
         enumeration: Option<Vec<Value>>,
@@ -809,8 +809,12 @@ fn parse_object_schema(obj: &serde_json::Map<String, Value>) -> Result<SchemaNod
         })
         .unwrap_or_default();
 
-    let min_properties = obj.get("minProperties").and_then(|v| v.as_u64());
-    let max_properties = obj.get("maxProperties").and_then(|v| v.as_u64());
+    let min_properties = obj
+        .get("minProperties")
+        .and_then(|v| v.as_u64().and_then(|n| usize::try_from(n).ok()));
+    let max_properties = obj
+        .get("maxProperties")
+        .and_then(|v| v.as_u64().and_then(|n| usize::try_from(n).ok()));
 
     Ok(SchemaNode::Object {
         properties,
diff --git a/web/jsoncompatdotcom/src/routes/fuzzer.tsx b/web/jsoncompatdotcom/src/routes/fuzzer.tsx
@@ -5,12 +5,21 @@ import wasmUrl from "jsoncompat/jsoncompat_wasm_bg.wasm?url";
 import { useState } from "react";
 import init, { generate_value } from "jsoncompat";
 
+const DEFAULT_SCHEMA = `{
+  "type": "object",
+  "properties": {
+    "name": { "type": "string" },
+    "age": { "type": "integer", "minimum": 18 }
+  },
+  "required": ["name"]
+}`;
+
 export const Route = createFileRoute("/fuzzer")({
   component: FuzzerPage,
 });
 
 function FuzzerPage() {
-  const [schema, setSchema] = useState('{\n  "type": "string"\n}');
+  const [schema, setSchema] = useState(DEFAULT_SCHEMA);
   const [depth, setDepth] = useState(5);
   const [examples, setExamples] = useState<string[]>([]);
   const [numExamples, setNumExamples] = useState(5);

Original file line number	Diff line number	Diff line change
`@@ -342,8 +342,8 @@ pub fn generate_value(schema: &SchemaNode, rng: &mut impl Rng, depth: u8) -> Val`
`342`	`342`	`}`
`343`	`343`
`344`	`344`	`// Determine the desired object size bounds if specified.`
`345`		`- let min_p: usize = min_properties.unwrap_or(0).try_into().unwrap();`
`346`		`- let max_p: usize = max_properties.unwrap_or(u64::MAX).try_into().unwrap();`
	`345`	`+ let min_p: usize = min_properties.unwrap_or(0);`
	`346`	`+ let max_p: usize = max_properties.unwrap_or(usize::MAX);`
`347`	`347`
`348`	`348`	`// Random extra properties if allowed and we have not reached min_properties.`
`349`	`349`