@alexgyver/bson 2.1.0 → 2.2.0

package/README.md

@@ -1,7 +1,11 @@
 # bson.js
-Распаковщик бинарного JSON для библиотеки [BSON](https://github.com/GyverLibs/BSON).
+Распаковщик и запаковщик бинарного JSON для библиотеки [BSON](https://github.com/GyverLibs/BSON).
 
-> npm i @alexgyver/bson
+[demo](https://gyverlibs.github.io/bson.js/test/)
+
+> **Browser**: https://gyverlibs.github.io/bson.js/bson.min.js
+
+> **Node**: npm i @alexgyver/bson
 
 ```js
 const codes = [
@@ -10,10 +14,26 @@ const codes = [
     'constants',
 ];
 
-let json;
-const res = await fetch(...);
+let test = {
+    int: 123,
+    float: 3.14,
+    arr: [
+        "str",
+        true,
+        1234,
+        new Uint8Array([1, 2, 3]),
+    ],
+    obj: {
+        str2: "str2",
+        true: true,
+    },
+    str3: "str3",
+    nul: null,
+    [getCode('constants', codes)]: getCode('string', codes),
+    bins: new Uint8Array([1, 2, 3]),
+};
 
-try {
-    json = decodeBson(new Uint8Array(await res.arrayBuffer()), codes);
-} catch (e) { }
+let enc = encodeBson(test);
+let json = decodeBson(enc, codes);
+console.log(json);
 ```

package/bson.js

@@ -1,239 +1,232 @@
-const BS_STRING = (0 << 5);
-const BS_BOOLEAN = (1 << 5);
-const BS_INTEGER = (2 << 5);
-const BS_FLOAT = (3 << 5);
-const BS_CODE = (4 << 5);
-const BS_BINARY = (5 << 5);
-const BS_CONTAINER = (6 << 5);
-const BS_NULL = (7 << 5);
-
-const BS_CONT_OBJ = (1 << 4);
-const BS_CONT_OPEN = (1 << 3);
-const BS_CONT_ARR = (1 << 2);
-const BS_CONT_CLOSE = (1 << 1);
-
-const BS_MAX_LEN = 0b0001111111111111;
-
-const BS_TYPE_MASK = 0b11100000;
-const BS_TYPE = x => x & BS_TYPE_MASK;
-const BS_DATA_MASK = 0b00011111;
-const BS_DATA = x => x & BS_DATA_MASK;
-
-const BS_BOOLV_MASK = 0b1;
-const BS_BOOLV = x => x & BS_BOOLV_MASK;
-
-const BS_NEG_MASK = 0b10000;
-const BS_NEGATIVE = x => x & BS_NEG_MASK;
-const BS_SIZE_MASK = 0b01111;
-const BS_SIZE = x => x & BS_SIZE_MASK;
-
-const BS_FLOAT_SIZE = 4;
-const BS_DEC_MASK = 0b1111;
-const BS_DECIMAL = x => x & BS_DEC_MASK;
-
-const BS_D16_MSB = x => (x >> 8) & BS_DATA_MASK;
-const BS_D16_LSB = x => x & 0xff;
-const BS_D16_MERGE = (msb5, lsb) => ((msb5 << 8) | lsb) >>> 0;
-
-const BS_BIN_PREFIX = "__BSON_BIN_";
-const BS_CODE_PREFIX = "__BSON_CODE_";
-
-/**
- * @param {Uint8Array} b
- * @param {Array} codes
- * @returns {Object}
- */
-export function decodeBson(b, codes = []) {
-    if (!b || !(b instanceof Uint8Array)) return null;
-    if (!b.length) return {};
-
-    let bins = [];
-    let stack = [];
-    let keyf = true;
-    let s = '';
-
-    try {
-        for (let i = 0; i < b.length; i++) {
-            const type = BS_TYPE(b[i]);
-            const data = BS_DATA(b[i]);
-
-            switch (type) {
-
-                case BS_CONTAINER:
-                    if (data & BS_CONT_OPEN) {
-                        let t = (data & BS_CONT_OBJ) ? '{' : '[';
-                        s += t;
-                        stack.push(t);
-                    } else {
-                        if (s[s.length - 1] == ',') s = s.slice(0, -1);
-                        let t = (data & BS_CONT_OBJ) ? '}' : ']';
-                        s += t + ',';
-                        stack.pop();
-                    }
-                    keyf = true;
-                    continue;
-
-                case BS_CODE:
-                    s += '"' + codes[BS_D16_MERGE(data, b[++i])] + '"';
-                    break;
-
-                case BS_STRING: {
-                    let len = BS_D16_MERGE(data, b[++i]);
-                    s += JSON.stringify(new TextDecoder().decode(b.slice(i + 1, i + 1 + len)));
-                    i += len;
-                } break;
-
-                case BS_INTEGER: {
-                    if (BS_NEGATIVE(data)) s += '-';
-                    let len = BS_SIZE(data);
-                    let u8 = new Uint8Array(8);
-                    u8.set(b.slice(i + 1, i + 1 + len));
-                    s += new BigUint64Array(u8.buffer)[0];
-                    i += len;
-                } break;
-
-                case BS_BOOLEAN:
-                    s += BS_BOOLV(data) ? 'true' : 'false';
-                    break;
-
-                case BS_NULL:
-                    s += 'null';
-                    break;
-
-                case BS_FLOAT: {
-                    let f = new DataView(b.buffer, b.byteOffset + i + 1, BS_FLOAT_SIZE).getFloat32(0, true);
-                    s += (isNaN(f) || !isFinite(f)) ? 'null' : f.toFixed(BS_DECIMAL(data));
-                    i += BS_FLOAT_SIZE;
-
-                } break;
-
-                case BS_BINARY: {
-                    let len = BS_D16_MERGE(data, b[++i]);
-                    i++;
-                    s += '"' + BS_BIN_PREFIX + bins.length + '"';
-                    bins.push(b.slice(i, i + len));
-                    i += len - 1;
-                } break;
-
-            }
-
-            if (stack[stack.length - 1] === '{') {
-                s += keyf ? ':' : ',';
-                keyf = !keyf;
-            } else {
-                s += ',';
-            }
-        }
-    } catch (e) {
-        console.error(e, s);
-        throw new Error("BSON decode error");
-    }
-
-    if (s[s.length - 1] == ',') s = s.slice(0, -1);
-
-    try {
-        let obj = JSON.parse(s);
-        if (bins.length) _makeBins(obj, bins);
-        return obj;
-    } catch (e) {
-        console.error(e, s);
-        throw new Error("JSON parse error");
-    }
-}
-
-function _makeBins(obj, bins) {
-    if (typeof obj !== 'object') return;
-    for (let k in obj) {
-        if (typeof obj[k] === "object" && obj[k] !== null) {
-            _makeBins(obj[k], bins);
-        } else if (typeof obj[k] === "string" && obj[k].startsWith(BS_BIN_PREFIX)) {
-            obj[k] = bins[obj[k].slice(BS_BIN_PREFIX.length)];
-        }
-    }
-}
-
-/**
- * @param {*} val
- * @returns {Uint8Array}
- */
-export function encodeBson(val) {
-    let arr = [];
-    _encode(val, arr);
-    return Uint8Array.from(arr);
-}
-
-function _encode(val, arr) {
-    if (Array.isArray(val)) {
-        arr.push(BS_CONTAINER | BS_CONT_ARR | BS_CONT_OPEN);
-        val.forEach(v => _encode(v, arr));
-        arr.push(BS_CONTAINER | BS_CONT_ARR | BS_CONT_CLOSE);
-        return;
-    }
-
-    switch (typeof val) {
-        case 'object':
-            if (val === null) {
-                arr.push(BS_NULL);
-            } else if (val instanceof Uint8Array) {
-                const len = Math.min(val.length, BS_MAX_LEN);
-                arr.push(BS_BINARY | BS_D16_MSB(len));
-                arr.push(BS_D16_LSB(len));
-                arr.push(...val.slice(0, len));
-            } else {
-                arr.push(BS_CONTAINER | BS_CONT_OBJ | BS_CONT_OPEN);
-                for (const [key, value] of Object.entries(val)) {
-                    _encode(key, arr);
-                    _encode(value, arr);
-                }
-                arr.push(BS_CONTAINER | BS_CONT_OBJ | BS_CONT_CLOSE);
-            }
-            break;
-
-        case 'bigint':
-        case 'number':
-            if (Number.isInteger(val)) {
-                val = BigInt(val);
-                const neg = val < 0;
-                if (neg) val = -val;
-                let bytes = [];
-                while (val) {
-                    bytes.push(Number(val & 0xFFn));
-                    val >>= 8n;
-                }
-                arr.push(BS_INTEGER | (neg ? BS_NEG_MASK : 0) | bytes.length);
-                arr.push(...bytes);
-            } else {
-                const buffer = new ArrayBuffer(BS_FLOAT_SIZE);
-                new DataView(buffer).setFloat32(0, val, true);
-                arr.push(BS_FLOAT | 4);
-                arr.push(...new Uint8Array(buffer));
-            }
-            break;
-
-        case 'string':
-            if (val.startsWith(BS_CODE_PREFIX)) {
-                let code = Number(val.slice(BS_CODE_PREFIX.length));
-                arr.push(BS_CODE | BS_D16_MSB(code));
-                arr.push(BS_D16_LSB(code));
-            } else {
-                const bytes = new TextEncoder().encode(val);
-                const len = Math.min(bytes.length, BS_MAX_LEN);
-                arr.push(BS_STRING | BS_D16_MSB(len));
-                arr.push(BS_D16_LSB(len));
-                arr.push(...bytes.slice(0, len));
-            }
-            break;
-
-        case 'boolean':
-            arr.push(BS_BOOLEAN | (val ? 1 : 0));
-            break;
-
-        default:
-            arr.push(BS_NULL);
-            break;
-    }
-}
-
-export function getCode(name, codes) {
-    return BS_CODE_PREFIX + codes.indexOf(name);
+const BS_STRING = (0 << 5);
+const BS_BOOLEAN = (1 << 5);
+const BS_INTEGER = (2 << 5);
+const BS_FLOAT = (3 << 5);
+const BS_CODE = (4 << 5);
+const BS_BINARY = (5 << 5);
+const BS_CONTAINER = (6 << 5);
+const BS_NULL = (7 << 5);
+
+const BS_CONT_OBJ = (1 << 4);
+const BS_CONT_OPEN = (1 << 3);
+const BS_CONT_ARR = (1 << 2);
+const BS_CONT_CLOSE = (1 << 1);
+
+const BS_MAX_LEN = 0b0001111111111111;
+
+const BS_TYPE_MASK = 0b11100000;
+const BS_TYPE = x => x & BS_TYPE_MASK;
+const BS_DATA_MASK = 0b00011111;
+const BS_DATA = x => x & BS_DATA_MASK;
+
+const BS_BOOLV_MASK = 0b1;
+const BS_BOOLV = x => x & BS_BOOLV_MASK;
+
+const BS_NEG_MASK = 0b10000;
+const BS_NEGATIVE = x => x & BS_NEG_MASK;
+const BS_SIZE_MASK = 0b01111;
+const BS_SIZE = x => x & BS_SIZE_MASK;
+
+const BS_FLOAT_SIZE = 4;
+
+const BS_D16_MSB = x => (x >> 8) & BS_DATA_MASK;
+const BS_D16_LSB = x => x & 0xff;
+const BS_D16_MERGE = (msb5, lsb) => ((msb5 << 8) | lsb) >>> 0;
+
+const BS_CODE_PREFIX = "__BS#";
+
+/**
+ * @param {Uint8Array} b
+ * @param {Array} codes
+ * @returns {Object|Array|*}
+ */
+export function decodeBson(buf, codes = []) {
+    if (!(buf instanceof Uint8Array)) return undefined;
+
+    const reader = {
+        buf,
+        offset: 0,
+        decoder: new TextDecoder(),
+        read(len) {
+            if (this.offset + len > buf.length) {
+                throw new Error("Overflow");
+            }
+            const res = this.buf.subarray(this.offset, this.offset + len);
+            this.offset += len;
+            return res;
+        },
+        readB() {
+            return this.read(1)[0];
+        }
+    };
+
+    return _decode(reader, codes);
+}
+
+function _decode(r, codes) {
+    const header = r.readB();
+    const data = BS_DATA(header);
+
+    switch (BS_TYPE(header)) {
+        case BS_CONTAINER:
+            if (data & BS_CONT_OPEN) {
+                let isArr = !!(data & BS_CONT_ARR);
+                let cont = isArr ? [] : {};
+                let expect = false;
+                let key;
+
+                while (true) {
+                    let res = _decode(r, codes);
+
+                    if (res && res.__close !== undefined) {
+                        if (isArr === res.__close) {
+                            if (!isArr && expect) throw new Error("Missed value: " + JSON.stringify(cont));
+                            return cont;
+                        } else {
+                            throw new Error("Wrong close: " + JSON.stringify(cont));
+                        }
+                    }
+
+                    if (isArr) {
+                        cont.push(res);
+                    } else {
+                        if (expect) cont[key] = res;
+                        else key = res;
+                        expect = !expect;
+                    }
+                }
+            } else if (data & BS_CONT_CLOSE) {
+                return { __close: !!(data & BS_CONT_ARR) };
+            } else {
+                throw new Error("Unknown cont: " + JSON.stringify(cont));
+            }
+        // break;
+
+        case BS_CODE:
+            return codes[BS_D16_MERGE(data, r.readB())];
+
+        case BS_STRING: {
+            let len = BS_D16_MERGE(data, r.readB());
+            return r.decoder.decode(r.read(len));
+        }
+
+        case BS_INTEGER: {
+            let size = BS_SIZE(data);
+            if (!size) return 0;
+
+            let value = 0n;
+            const bytes = r.read(size);
+            while (size--) value = (value << 8n) | BigInt(bytes[size]);
+
+            if (BS_NEGATIVE(data)) value = -value;
+            return (value >= Number.MIN_SAFE_INTEGER && value <= Number.MAX_SAFE_INTEGER) ? Number(value) : value;
+        }
+
+        case BS_BOOLEAN:
+            return !!BS_BOOLV(data);
+
+        case BS_NULL:
+            return null;
+
+        case BS_FLOAT: {
+            const b = r.read(4);
+            return new DataView(b.buffer, b.byteOffset, 4).getFloat32(0, true);
+        }
+
+        case BS_BINARY: {
+            let len = BS_D16_MERGE(data, r.readB());
+            return r.read(len).slice();
+        }
+    }
+}
+
+/**
+ * @param {*} val
+ * @returns {Uint8Array}
+ */
+export function encodeBson(val, codes = []) {
+    let arr = [];
+    _encode(val, arr, codes);
+    return Uint8Array.from(arr);
+}
+
+function _encode(val, arr, codes) {
+    if (Array.isArray(val)) {
+        arr.push(BS_CONTAINER | BS_CONT_ARR | BS_CONT_OPEN);
+        val.forEach(v => _encode(v, arr, codes));
+        arr.push(BS_CONTAINER | BS_CONT_ARR | BS_CONT_CLOSE);
+        return;
+    }
+
+    switch (typeof val) {
+        case 'object':
+            if (val === null) {
+                arr.push(BS_NULL);
+            } else if (val instanceof Uint8Array) {
+                const len = Math.min(val.length, BS_MAX_LEN);
+                arr.push(BS_BINARY | BS_D16_MSB(len));
+                arr.push(BS_D16_LSB(len));
+                arr.push(...val.slice(0, len));
+            } else {
+                arr.push(BS_CONTAINER | BS_CONT_OBJ | BS_CONT_OPEN);
+                for (const [key, value] of Object.entries(val)) {
+                    _encode(key, arr, codes);
+                    _encode(value, arr, codes);
+                }
+                arr.push(BS_CONTAINER | BS_CONT_OBJ | BS_CONT_CLOSE);
+            }
+            break;
+
+        case 'bigint':
+        case 'number':
+            if (Number.isInteger(val)) {
+                val = BigInt(val);
+                const neg = val < 0;
+                if (neg) val = -val;
+                let bytes = [];
+                while (val) {
+                    bytes.push(Number(val & 0xFFn));
+                    val >>= 8n;
+                }
+                arr.push(BS_INTEGER | (neg ? BS_NEG_MASK : 0) | bytes.length);
+                arr.push(...bytes);
+            } else {
+                const buffer = new ArrayBuffer(BS_FLOAT_SIZE);
+                new DataView(buffer).setFloat32(0, val, true);
+                arr.push(BS_FLOAT);
+                arr.push(...new Uint8Array(buffer));
+            }
+            break;
+
+        case 'string':
+            if (val.startsWith(BS_CODE_PREFIX)) {
+                val = val.slice(BS_CODE_PREFIX.length);
+                let code = codes.indexOf(val);
+                if (code >= 0) {
+                    arr.push(BS_CODE | BS_D16_MSB(code));
+                    arr.push(BS_D16_LSB(code));
+                } else {
+                    _encode(val, arr, codes);
+                }
+            } else {
+                const bytes = new TextEncoder().encode(val);
+                const len = Math.min(bytes.length, BS_MAX_LEN);
+                arr.push(BS_STRING | BS_D16_MSB(len));
+                arr.push(BS_D16_LSB(len));
+                arr.push(...bytes.slice(0, len));
+            }
+            break;
+
+        case 'boolean':
+            arr.push(BS_BOOLEAN | !!val);
+            break;
+
+        default:
+            arr.push(BS_NULL);
+            break;
+    }
+}
+
+export function getCode(name) {
+    return BS_CODE_PREFIX + name;
 }

package/bson.min.js

@@ -1 +1 @@
-var e={d:(t,r)=>{for(var n in r)e.o(r,n)&&!e.o(t,n)&&Object.defineProperty(t,n,{enumerable:!0,get:r[n]})},o:(e,t)=>Object.prototype.hasOwnProperty.call(e,t)},t={};e.d(t,{$R:()=>U,QC:()=>C,lo:()=>F});const r=0,n=32,s=64,o=96,a=128,c=160,i=192,l=224,u=16,h=8,f=4,p=2,b=8191,g=e=>224&e,y=e=>31&e,d=e=>1&e,w=16,O=e=>e&w,N=e=>15&e,k=4,A=e=>15&e,B=e=>e>>8&31,m=e=>255&e,_=(e,t)=>(e<<8|t)>>>0,j="__BSON_BIN_",x="__BSON_CODE_";function F(e,t=[]){if(!(e&&e instanceof Uint8Array))return null;if(!e.length)return{};let f=[],p=[],b=!0,w="";try{for(let B=0;B<e.length;B++){const m=g(e[B]),x=y(e[B]);switch(m){case i:if(x&h){let e=x&u?"{":"[";w+=e,p.push(e)}else","==w[w.length-1]&&(w=w.slice(0,-1)),w+=(x&u?"}":"]")+",",p.pop();b=!0;continue;case a:w+='"'+t[_(x,e[++B])]+'"';break;case r:{let t=_(x,e[++B]);w+=JSON.stringify((new TextDecoder).decode(e.slice(B+1,B+1+t))),B+=t}break;case s:{O(x)&&(w+="-");let t=N(x),r=new Uint8Array(8);r.set(e.slice(B+1,B+1+t)),w+=new BigUint64Array(r.buffer)[0],B+=t}break;case n:w+=d(x)?"true":"false";break;case l:w+="null";break;case o:{let t=new DataView(e.buffer,e.byteOffset+B+1,k).getFloat32(0,!0);w+=isNaN(t)||!isFinite(t)?"null":t.toFixed(A(x)),B+=k}break;case c:{let t=_(x,e[++B]);B++,w+='"'+j+f.length+'"',f.push(e.slice(B,B+t)),B+=t-1}}"{"===p[p.length-1]?(w+=b?":":",",b=!b):w+=","}}catch(e){throw console.error(e,w),new Error("BSON decode error")}","==w[w.length-1]&&(w=w.slice(0,-1));try{let e=JSON.parse(w);return f.length&&S(e,f),e}catch(e){throw console.error(e,w),new Error("JSON parse error")}}function S(e,t){if("object"==typeof e)for(let r in e)"object"==typeof e[r]&&null!==e[r]?S(e[r],t):"string"==typeof e[r]&&e[r].startsWith(j)&&(e[r]=t[e[r].slice(j.length)])}function U(e){let t=[];return E(e,t),Uint8Array.from(t)}function E(e,t){if(Array.isArray(e))return t.push(i|f|h),e.forEach(e=>E(e,t)),void t.push(i|f|p);switch(typeof e){case"object":if(null===e)t.push(l);else if(e instanceof Uint8Array){const r=Math.min(e.length,b);t.push(c|B(r)),t.push(m(r)),t.push(...e.slice(0,r))}else{t.push(i|u|h);for(const[r,n]of Object.entries(e))E(r,t),E(n,t);t.push(i|u|p)}break;case"bigint":case"number":if(Number.isInteger(e)){const r=(e=BigInt(e))<0;r&&(e=-e);let n=[];for(;e;)n.push(Number(0xFFn&e)),e>>=8n;t.push(s|(r?w:0)|n.length),t.push(...n)}else{const r=new ArrayBuffer(k);new DataView(r).setFloat32(0,e,!0),t.push(4|o),t.push(...new Uint8Array(r))}break;case"string":if(e.startsWith(x)){let r=Number(e.slice(x.length));t.push(a|B(r)),t.push(m(r))}else{const n=(new TextEncoder).encode(e),s=Math.min(n.length,b);t.push(r|B(s)),t.push(m(s)),t.push(...n.slice(0,s))}break;case"boolean":t.push(n|(e?1:0));break;default:t.push(l)}}function C(e,t){return x+t.indexOf(e)}const D=t.lo,v=t.$R,I=t.QC;export{D as decodeBson,v as encodeBson,I as getCode};
+var e={d:(r,t)=>{for(var n in t)e.o(t,n)&&!e.o(r,n)&&Object.defineProperty(r,n,{enumerable:!0,get:t[n]})},o:(e,r)=>Object.prototype.hasOwnProperty.call(e,r)},r={};e.d(r,{$R:()=>I,QC:()=>k,lo:()=>v});const t=0,n=32,s=64,o=96,i=128,a=160,u=192,c=224,f=16,h=8,l=4,d=2,p=8191,b=e=>224&e,w=e=>31&e,g=e=>1&e,y=16,E=e=>e&y,_=e=>15&e,B=4,N=e=>e>>8&31,m=e=>255&e,A=(e,r)=>(e<<8|r)>>>0,O="__BS#";function v(e,r=[]){if(e instanceof Uint8Array)return F({buf:e,offset:0,decoder:new TextDecoder,read(r){if(this.offset+r>e.length)throw new Error("Overflow");const t=this.buf.subarray(this.offset,this.offset+r);return this.offset+=r,t},readB(){return this.read(1)[0]}},r)}function F(e,r){const f=e.readB(),p=w(f);switch(b(f)){case u:if(!(p&h)){if(p&d)return{__close:!!(p&l)};throw new Error("Unknown cont: "+JSON.stringify(cont))}{let t,n=!!(p&l),s=n?[]:{},o=!1;for(;;){let i=F(e,r);if(i&&void 0!==i.__close){if(n===i.__close){if(!n&&o)throw new Error("Missed value: "+JSON.stringify(s));return s}throw new Error("Wrong close: "+JSON.stringify(s))}n?s.push(i):(o?s[t]=i:t=i,o=!o)}}case i:return r[A(p,e.readB())];case t:{let r=A(p,e.readB());return e.decoder.decode(e.read(r))}case s:{let r=_(p);if(!r)return 0;let t=0n;const n=e.read(r);for(;r--;)t=t<<8n|BigInt(n[r]);return E(p)&&(t=-t),t>=Number.MIN_SAFE_INTEGER&&t<=Number.MAX_SAFE_INTEGER?Number(t):t}case n:return!!g(p);case c:return null;case o:{const r=e.read(4);return new DataView(r.buffer,r.byteOffset,4).getFloat32(0,!0)}case a:{let r=A(p,e.readB());return e.read(r).slice()}}}function I(e,r=[]){let t=[];return S(e,t,r),Uint8Array.from(t)}function S(e,r,b){if(Array.isArray(e))return r.push(u|l|h),e.forEach(e=>S(e,r,b)),void r.push(u|l|d);switch(typeof e){case"object":if(null===e)r.push(c);else if(e instanceof Uint8Array){const t=Math.min(e.length,p);r.push(a|N(t)),r.push(m(t)),r.push(...e.slice(0,t))}else{r.push(u|f|h);for(const[t,n]of Object.entries(e))S(t,r,b),S(n,r,b);r.push(u|f|d)}break;case"bigint":case"number":if(Number.isInteger(e)){const t=(e=BigInt(e))<0;t&&(e=-e);let n=[];for(;e;)n.push(Number(0xFFn&e)),e>>=8n;r.push(s|(t?y:0)|n.length),r.push(...n)}else{const t=new ArrayBuffer(B);new DataView(t).setFloat32(0,e,!0),r.push(o),r.push(...new Uint8Array(t))}break;case"string":if(e.startsWith(O)){e=e.slice(O.length);let t=b.indexOf(e);t>=0?(r.push(i|N(t)),r.push(m(t))):S(e,r,b)}else{const n=(new TextEncoder).encode(e),s=Math.min(n.length,p);r.push(t|N(s)),r.push(m(s)),r.push(...n.slice(0,s))}break;case"boolean":r.push(n|!!e);break;default:r.push(c)}}function k(e){return O+e}const x=r.lo,M=r.$R,U=r.QC;export{x as decodeBson,M as encodeBson,U as getCode};

package/package.json

@@ -1,21 +1,25 @@
-{
-  "name": "@alexgyver/bson",
-  "version": "2.1.0",
-  "description": "Decode BSON from BSON Arduino library",
-  "main": "./bson.js",
-  "module": "./bson.js",
-  "types": "./bson.js",
-  "scripts": {
-    "build": "webpack --config ./webpack.config.js"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/GyverLibs/bson.js.git"
-  },
-  "devDependencies": {
-    "webpack": "^5.98.0",
-    "webpack-cli": "^6.0.1"
-  },
-  "author": "AlexGyver <alex@alexgyver.ru>",
-  "license": "MIT"
+{
+  "name": "@alexgyver/bson",
+  "version": "2.2.0",
+  "description": "Decode BSON from BSON Arduino library",
+  "main": "./bson.js",
+  "module": "./bson.js",
+  "types": "./bson.js",
+  "scripts": {
+    "build": "webpack --config ./webpack.config.js",
+    "dev": "webpack serve --config ./webpack.dev.config.js & webpack --config ./webpack.dev.config.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/GyverLibs/bson.js.git"
+  },
+  "devDependencies": {
+    "webpack": "^5.105.4",
+    "webpack-cli": "^6.0.1",
+    "webpack-dev-server": "^5.2.3",
+    "style-loader": "^4.0.0",
+    "css-loader": "^7.1.4"
+  },
+  "author": "AlexGyver <alex@alexgyver.ru>",
+  "license": "MIT"
 }

package/{test.html → test/index.html}

@@ -16,9 +16,6 @@
             'constants',
         ];
 
-        // =========== getCode ===========
-        console.log(getCode('constants', codes));
-
         // =========== encode ===========
         let test = {
             int: 123,
@@ -35,11 +32,12 @@
             },
             str3: "str3",
             nul: null,
-            [getCode('constants', codes)]: getCode('string', codes),
+            [getCode('constants1')]: getCode('string1'),
+            [getCode('constants')]: getCode('string'),
             bins: new Uint8Array([1, 2, 3]),
         };
 
-        let enc = encodeBson(test);
+        let enc = encodeBson(test, codes);
         let json = decodeBson(enc, codes);
         console.log(json);
 

package/webpack.dev.config.js

@@ -0,0 +1,24 @@
+const path = require('path');
+
+module.exports = {
+    entry: './test/script.js',
+    output: {
+        filename: 'script.js',
+        path: path.resolve(__dirname, 'test'),
+        clean: false,
+    },
+    module: {
+        rules: [
+            {
+                test: /\.css$/,
+                use: ['style-loader', 'css-loader'],
+            }
+        ]
+    },
+    devServer: {
+        static: path.resolve(__dirname, 'test'),
+        hot: true,
+        open: true,
+    },
+    mode: 'development',
+};