Merge branch 'codex/fix-browser-null-text' into codex/integration-production-ready

Author: ubugeeei

crates/fastqr_wasm/src/lib.rs

@@ -1,7 +1,7 @@
-use fastqr_core::{EncodeOptions, ErrorCorrectionLevel, QrCode, encode_text};
-use fastqr_image::{DecodeOptions, RenderOptions, decode_rgba, render_to_rgba};
+use fastqr_core::{encode_text, EncodeOptions, ErrorCorrectionLevel, QrCode};
+use fastqr_image::{decode_rgba, render_to_rgba, DecodeOptions, RenderOptions};
 use js_sys::{Object, Reflect, Uint8Array};
-use wasm_bindgen::{Clamped, JsCast, JsValue, prelude::wasm_bindgen};
+use wasm_bindgen::{prelude::wasm_bindgen, Clamped, JsCast, JsValue};
 use web_sys::{CanvasRenderingContext2d, HtmlCanvasElement, HtmlVideoElement, ImageData};
 
 #[wasm_bindgen]
@@ -184,12 +184,12 @@ fn decoded_to_js(decoded: fastqr_core::DecodedQr) -> Result<JsValue, JsValue> {
         &JsValue::from_str("bytes"),
         &Uint8Array::from(decoded.bytes.as_ref()),
     )?;
-    let text = decoded.text.map(String::from).unwrap_or_default();
-    Reflect::set(
-        &object,
-        &JsValue::from_str("text"),
-        &JsValue::from_str(&text),
-    )?;
+    let text = decoded
+        .text
+        .as_deref()
+        .map(JsValue::from_str)
+        .unwrap_or(JsValue::NULL);
+    Reflect::set(&object, &JsValue::from_str("text"), &text)?;
     Ok(object.into())
 }
 

npm/fastqr/browser.d.ts

@@ -3,7 +3,7 @@ export interface BrowserDecodedQr {
   errorCorrection: string;
   mask: number;
   bytes: Uint8Array;
-  text: string;
+  text: string | null;
 }
 
 export interface BrowserQrCode {

npm/fastqr_vue/src/use_fastqr_camera.ts

@@ -115,7 +115,7 @@ export function useFastqrCamera(options: UseFastqrCameraOptions = {}) {
 
     try {
       const decoded = decodeVideoFrame(video.value, scratchCanvas.value);
-      if (decoded.text && decoded.text !== cameraText.value) {
+      if (decoded.text != null && decoded.text !== cameraText.value) {
         cameraText.value = decoded.text;
         cameraLabel.value = `Camera lock: v${decoded.version} / ${decoded.errorCorrection} / mask ${decoded.mask}`;
       }
@@ -143,8 +143,7 @@ function isReady(ready: MaybeRefOrGetter<boolean> | undefined) {
 }
 
 function stopTracks(stream: MediaStream) {
-  const tracks = stream.getTracks();
-  for (let index = 0; index < tracks.length; index += 1) {
-    tracks[index].stop();
+  for (const track of stream.getTracks()) {
+    track.stop();
   }
 }

npm/fastqr_vue/src/use_fastqr_decode.ts

@@ -94,7 +94,7 @@ export function useFastqrDecode(options: UseFastqrDecodeOptions = {}) {
     decodeHex.value = bytesToHex(decoded.bytes);
     decodeLabel.value = label;
     decodeMeta.value = `v${decoded.version} / ${decoded.errorCorrection} / mask ${decoded.mask}`;
-    decodeText.value = decoded.text;
+    decodeText.value = decoded.text ?? "";
   }
 
   return {