rregex 1.7.0 → 1.7.1

package/lib/commonjs.js

@@ -3,7 +3,7 @@ imports['wbg'] = module.exports;
 let wasm;
 const { TextDecoder, TextEncoder } = require(`util`);
 
-const heap = new Array(32).fill(undefined);
+const heap = new Array(128).fill(undefined);
 
 heap.push(undefined, null, true, false);
 
@@ -12,7 +12,7 @@ function getObject(idx) { return heap[idx]; }
 let heap_next = heap.length;
 
 function dropObject(idx) {
-    if (idx < 36) return;
+    if (idx < 132) return;
     heap[idx] = heap_next;
     heap_next = idx;
 }
@@ -27,15 +27,17 @@ let cachedTextDecoder = new TextDecoder('utf-8', { ignoreBOM: true, fatal: true
 
 cachedTextDecoder.decode();
 
-let cachedUint8Memory0;
+let cachedUint8Memory0 = null;
+
 function getUint8Memory0() {
-    if (cachedUint8Memory0.byteLength === 0) {
+    if (cachedUint8Memory0 === null || cachedUint8Memory0.byteLength === 0) {
         cachedUint8Memory0 = new Uint8Array(wasm.memory.buffer);
     }
     return cachedUint8Memory0;
 }
 
 function getStringFromWasm0(ptr, len) {
+    ptr = ptr >>> 0;
     return cachedTextDecoder.decode(getUint8Memory0().subarray(ptr, ptr + len));
 }
 
@@ -69,14 +71,14 @@ function passStringToWasm0(arg, malloc, realloc) {
 
     if (realloc === undefined) {
         const buf = cachedTextEncoder.encode(arg);
-        const ptr = malloc(buf.length);
+        const ptr = malloc(buf.length, 1) >>> 0;
         getUint8Memory0().subarray(ptr, ptr + buf.length).set(buf);
         WASM_VECTOR_LEN = buf.length;
         return ptr;
     }
 
     let len = arg.length;
-    let ptr = malloc(len);
+    let ptr = malloc(len, 1) >>> 0;
 
     const mem = getUint8Memory0();
 
@@ -92,7 +94,7 @@ function passStringToWasm0(arg, malloc, realloc) {
         if (offset !== 0) {
             arg = arg.slice(offset);
         }
-        ptr = realloc(ptr, len, len = offset + arg.length * 3);
+        ptr = realloc(ptr, len, len = offset + arg.length * 3, 1) >>> 0;
         const view = getUint8Memory0().subarray(ptr + offset, ptr + len);
         const ret = encodeString(arg, view);
 
@@ -107,9 +109,10 @@ function isLikeNone(x) {
     return x === undefined || x === null;
 }
 
-let cachedInt32Memory0;
+let cachedInt32Memory0 = null;
+
 function getInt32Memory0() {
-    if (cachedInt32Memory0.byteLength === 0) {
+    if (cachedInt32Memory0 === null || cachedInt32Memory0.byteLength === 0) {
         cachedInt32Memory0 = new Int32Array(wasm.memory.buffer);
     }
     return cachedInt32Memory0;
@@ -179,11 +182,21 @@ function debugString(val) {
     // TODO we could test for more things here, like `Set`s and `Map`s.
     return className;
 }
+
+let stack_pointer = 128;
+
+function addBorrowedObject(obj) {
+    if (stack_pointer == 1) throw new Error('out of js stack');
+    heap[--stack_pointer] = obj;
+    return stack_pointer;
+}
 /**
 * @param {string} text
 * @returns {string}
 */
 module.exports.escape = function(text) {
+    let deferred2_0;
+    let deferred2_1;
     try {
         const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
         const ptr0 = passStringToWasm0(text, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
@@ -191,21 +204,15 @@ module.exports.escape = function(text) {
         wasm.escape(retptr, ptr0, len0);
         var r0 = getInt32Memory0()[retptr / 4 + 0];
         var r1 = getInt32Memory0()[retptr / 4 + 1];
+        deferred2_0 = r0;
+        deferred2_1 = r1;
         return getStringFromWasm0(r0, r1);
     } finally {
         wasm.__wbindgen_add_to_stack_pointer(16);
-        wasm.__wbindgen_free(r0, r1);
+        wasm.__wbindgen_free(deferred2_0, deferred2_1, 1);
     }
 };
 
-let stack_pointer = 32;
-
-function addBorrowedObject(obj) {
-    if (stack_pointer == 1) throw new Error('out of js stack');
-    heap[--stack_pointer] = obj;
-    return stack_pointer;
-}
-
 function handleError(f, args) {
     try {
         return f.apply(this, args);
@@ -219,16 +226,9 @@ function handleError(f, args) {
 */
 class RRegex {
 
-    static __wrap(ptr) {
-        const obj = Object.create(RRegex.prototype);
-        obj.ptr = ptr;
-
-        return obj;
-    }
-
     __destroy_into_raw() {
-        const ptr = this.ptr;
-        this.ptr = 0;
+        const ptr = this.__wbg_ptr;
+        this.__wbg_ptr = 0;
 
         return ptr;
     }
@@ -254,7 +254,8 @@ class RRegex {
             if (r2) {
                 throw takeObject(r1);
             }
-            return RRegex.__wrap(r0);
+            this.__wbg_ptr = r0 >>> 0;
+            return this;
         } finally {
             wasm.__wbindgen_add_to_stack_pointer(16);
         }
@@ -269,7 +270,7 @@ class RRegex {
     isMatch(text) {
         const ptr0 = passStringToWasm0(text, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
         const len0 = WASM_VECTOR_LEN;
-        const ret = wasm.rregex_isMatch(this.ptr, ptr0, len0);
+        const ret = wasm.rregex_isMatch(this.__wbg_ptr, ptr0, len0);
         return ret !== 0;
     }
     /**
@@ -283,7 +284,7 @@ class RRegex {
     isMatchAt(text, start) {
         const ptr0 = passStringToWasm0(text, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
         const len0 = WASM_VECTOR_LEN;
-        const ret = wasm.rregex_isMatchAt(this.ptr, ptr0, len0, start);
+        const ret = wasm.rregex_isMatchAt(this.__wbg_ptr, ptr0, len0, start);
         return ret !== 0;
     }
     /**
@@ -296,7 +297,7 @@ class RRegex {
     find(text) {
         const ptr0 = passStringToWasm0(text, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
         const len0 = WASM_VECTOR_LEN;
-        const ret = wasm.rregex_find(this.ptr, ptr0, len0);
+        const ret = wasm.rregex_find(this.__wbg_ptr, ptr0, len0);
         return takeObject(ret);
     }
     /**
@@ -310,7 +311,7 @@ class RRegex {
     findAt(text, start) {
         const ptr0 = passStringToWasm0(text, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
         const len0 = WASM_VECTOR_LEN;
-        const ret = wasm.rregex_findAt(this.ptr, ptr0, len0, start);
+        const ret = wasm.rregex_findAt(this.__wbg_ptr, ptr0, len0, start);
         return takeObject(ret);
     }
     /**
@@ -322,7 +323,7 @@ class RRegex {
     findAll(text) {
         const ptr0 = passStringToWasm0(text, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
         const len0 = WASM_VECTOR_LEN;
-        const ret = wasm.rregex_findAll(this.ptr, ptr0, len0);
+        const ret = wasm.rregex_findAll(this.__wbg_ptr, ptr0, len0);
         return takeObject(ret);
     }
     /**
@@ -335,19 +336,23 @@ class RRegex {
     * @returns {string}
     */
     replace(text, rep) {
+        let deferred3_0;
+        let deferred3_1;
         try {
             const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
             const ptr0 = passStringToWasm0(text, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
             const len0 = WASM_VECTOR_LEN;
             const ptr1 = passStringToWasm0(rep, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
             const len1 = WASM_VECTOR_LEN;
-            wasm.rregex_replace(retptr, this.ptr, ptr0, len0, ptr1, len1);
+            wasm.rregex_replace(retptr, this.__wbg_ptr, ptr0, len0, ptr1, len1);
             var r0 = getInt32Memory0()[retptr / 4 + 0];
             var r1 = getInt32Memory0()[retptr / 4 + 1];
+            deferred3_0 = r0;
+            deferred3_1 = r1;
             return getStringFromWasm0(r0, r1);
         } finally {
             wasm.__wbindgen_add_to_stack_pointer(16);
-            wasm.__wbindgen_free(r0, r1);
+            wasm.__wbindgen_free(deferred3_0, deferred3_1, 1);
         }
     }
     /**
@@ -360,19 +365,23 @@ class RRegex {
     * @returns {string}
     */
     replacen(text, limit, rep) {
+        let deferred3_0;
+        let deferred3_1;
         try {
             const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
             const ptr0 = passStringToWasm0(text, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
             const len0 = WASM_VECTOR_LEN;
             const ptr1 = passStringToWasm0(rep, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
             const len1 = WASM_VECTOR_LEN;
-            wasm.rregex_replacen(retptr, this.ptr, ptr0, len0, limit, ptr1, len1);
+            wasm.rregex_replacen(retptr, this.__wbg_ptr, ptr0, len0, limit, ptr1, len1);
             var r0 = getInt32Memory0()[retptr / 4 + 0];
             var r1 = getInt32Memory0()[retptr / 4 + 1];
+            deferred3_0 = r0;
+            deferred3_1 = r1;
             return getStringFromWasm0(r0, r1);
         } finally {
             wasm.__wbindgen_add_to_stack_pointer(16);
-            wasm.__wbindgen_free(r0, r1);
+            wasm.__wbindgen_free(deferred3_0, deferred3_1, 1);
         }
     }
     /**
@@ -384,19 +393,23 @@ class RRegex {
     * @returns {string}
     */
     replaceAll(text, rep) {
+        let deferred3_0;
+        let deferred3_1;
         try {
             const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
             const ptr0 = passStringToWasm0(text, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
             const len0 = WASM_VECTOR_LEN;
             const ptr1 = passStringToWasm0(rep, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
             const len1 = WASM_VECTOR_LEN;
-            wasm.rregex_replaceAll(retptr, this.ptr, ptr0, len0, ptr1, len1);
+            wasm.rregex_replaceAll(retptr, this.__wbg_ptr, ptr0, len0, ptr1, len1);
             var r0 = getInt32Memory0()[retptr / 4 + 0];
             var r1 = getInt32Memory0()[retptr / 4 + 1];
+            deferred3_0 = r0;
+            deferred3_1 = r1;
             return getStringFromWasm0(r0, r1);
         } finally {
             wasm.__wbindgen_add_to_stack_pointer(16);
-            wasm.__wbindgen_free(r0, r1);
+            wasm.__wbindgen_free(deferred3_0, deferred3_1, 1);
         }
     }
     /**
@@ -409,7 +422,7 @@ class RRegex {
     split(text) {
         const ptr0 = passStringToWasm0(text, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
         const len0 = WASM_VECTOR_LEN;
-        const ret = wasm.rregex_split(this.ptr, ptr0, len0);
+        const ret = wasm.rregex_split(this.__wbg_ptr, ptr0, len0);
         return takeObject(ret);
     }
     /**
@@ -423,7 +436,7 @@ class RRegex {
     splitn(text, limit) {
         const ptr0 = passStringToWasm0(text, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
         const len0 = WASM_VECTOR_LEN;
-        const ret = wasm.rregex_splitn(this.ptr, ptr0, len0, limit);
+        const ret = wasm.rregex_splitn(this.__wbg_ptr, ptr0, len0, limit);
         return takeObject(ret);
     }
     /**
@@ -438,7 +451,7 @@ class RRegex {
             const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
             const ptr0 = passStringToWasm0(text, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
             const len0 = WASM_VECTOR_LEN;
-            wasm.rregex_shortestMatch(retptr, this.ptr, ptr0, len0);
+            wasm.rregex_shortestMatch(retptr, this.__wbg_ptr, ptr0, len0);
             var r0 = getInt32Memory0()[retptr / 4 + 0];
             var r1 = getInt32Memory0()[retptr / 4 + 1];
             return r0 === 0 ? undefined : r1 >>> 0;
@@ -459,7 +472,7 @@ class RRegex {
             const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
             const ptr0 = passStringToWasm0(text, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
             const len0 = WASM_VECTOR_LEN;
-            wasm.rregex_shortestMatchAt(retptr, this.ptr, ptr0, len0, limit);
+            wasm.rregex_shortestMatchAt(retptr, this.__wbg_ptr, ptr0, len0, limit);
             var r0 = getInt32Memory0()[retptr / 4 + 0];
             var r1 = getInt32Memory0()[retptr / 4 + 1];
             return r0 === 0 ? undefined : r1 >>> 0;
@@ -472,7 +485,7 @@ class RRegex {
     * @returns {any}
     */
     syntax() {
-        const ret = wasm.rregex_syntax(this.ptr);
+        const ret = wasm.rregex_syntax(this.__wbg_ptr);
         return takeObject(ret);
     }
     /**
@@ -480,15 +493,19 @@ class RRegex {
     * @returns {string}
     */
     toString() {
+        let deferred1_0;
+        let deferred1_1;
         try {
             const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.rregex_toString(retptr, this.ptr);
+            wasm.rregex_toString(retptr, this.__wbg_ptr);
             var r0 = getInt32Memory0()[retptr / 4 + 0];
             var r1 = getInt32Memory0()[retptr / 4 + 1];
+            deferred1_0 = r0;
+            deferred1_1 = r1;
             return getStringFromWasm0(r0, r1);
         } finally {
             wasm.__wbindgen_add_to_stack_pointer(16);
-            wasm.__wbindgen_free(r0, r1);
+            wasm.__wbindgen_free(deferred1_0, deferred1_1, 1);
         }
     }
 }
@@ -500,16 +517,9 @@ module.exports.RRegex = RRegex;
 */
 class RRegexSet {
 
-    static __wrap(ptr) {
-        const obj = Object.create(RRegexSet.prototype);
-        obj.ptr = ptr;
-
-        return obj;
-    }
-
     __destroy_into_raw() {
-        const ptr = this.ptr;
-        this.ptr = 0;
+        const ptr = this.__wbg_ptr;
+        this.__wbg_ptr = 0;
 
         return ptr;
     }
@@ -532,7 +542,8 @@ class RRegexSet {
             if (r2) {
                 throw takeObject(r1);
             }
-            return RRegexSet.__wrap(r0);
+            this.__wbg_ptr = r0 >>> 0;
+            return this;
         } finally {
             wasm.__wbindgen_add_to_stack_pointer(16);
             heap[stack_pointer++] = undefined;
@@ -548,7 +559,7 @@ class RRegexSet {
     isMatch(text) {
         const ptr0 = passStringToWasm0(text, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
         const len0 = WASM_VECTOR_LEN;
-        const ret = wasm.rregexset_isMatch(this.ptr, ptr0, len0);
+        const ret = wasm.rregexset_isMatch(this.__wbg_ptr, ptr0, len0);
         return ret !== 0;
     }
     /**
@@ -561,7 +572,7 @@ class RRegexSet {
     matches(text) {
         const ptr0 = passStringToWasm0(text, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
         const len0 = WASM_VECTOR_LEN;
-        const ret = wasm.rregexset_matches(this.ptr, ptr0, len0);
+        const ret = wasm.rregexset_matches(this.__wbg_ptr, ptr0, len0);
         return takeObject(ret);
     }
 }
@@ -589,53 +600,53 @@ module.exports.__wbindgen_is_string = function(arg0) {
 module.exports.__wbindgen_string_get = function(arg0, arg1) {
     const obj = getObject(arg1);
     const ret = typeof(obj) === 'string' ? obj : undefined;
-    var ptr0 = isLikeNone(ret) ? 0 : passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
-    var len0 = WASM_VECTOR_LEN;
-    getInt32Memory0()[arg0 / 4 + 1] = len0;
-    getInt32Memory0()[arg0 / 4 + 0] = ptr0;
+    var ptr1 = isLikeNone(ret) ? 0 : passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+    var len1 = WASM_VECTOR_LEN;
+    getInt32Memory0()[arg0 / 4 + 1] = len1;
+    getInt32Memory0()[arg0 / 4 + 0] = ptr1;
 };
 
-module.exports.__wbg_get_f0f4f1608ebf633e = function(arg0, arg1) {
+module.exports.__wbg_get_f01601b5a68d10e3 = function(arg0, arg1) {
     const ret = getObject(arg0)[arg1 >>> 0];
     return addHeapObject(ret);
 };
 
-module.exports.__wbg_length_93debb0e2e184ab6 = function(arg0) {
+module.exports.__wbg_length_1009b1af0c481d7b = function(arg0) {
     const ret = getObject(arg0).length;
     return ret;
 };
 
-module.exports.__wbg_new_2ab697f1555e0dbc = function() {
+module.exports.__wbg_new_ffc6d4d085022169 = function() {
     const ret = new Array();
     return addHeapObject(ret);
 };
 
-module.exports.__wbg_new_306ce8d57919e6ae = function() {
+module.exports.__wbg_new_9fb8d994e1c0aaac = function() {
     const ret = new Object();
     return addHeapObject(ret);
 };
 
-module.exports.__wbg_push_811c8b08bf4ff9d5 = function(arg0, arg1) {
+module.exports.__wbg_push_901f3914205d44de = function(arg0, arg1) {
     const ret = getObject(arg0).push(getObject(arg1));
     return ret;
 };
 
-module.exports.__wbg_new_651776e932b7e9c7 = function(arg0, arg1) {
+module.exports.__wbg_new_a64e3f2afc2cf2f8 = function(arg0, arg1) {
     const ret = new Error(getStringFromWasm0(arg0, arg1));
     return addHeapObject(ret);
 };
 
-module.exports.__wbg_set_b12cd0ab82903c2f = function() { return handleError(function (arg0, arg1, arg2) {
+module.exports.__wbg_set_759f75cd92b612d2 = function() { return handleError(function (arg0, arg1, arg2) {
     const ret = Reflect.set(getObject(arg0), getObject(arg1), getObject(arg2));
     return ret;
 }, arguments) };
 
 module.exports.__wbindgen_debug_string = function(arg0, arg1) {
     const ret = debugString(getObject(arg1));
-    const ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
-    const len0 = WASM_VECTOR_LEN;
-    getInt32Memory0()[arg0 / 4 + 1] = len0;
-    getInt32Memory0()[arg0 / 4 + 0] = ptr0;
+    const ptr1 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+    const len1 = WASM_VECTOR_LEN;
+    getInt32Memory0()[arg0 / 4 + 1] = len1;
+    getInt32Memory0()[arg0 / 4 + 0] = ptr1;
 };
 
 module.exports.__wbindgen_throw = function(arg0, arg1) {
@@ -650,9 +661,6 @@ const wasmInstance = new WebAssembly.Instance(wasmModule, imports);
 wasm = wasmInstance.exports;
 module.exports.__wasm = wasm;
 
-cachedInt32Memory0 = new Int32Array(wasm.memory.buffer);
-cachedUint8Memory0 = new Uint8Array(wasm.memory.buffer);
-
 
 module.exports.metadata = {
   "name": "rregex",
@@ -662,6 +670,6 @@ module.exports.metadata = {
   ],
   "homepage": "https://2fd.github.io/rregex",
   "repository": "https://github.com/2fd/rregex",
-  "regex": "1.7.0",
-  "regex-syntax": "0.6.28"
+  "regex": "1.7.3",
+  "regex-syntax": "0.6.29"
 }

package/lib/module.d.ts

@@ -507,6 +507,6 @@ export const metadata: {
   ],
   "homepage": "https://2fd.github.io/rregex",
   "repository": "https://github.com/2fd/rregex",
-  "regex": "1.7.0",
-  "regex-syntax": "0.6.28"
+  "regex": "1.7.3",
+  "regex-syntax": "0.6.29"
 }