spaday 0.2.0__tar.gz → 0.2.2__tar.gz

{spaday-0.2.0 → spaday-0.2.2}/Cargo.lock

@@ -84,9 +84,9 @@ checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66"
 
 [[package]]
 name = "memchr"
-version = "2.8.2"
+version = "2.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88904434abc2901f197fe8cc55f0445e7ded921dba5911dad2e2b39b48e663c4"
+checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98"
 
 [[package]]
 name = "num-traits"
@@ -184,9 +184,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.45"
+version = "1.0.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924"
+checksum = "dfbc457d0c7a0759a614551b11a6409e5951f6c7537be1f1b7682b9ae9230368"
 dependencies = [
  "proc-macro2",
 ]
@@ -212,9 +212,9 @@ dependencies = [
 
 [[package]]
 name = "rustversion"
-version = "1.0.22"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
+checksum = "cf54715a573b99ac80df0bc206da022bcd442c974952c7b9720069370852e21f"
 
 [[package]]
 name = "serde"
@@ -278,7 +278,7 @@ checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5"
 
 [[package]]
 name = "spaday"
-version = "0.2.0"
+version = "0.2.2"
 dependencies = [
  "serde",
  "serde_json",
@@ -287,7 +287,7 @@ dependencies = [
 
 [[package]]
 name = "spaday_js"
-version = "0.2.0"
+version = "0.2.2"
 dependencies = [
  "js-sys",
  "serde",
@@ -298,7 +298,7 @@ dependencies = [
 
 [[package]]
 name = "spaday_py"
-version = "0.2.0"
+version = "0.2.2"
 dependencies = [
  "pyo3",
  "spaday",

{spaday-0.2.0 → spaday-0.2.2}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "spaday_py"
-version = "0.2.0"
+version = "0.2.2"
 edition = "2021"
 publish = false
 

{spaday-0.2.0 → spaday-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: spaday
-Version: 0.2.0
+Version: 0.2.2
 Summary: Build reactive web-component UIs configured in Python, executed in the browser
 Project-URL: Repository, https://github.com/1kbgz/spaday
 Project-URL: Homepage, https://github.com/1kbgz/spaday
@@ -10,7 +10,6 @@ License-File: LICENSE
 Classifier: Development Status :: 3 - Alpha
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13

{spaday-0.2.0 → spaday-0.2.2}/js/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "spaday_js"
-version = "0.2.0"
+version = "0.2.2"
 edition = "2021"
 publish = false
 keywords = ["experimental"]

{spaday-0.2.0 → spaday-0.2.2}/js/build.mjs

@@ -108,6 +108,14 @@ async function build() {
       !file.relativePath.startsWith("esm/") &&
       !file.relativePath.startsWith("dist/esm/"),
   });
+  await cpy(
+    "node_modules/@1kbgz/transports/dist/cdn/index.js*",
+    "../spaday/extension/transports/cdn",
+  );
+  await cpy(
+    "node_modules/@1kbgz/transports/dist/pkg/*",
+    "../spaday/extension/transports/pkg",
+  );
 }
 
 build();

{spaday-0.2.0 → spaday-0.2.2}/js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spaday",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "",
   "repository": "git@github.com:1kbgz/spaday.git",
   "author": "1kbgz <dev@1kbgz.com>",

{spaday-0.2.0 → spaday-0.2.2}/js/src/rust/lib.rs

@@ -25,7 +25,7 @@ extern "C" {
     #[wasm_bindgen(method, js_name = sendPatch)]
     fn send_patch(this: &Host, model: &str, field: &str, value: JsValue);
     #[wasm_bindgen(method, js_name = callEndpoint)]
-    fn call_endpoint(this: &Host, method: &str, url: &str, body: JsValue, result: Option<&str>);
+    fn call_endpoint(this: &Host, method: &str, url: JsValue, body: JsValue, result: Option<&str>);
     #[wasm_bindgen(method, js_name = callNamed)]
     fn call_named(this: &Host, handler: &str);
 }
@@ -100,15 +100,19 @@ fn run(action: &spaday::Action, host: &Host) {
             body,
             result,
         } => {
+            let u = match url {
+                spaday::EndpointUrl::Static(value) => JsValue::from_str(value),
+                spaday::EndpointUrl::Expr(expr) => eval(expr, host),
+            };
             let b = body.as_ref().map_or(JsValue::UNDEFINED, |e| eval(e, host));
-            host.call_endpoint(method, url, b, result.as_deref());
+            host.call_endpoint(method, u, b, result.as_deref());
         }
         NamedJs { handler } => host.call_named(handler),
     }
 }
 
 fn eval(expr: &spaday::Expr, host: &Host) -> JsValue {
-    use spaday::Expr::{Event, Field, Lit, Not, Obj, Prop};
+    use spaday::Expr::{Concat, Event, Field, Lit, Not, Obj, Prop};
     match expr {
         // json_compatible: JSON objects become plain JS objects (not Maps), so they round-trip through
         // `JSON.stringify` (e.g. a CallEndpoint body) and set cleanly as props.
@@ -130,6 +134,13 @@ fn eval(expr: &spaday::Expr, host: &Host) -> JsValue {
             }
             obj.into()
         }
+        Concat { parts } => {
+            let values = js_sys::Array::new();
+            for part in parts {
+                values.push(&eval(part, host));
+            }
+            values.join("").into()
+        }
     }
 }
 

{spaday-0.2.0 → spaday-0.2.2}/js/src/ts/actions.ts

@@ -68,11 +68,11 @@ function host(ctx: ActionContext) {
     // UI, e.g. show a 422 validation error); without one it stays fire-and-forget.
     callEndpoint: (
       method: string,
-      url: string,
+      url: unknown,
       body: unknown,
       result?: string,
     ) => {
-      const request = fetch(url, {
+      const request = fetch(String(url), {
         method,
         headers:
           body === undefined

{spaday-0.2.0 → spaday-0.2.2}/js/src/ts/signals.ts

@@ -126,6 +126,10 @@ export function evalExpr(expr: unknown, store: Store): unknown {
         out[k] = evalExpr(v, store);
       return out;
     }
+    case "concat":
+      return (e.parts as unknown[])
+        .map((part) => String(evalExpr(part, store)))
+        .join("");
     default:
       return undefined;
   }

{spaday-0.2.0 → spaday-0.2.2}/js/tests/actions.spec.js

@@ -357,6 +357,43 @@ test("CallEndpoint composes a body from the signal store via field exprs", async
   expect(JSON.parse(seen[0])).toEqual({ symbol: "AAPL", qty: 250 });
 });
 
+test("CallEndpoint composes its URL from signal-store fields", async ({
+  page,
+}) => {
+  const seen = [];
+  await page.route("**/send/basket/*", (route) => {
+    seen.push(new URL(route.request().url()).pathname);
+    return route.fulfill({ status: 200, body: "ok" });
+  });
+  await page.evaluate(() => {
+    const { mount, Store } = window.__spaday;
+    const store = new Store({ key: "B" });
+    const btn = mount(
+      document.body,
+      {
+        tag: "button",
+        events: {
+          click: {
+            kind: "call",
+            method: "POST",
+            url: {
+              expr: "concat",
+              parts: [
+                { expr: "lit", value: "/send/basket/" },
+                { expr: "field", name: "key" },
+              ],
+            },
+          },
+        },
+      },
+      store,
+    );
+    btn.click();
+  });
+  await page.waitForTimeout(150);
+  expect(seen).toEqual(["/send/basket/B"]);
+});
+
 test("SetField writes a store field (a plain button drives reactive state)", async ({
   page,
 }) => {

{spaday-0.2.0 → spaday-0.2.2}/js/tests/signals.spec.js

@@ -234,6 +234,38 @@ test("a cond expr selects between two values by a field, reactively", async ({
   expect(result.after).toBe("dark");
 });
 
+test("a concat expr composes strings from fields reactively", async ({
+  page,
+}) => {
+  const result = await page.evaluate(() => {
+    const { mount, Store } = window.__spaday;
+    const store = new Store({ key: "A" });
+    const root = mount(
+      document.createElement("div"),
+      {
+        tag: "span",
+        bindings: {
+          textContent: {
+            compute: {
+              expr: "concat",
+              parts: [
+                { expr: "lit", value: "Basket " },
+                { expr: "field", name: "key" },
+              ],
+            },
+            mode: "one-way",
+          },
+        },
+      },
+      store,
+    );
+    const initial = root.textContent;
+    store.set("key", "B");
+    return { initial, after: root.textContent };
+  });
+  expect(result).toEqual({ initial: "Basket A", after: "Basket B" });
+});
+
 test("a root-class binding toggles a class on <html> from a field", async ({
   page,
 }) => {

{spaday-0.2.0 → spaday-0.2.2}/pyproject.toml

@@ -14,7 +14,7 @@ authors = [
 description = "Build reactive web-component UIs configured in Python, executed in the browser"
 readme = "README.md"
 license = { text = "Apache-2.0" }
-version = "0.2.0"
+version = "0.2.2"
 requires-python = ">=3.10"
 keywords = []
 
@@ -25,7 +25,6 @@ classifiers = [
     "Programming Language :: Python :: Implementation :: CPython",
     "Programming Language :: Python :: Implementation :: PyPy",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
@@ -79,7 +78,7 @@ Repository = "https://github.com/1kbgz/spaday"
 Homepage = "https://github.com/1kbgz/spaday"
 
 [tool.bumpversion]
-current_version = "0.2.0"
+current_version = "0.2.2"
 commit = true
 tag = false 
 commit_args = "-s"
@@ -115,7 +114,7 @@ search = 'version = "{current_version}"'
 replace = 'version = "{new_version}"'
 
 [tool.cibuildwheel]
-build = "cp310-*"
+build = "cp311-*"
 test-command = "pytest -vvv {project}/spaday/tests"
 test-extras = "develop"
 

{spaday-0.2.0 → spaday-0.2.2}/rust/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "spaday"
-version = "0.2.0"
+version = "0.2.2"
 authors = ["1kbgz <dev@1kbgz.com>"]
 edition = "2021"
 license = "Apache-2.0"