ziex 0.1.0-dev.526 → 0.1.0-dev.547

package/index.js

@@ -1,7 +1,7 @@
 // src/index.ts
 var zx = {
   name: "zx",
-  version: "0.1.0-dev.526",
+  version: "0.1.0-dev.547",
   description: "ZX is a framework for building web applications with Zig.",
   repository: "https://github.com/nurulhudaapon/zx",
   fingerprint: 14616285862371232000,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ziex",
-  "version": "0.1.0-dev.526",
+  "version": "0.1.0-dev.547",
   "description": "ZX is a framework for building web applications with Zig.",
   "main": "index.js",
   "type": "module",

package/react/dom.d.ts

@@ -127,8 +127,8 @@ export type DiscoveredComponent = {
  * Finds all React component markers in the DOM and returns their metadata.
  *
  * This is a DOM-first approach that:
- * 1. Walks the DOM once to find all `<!--$id-->` markers
- * 2. Reads metadata from companion `<script data-zx="id">` elements
+ * 1. Walks the DOM to find all `<!--$id name props-->` comment markers
+ * 2. Extracts name and props directly from the comment content (JSON-encoded)
  * 3. Creates containers for React to render into
  *
  * @returns Array of discovered components with their containers and props

package/react/index.js

@@ -1,15 +1,28 @@
 // src/react/dom.ts
 function findCommentMarker(id) {
-  const startMarker = `$${id}`;
+  const startPrefix = `$${id} `;
   const endMarker = `/$${id}`;
   const walker = document.createTreeWalker(document.body, NodeFilter.SHOW_COMMENT, null);
   let startComment = null;
   let endComment = null;
+  let name = "";
+  let props = {};
   let node;
   while (node = walker.nextNode()) {
     const text = node.textContent?.trim() || "";
-    if (text === startMarker) {
+    if (text.startsWith(startPrefix)) {
       startComment = node;
+      const content = text.slice(startPrefix.length);
+      const jsonStart = content.indexOf("{");
+      if (jsonStart !== -1) {
+        name = content.slice(0, jsonStart).trim();
+        const jsonStr = content.slice(jsonStart);
+        try {
+          props = JSON.parse(jsonStr);
+        } catch {}
+      } else {
+        name = content.trim();
+      }
     }
     if (text === endMarker) {
       endComment = node;
@@ -17,20 +30,10 @@ function findCommentMarker(id) {
     }
   }
   if (startComment && endComment) {
-    return { startComment, endComment };
+    return { startComment, endComment, name, props };
   }
   return null;
 }
-function getComponentMetadata(id) {
-  const script = document.querySelector(`script[data-zx="${id}"]`);
-  if (script?.textContent) {
-    try {
-      const data = JSON.parse(script.textContent);
-      return { name: data.name || "", props: data.props || {} };
-    } catch {}
-  }
-  return { name: "", props: {} };
-}
 function createContainerBetweenMarkers(startComment, endComment) {
   const container = document.createElement("div");
   container.style.display = "contents";
@@ -48,8 +51,7 @@ async function prepareComponent(component) {
   if (!marker) {
     throw new Error(`Comment marker for ${component.id} not found`, { cause: component });
   }
-  const metadata = getComponentMetadata(component.id);
-  const props = metadata.props;
+  const props = marker.props;
   const domNode = createContainerBetweenMarkers(marker.startComment, marker.endComment);
   const Component = await component.import();
   return { domNode, props, Component };
@@ -60,25 +62,47 @@ function filterComponents(components) {
 }
 function discoverComponents() {
   const components = [];
-  const scripts = Array.from(document.querySelectorAll("script[data-zx]"));
-  for (const script of scripts) {
-    const id = script.getAttribute("data-zx");
-    if (!id)
-      continue;
-    let name = "";
-    let props = {};
-    try {
-      const data = JSON.parse(script.textContent || "{}");
-      name = data.name || "";
-      props = data.props || {};
-    } catch {
-      continue;
+  const walker = document.createTreeWalker(document.body, NodeFilter.SHOW_COMMENT, null);
+  const markers = [];
+  let node;
+  while (node = walker.nextNode()) {
+    const text = node.textContent?.trim() || "";
+    if (text.startsWith("$") && !text.startsWith("/$")) {
+      const spaceIdx = text.indexOf(" ");
+      if (spaceIdx !== -1) {
+        const id = text.slice(1, spaceIdx);
+        const content = text.slice(spaceIdx + 1);
+        const jsonStart = content.indexOf("{");
+        let name = "";
+        let props = {};
+        if (jsonStart !== -1) {
+          name = content.slice(0, jsonStart).trim();
+          try {
+            props = JSON.parse(content.slice(jsonStart));
+          } catch {}
+        } else {
+          name = content.trim();
+        }
+        markers.push({ id, name, props, startComment: node, endComment: null });
+      }
+    } else if (text.startsWith("/$")) {
+      const id = text.slice(2);
+      const marker = markers.find((m) => m.id === id && !m.endComment);
+      if (marker) {
+        marker.endComment = node;
+      }
     }
-    const marker = findCommentMarker(id);
-    if (!marker)
+  }
+  for (const marker of markers) {
+    if (!marker.endComment)
       continue;
     const container = createContainerBetweenMarkers(marker.startComment, marker.endComment);
-    components.push({ id, name, props, container });
+    components.push({
+      id: marker.id,
+      name: marker.name,
+      props: marker.props,
+      container
+    });
   }
   return components;
 }

package/wasm/index.d.ts

@@ -18,8 +18,11 @@ export declare function storeValueGetRef(val: any): bigint;
 export declare class ZxBridge {
     #private;
     constructor(exports: WebAssembly.Exports);
-    /** Fetch a URL and callback with the response */
-    fetch(urlPtr: number, urlLen: number, callbackId: bigint): void;
+    /**
+     * Async fetch with full options support.
+     * Calls __zx_fetch_complete when done.
+     */
+    fetchAsync(urlPtr: number, urlLen: number, methodPtr: number, methodLen: number, headersPtr: number, headersLen: number, bodyPtr: number, bodyLen: number, timeoutMs: number, fetchId: bigint): void;
     /** Set a timeout and callback when it fires */
     setTimeout(callbackId: bigint, delayMs: number): void;
     /** Set an interval and callback each time it fires */

package/wasm/index.js

@@ -189,10 +189,13 @@ function readString(ptr, len) {
   const memory = new Uint8Array(jsz.memory.buffer);
   return new TextDecoder().decode(memory.slice(ptr, ptr + len));
 }
+function writeBytes(ptr, data) {
+  const memory = new Uint8Array(jsz.memory.buffer);
+  memory.set(data, ptr);
+}
 
 class ZxBridge {
   #exports;
-  #nextCallbackId = BigInt(1);
   #intervals = new Map;
   constructor(exports) {
     this.#exports = exports;
@@ -200,8 +203,8 @@ class ZxBridge {
   get #handler() {
     return this.#exports.__zx_cb;
   }
-  #getNextId() {
-    return this.#nextCallbackId++;
+  get #fetchCompleteHandler() {
+    return this.#exports.__zx_fetch_complete;
   }
   #invoke(type, id, data) {
     const handler = this.#handler;
@@ -212,14 +215,62 @@ class ZxBridge {
     const dataRef = storeValueGetRef(data);
     handler(type, id, dataRef);
   }
-  fetch(urlPtr, urlLen, callbackId) {
+  fetchAsync(urlPtr, urlLen, methodPtr, methodLen, headersPtr, headersLen, bodyPtr, bodyLen, timeoutMs, fetchId) {
     const url = readString(urlPtr, urlLen);
-    fetch(url).then((response) => response.text()).then((text) => {
-      this.#invoke(CallbackType.FetchSuccess, callbackId, text);
+    const method = methodLen > 0 ? readString(methodPtr, methodLen) : "GET";
+    const headersJson = headersLen > 0 ? readString(headersPtr, headersLen) : "{}";
+    const body = bodyLen > 0 ? readString(bodyPtr, bodyLen) : undefined;
+    let headers = {};
+    try {
+      headers = JSON.parse(headersJson);
+    } catch {
+      for (const line of headersJson.split(`
+`)) {
+        const colonIdx = line.indexOf(":");
+        if (colonIdx > 0) {
+          headers[line.slice(0, colonIdx)] = line.slice(colonIdx + 1);
+        }
+      }
+    }
+    const controller = new AbortController;
+    const timeout = timeoutMs > 0 ? setTimeout(() => controller.abort(), timeoutMs) : null;
+    const fetchOptions = {
+      method,
+      headers: Object.keys(headers).length > 0 ? headers : undefined,
+      body: method !== "GET" && method !== "HEAD" ? body : undefined,
+      signal: controller.signal
+    };
+    fetch(url, fetchOptions).then(async (response) => {
+      if (timeout)
+        clearTimeout(timeout);
+      const text = await response.text();
+      this.#notifyFetchComplete(fetchId, response.status, text, false);
     }).catch((error) => {
-      this.#invoke(CallbackType.FetchError, callbackId, error.message ?? "Fetch failed");
+      if (timeout)
+        clearTimeout(timeout);
+      const isAbort = error.name === "AbortError";
+      const errorMsg = isAbort ? "Request timeout" : error.message ?? "Fetch failed";
+      this.#notifyFetchComplete(fetchId, 0, errorMsg, true);
     });
   }
+  #notifyFetchComplete(fetchId, statusCode, body, isError) {
+    const handler = this.#fetchCompleteHandler;
+    if (!handler) {
+      console.warn("__zx_fetch_complete not exported from WASM");
+      return;
+    }
+    const encoded = new TextEncoder().encode(body);
+    const allocFn = this.#exports.__zx_alloc;
+    let ptr = 0;
+    if (allocFn) {
+      ptr = allocFn(encoded.length);
+    } else {
+      const heapBase = this.#exports.__heap_base?.value ?? 65536;
+      ptr = heapBase + Number(fetchId % BigInt(256)) * 65536;
+    }
+    writeBytes(ptr, encoded);
+    handler(fetchId, statusCode, ptr, encoded.length, isError ? 1 : 0);
+  }
   setTimeout(callbackId, delayMs) {
     setTimeout(() => {
       this.#invoke(CallbackType.Timeout, callbackId, null);
@@ -248,8 +299,8 @@ class ZxBridge {
     return {
       ...jsz.importObject(),
       __zx: {
-        _fetch: (urlPtr, urlLen, callbackId) => {
-          bridgeRef.current?.fetch(urlPtr, urlLen, callbackId);
+        _fetchAsync: (urlPtr, urlLen, methodPtr, methodLen, headersPtr, headersLen, bodyPtr, bodyLen, timeoutMs, fetchId) => {
+          bridgeRef.current?.fetchAsync(urlPtr, urlLen, methodPtr, methodLen, headersPtr, headersLen, bodyPtr, bodyLen, timeoutMs, fetchId);
         },
         _setTimeout: (callbackId, delayMs) => {
           bridgeRef.current?.setTimeout(callbackId, delayMs);

package/wasm/init.js

@@ -189,10 +189,13 @@ function readString(ptr, len) {
   const memory = new Uint8Array(jsz.memory.buffer);
   return new TextDecoder().decode(memory.slice(ptr, ptr + len));
 }
+function writeBytes(ptr, data) {
+  const memory = new Uint8Array(jsz.memory.buffer);
+  memory.set(data, ptr);
+}
 
 class ZxBridge {
   #exports;
-  #nextCallbackId = BigInt(1);
   #intervals = new Map;
   constructor(exports) {
     this.#exports = exports;
@@ -200,8 +203,8 @@ class ZxBridge {
   get #handler() {
     return this.#exports.__zx_cb;
   }
-  #getNextId() {
-    return this.#nextCallbackId++;
+  get #fetchCompleteHandler() {
+    return this.#exports.__zx_fetch_complete;
   }
   #invoke(type, id, data) {
     const handler = this.#handler;
@@ -212,14 +215,62 @@ class ZxBridge {
     const dataRef = storeValueGetRef(data);
     handler(type, id, dataRef);
   }
-  fetch(urlPtr, urlLen, callbackId) {
+  fetchAsync(urlPtr, urlLen, methodPtr, methodLen, headersPtr, headersLen, bodyPtr, bodyLen, timeoutMs, fetchId) {
     const url = readString(urlPtr, urlLen);
-    fetch(url).then((response) => response.text()).then((text) => {
-      this.#invoke(CallbackType.FetchSuccess, callbackId, text);
+    const method = methodLen > 0 ? readString(methodPtr, methodLen) : "GET";
+    const headersJson = headersLen > 0 ? readString(headersPtr, headersLen) : "{}";
+    const body = bodyLen > 0 ? readString(bodyPtr, bodyLen) : undefined;
+    let headers = {};
+    try {
+      headers = JSON.parse(headersJson);
+    } catch {
+      for (const line of headersJson.split(`
+`)) {
+        const colonIdx = line.indexOf(":");
+        if (colonIdx > 0) {
+          headers[line.slice(0, colonIdx)] = line.slice(colonIdx + 1);
+        }
+      }
+    }
+    const controller = new AbortController;
+    const timeout = timeoutMs > 0 ? setTimeout(() => controller.abort(), timeoutMs) : null;
+    const fetchOptions = {
+      method,
+      headers: Object.keys(headers).length > 0 ? headers : undefined,
+      body: method !== "GET" && method !== "HEAD" ? body : undefined,
+      signal: controller.signal
+    };
+    fetch(url, fetchOptions).then(async (response) => {
+      if (timeout)
+        clearTimeout(timeout);
+      const text = await response.text();
+      this.#notifyFetchComplete(fetchId, response.status, text, false);
     }).catch((error) => {
-      this.#invoke(CallbackType.FetchError, callbackId, error.message ?? "Fetch failed");
+      if (timeout)
+        clearTimeout(timeout);
+      const isAbort = error.name === "AbortError";
+      const errorMsg = isAbort ? "Request timeout" : error.message ?? "Fetch failed";
+      this.#notifyFetchComplete(fetchId, 0, errorMsg, true);
     });
   }
+  #notifyFetchComplete(fetchId, statusCode, body, isError) {
+    const handler = this.#fetchCompleteHandler;
+    if (!handler) {
+      console.warn("__zx_fetch_complete not exported from WASM");
+      return;
+    }
+    const encoded = new TextEncoder().encode(body);
+    const allocFn = this.#exports.__zx_alloc;
+    let ptr = 0;
+    if (allocFn) {
+      ptr = allocFn(encoded.length);
+    } else {
+      const heapBase = this.#exports.__heap_base?.value ?? 65536;
+      ptr = heapBase + Number(fetchId % BigInt(256)) * 65536;
+    }
+    writeBytes(ptr, encoded);
+    handler(fetchId, statusCode, ptr, encoded.length, isError ? 1 : 0);
+  }
   setTimeout(callbackId, delayMs) {
     setTimeout(() => {
       this.#invoke(CallbackType.Timeout, callbackId, null);
@@ -248,8 +299,8 @@ class ZxBridge {
     return {
       ...jsz.importObject(),
       __zx: {
-        _fetch: (urlPtr, urlLen, callbackId) => {
-          bridgeRef.current?.fetch(urlPtr, urlLen, callbackId);
+        _fetchAsync: (urlPtr, urlLen, methodPtr, methodLen, headersPtr, headersLen, bodyPtr, bodyLen, timeoutMs, fetchId) => {
+          bridgeRef.current?.fetchAsync(urlPtr, urlLen, methodPtr, methodLen, headersPtr, headersLen, bodyPtr, bodyLen, timeoutMs, fetchId);
         },
         _setTimeout: (callbackId, delayMs) => {
           bridgeRef.current?.setTimeout(callbackId, delayMs);