jsql-neo 3.4.6 → 3.4.7

package/lib/wasm_client.js

@@ -7,57 +7,69 @@ function safeJsonParse(str) {
 
 const textEncoder = new TextEncoder();
 
+function utf8Len(s) {
+  let len = 0;
+  for (let i = 0; i < s.length; i++) {
+    const c = s.charCodeAt(i);
+    if (c < 0x80) len++;
+    else if (c < 0x800) len += 2;
+    else if (c < 0xD800 || c > 0xDFFF) len += 3;
+    else { len += 4; i++; }
+  }
+  return len;
+}
+
+function writeUtf8(buf, off, s) {
+  for (let i = 0; i < s.length; i++) {
+    const c = s.charCodeAt(i);
+    if (c < 0x80) { buf[off++] = c; }
+    else if (c < 0x800) { buf[off++] = 0xC0 | (c >> 6); buf[off++] = 0x80 | (c & 0x3F); }
+    else if (c < 0xD800 || c > 0xDFFF) { buf[off++] = 0xE0 | (c >> 12); buf[off++] = 0x80 | ((c >> 6) & 0x3F); buf[off++] = 0x80 | (c & 0x3F); }
+    else { const cp = 0x10000 + ((c & 0x3FF) << 10) + (s.charCodeAt(++i) & 0x3FF); buf[off++] = 0xF0 | (cp >> 18); buf[off++] = 0x80 | ((cp >> 12) & 0x3F); buf[off++] = 0x80 | ((cp >> 6) & 0x3F); buf[off++] = 0x80 | (cp & 0x3F); }
+  }
+  return off;
+}
+
 function encodeBatch(rows) {
   if (rows.length === 0) return new Uint8Array(0);
   const fieldNames = Object.keys(rows[0]);
   const nFields = fieldNames.length;
 
-  const nameBytes = fieldNames.map(n => textEncoder.encode(n));
+  // First pass: compute exact size, no allocations
   let size = 1;
-  for (const nb of nameBytes) size += 1 + nb.length;
+  for (let fi = 0; fi < nFields; fi++) size += 1 + utf8Len(fieldNames[fi]);
   size += 4;
 
-  const strBufs = [];
   for (let ri = 0; ri < rows.length; ri++) {
     const row = rows[ri];
     for (let fi = 0; fi < nFields; fi++) {
       const val = row[fieldNames[fi]];
-      if (val === null || val === undefined) {
-        size += 1;
-        strBufs.push(null);
-      } else if (typeof val === 'number') {
-        size += 9;
-        strBufs.push(null);
-      } else if (typeof val === 'string') {
-        const b = textEncoder.encode(val);
-        strBufs.push(b);
-        size += 1 + 4 + b.length;
-      } else {
-        size += 2;
-        strBufs.push(val ? 1 : 0);
-      }
+      if (val === null || val === undefined) size += 1;
+      else if (typeof val === 'number') size += 9;
+      else if (typeof val === 'string') size += 1 + 4 + utf8Len(val);
+      else size += 2;
     }
   }
 
+  // Second pass: write directly to pre-allocated buffer
   const buf = new Uint8Array(size);
   const dv = new DataView(buf.buffer, 0, size);
   let off = 0;
 
   buf[off++] = nFields;
-  for (const nb of nameBytes) {
-    buf[off++] = nb.length;
-    buf.set(nb, off);
-    off += nb.length;
+  for (let fi = 0; fi < nFields; fi++) {
+    const s = fieldNames[fi];
+    buf[off++] = utf8Len(s);
+    off = writeUtf8(buf, off, s);
   }
 
   dv.setUint32(off, rows.length, true);
   off += 4;
 
-  let si = 0;
-  for (const row of rows) {
+  for (let ri = 0; ri < rows.length; ri++) {
+    const row = rows[ri];
     for (let fi = 0; fi < nFields; fi++) {
       const val = row[fieldNames[fi]];
-      const item = strBufs[si++];
       if (val === null || val === undefined) {
         buf[off++] = 0;
       } else if (typeof val === 'number') {
@@ -72,13 +84,13 @@ function encodeBatch(rows) {
         }
       } else if (typeof val === 'string') {
         buf[off++] = 3;
-        dv.setUint32(off, item.length, true);
+        const strLen = utf8Len(val);
+        dv.setUint32(off, strLen, true);
         off += 4;
-        buf.set(item, off);
-        off += item.length;
+        off = writeUtf8(buf, off, val);
       } else {
         buf[off++] = 4;
-        buf[off++] = item;
+        buf[off++] = val ? 1 : 0;
       }
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "jsql-neo",
-    "version": "3.4.6",
+    "version": "3.4.7",
     "description": "JSQL-NEO — Rust-powered embedded database with WASM, REST API, B-Tree indexes, WAL, crash recovery",
     "main": "index.js",
     "files": [