porffor 0.58.19 → 0.59.0

package/AGENT.md

@@ -1,13 +1,22 @@
-you are an assistant coder for Porffor - a WIP js/ts -> wasm/native ahead-of-time compiler. the codebase is written in js and ts.
+you are an assistant coder for Porffor - an early javascript and typescript to webassembly and native ahead-of-time compiler. the codebase is written in js and ts.
 
 IMPORTANT:
 - built-ins apis (Date, String.prototype, etc) are written in ts inside `compiler/builtins`
 - once you update a file inside that directory, you MUST run `./porf precompile` to compile to make your changes effective
 
-test your work using the test262 tools available, iterate independently but do not get stuck on one chain of thought or approach. paths for test262 tools should be relative to the 'test262/test' directory (e.g., 'built-ins/RegExp' instead of 'test262/test/built-ins/RegExp').
+Test your work using the test262 tools available, iterate independently but do not get stuck on one chain of thought or approach. Paths for test262 tools should be relative to the 'test262/test' directory (e.g., 'built-ins/RegExp' NOT 'test262/test/built-ins/RegExp').
 
-- always use single quotes instead of double quotes (unless needed)
-- after finishing, check if your work/diff could be simplified
-- to just evaluate code in the engine, use the command: `./porf -p "..."`
-- to get an overview of the most failing directories, use the command: `node test262/fails.cjs`
-- when working in `compiler/builtins`, inline code instead of using utility/helper functions
+You can also do the following via bash/shell commands:
+- To get an overview of the most failing directories, use the command: `node test262/fails.cjs`
+- To just evaluate code in the engine, use the command: `./porf -p "..."`
+
+## Code Style
+- After finishing, check if your work/diff could be simplified
+- Always use single quotes (unless double is required)
+- 2-space indentation, LF line endings, no trailing whitespace
+- Built-in APIs in `compiler/builtins/` written in TypeScript
+- Inline code in built-ins, avoid helper functions
+- Use semicolons
+- Do not use trailing commas
+- Use const/let, avoid var
+- Follow existing naming: camelCase for variables, PascalCase for types

package/compiler/assemble.js

@@ -208,20 +208,9 @@ export default (funcs, globals, tags, pages, data, noTreeshake = false) => {
     const bytesPerFunc = funcs.bytesPerFuncLut();
     for (let i = 0; i < indirectFuncs.length; i++) {
       const func = indirectFuncs[i].wrapperOf;
-      let name = func.name;
 
       // userland exposed .length
-      let length = func.jsLength;
-      if (length == null) {
-        length = func.params.length;
-        if (func.constr) length -= 4;
-        if (func.method) length -= 2;
-        if (!func.internal || func.typedParams) length = Math.floor(length / 2);
-
-        // remove _this from internal prototype funcs
-        if (func.internal && name.includes('_prototype_')) length--;
-      }
-
+      const length = func.jsLength;
       bytes.push(length % 256, (length / 256 | 0) % 256);
 
       let flags = 0b00000000; // 8 flag bits
@@ -229,8 +218,8 @@ export default (funcs, globals, tags, pages, data, noTreeshake = false) => {
       if (func.constr) flags |= 0b10;
       bytes.push(flags);
 
+      let name = func.name;
       if (name.startsWith('#')) name = '';
-
       // eg: __String_prototype_toLowerCase -> toLowerCase
       if (name.startsWith('__')) name = name.split('_').pop();
 

package/compiler/builtins/regexp.ts

@@ -787,11 +787,11 @@ export const __Porffor_regex_interpret = (regexp: RegExp, input: i32, isTest: bo
   const inputLen: i32 = Porffor.wasm.i32.load(input, 0, 0);
   let searchStart: i32 = 0;
   if (global || sticky) {
-    searchStart = Porffor.wasm.i32.load(regexp, 0, 8);
+    searchStart = Porffor.wasm.i32.load16_u(regexp, 0, 8);
   }
 
   if (searchStart > inputLen) {
-    if (global || sticky) Porffor.wasm.i32.store(regexp, 0, 0, 8);
+    if (global || sticky) Porffor.wasm.i32.store16(regexp, 0, 0, 8);
     return null;
   }
 
@@ -919,7 +919,7 @@ export const __Porffor_regex_interpret = (regexp: RegExp, input: i32, isTest: bo
           backtrack = true;
         } else {
           const classId: i32 = Porffor.wasm.i32.load8_u(pc, 0, 1);
-          const char: i32 = Porffor.wasm.i32.load8_u(input + 4 + sp, 0, 0);
+          const char: i32 = Porffor.wasm.i32.load8_u(input + sp, 0, 4);
           let isMatch: boolean = false;
           if (classId == 1) isMatch = char >= 48 && char <= 57;
           else if (classId == 2) isMatch = !(char >= 48 && char <= 57);
@@ -948,16 +948,56 @@ export const __Porffor_regex_interpret = (regexp: RegExp, input: i32, isTest: bo
           backtrack = true;
         }
       } else if (op == 0x07) { // word boundary
-        const prevIsWord = sp > 0 && ((Porffor.wasm.i32.load8_u(input + sp, 0, 3) >= 65 && Porffor.wasm.i32.load8_u(input + sp, 0, 3) <= 90) || (Porffor.wasm.i32.load8_u(input + sp, 0, 3) >= 97 && Porffor.wasm.i32.load8_u(input + sp, 0, 3) <= 122) || (Porffor.wasm.i32.load8_u(input + sp, 0, 3) >= 48 && Porffor.wasm.i32.load8_u(input + sp, 0, 3) <= 57) || Porffor.wasm.i32.load8_u(input + sp, 0, 3) == 95);
-        const nextIsWord = sp < inputLen && ((Porffor.wasm.i32.load8_u(input + sp, 0, 4) >= 65 && Porffor.wasm.i32.load8_u(input + sp, 0, 4) <= 90) || (Porffor.wasm.i32.load8_u(input + sp, 0, 4) >= 97 && Porffor.wasm.i32.load8_u(input + sp, 0, 4) <= 122) || (Porffor.wasm.i32.load8_u(input + sp, 0, 4) >= 48 && Porffor.wasm.i32.load8_u(input + sp, 0, 4) <= 57) || Porffor.wasm.i32.load8_u(input + sp, 0, 4) == 95);
+        let prevIsWord: boolean = false;
+        if (sp > 0) {
+          const prevChar: i32 = Porffor.wasm.i32.load8_u(input + sp, 0, 3);
+          prevIsWord = Porffor.fastOr(
+            prevChar >= 65 && prevChar <= 90, // A-Z
+            prevChar >= 97 && prevChar <= 122, // a-z
+            prevChar >= 48 && prevChar <= 57, // 0-9
+            prevChar == 95 // _
+          );
+        }
+
+        let nextIsWord: boolean = false;
+        if (sp < inputLen) {
+          const nextChar: i32 = Porffor.wasm.i32.load8_u(input + sp, 0, 4);
+          nextIsWord = Porffor.fastOr(
+            nextChar >= 65 && nextChar <= 90, // A-Z
+            nextChar >= 97 && nextChar <= 122, // a-z
+            nextChar >= 48 && nextChar <= 57, // 0-9
+            nextChar == 95 // _
+          );
+        }
+
         if (prevIsWord != nextIsWord) {
           pc += 1;
         } else {
           backtrack = true;
         }
       } else if (op == 0x08) { // non-word boundary
-        const prevIsWord = sp > 0 && ((Porffor.wasm.i32.load8_u(input + sp, 0, 3) >= 65 && Porffor.wasm.i32.load8_u(input + sp, 0, 3) <= 90) || (Porffor.wasm.i32.load8_u(input + sp, 0, 3) >= 97 && Porffor.wasm.i32.load8_u(input + sp, 0, 3) <= 122) || (Porffor.wasm.i32.load8_u(input + sp, 0, 3) >= 48 && Porffor.wasm.i32.load8_u(input + sp, 0, 3) <= 57) || Porffor.wasm.i32.load8_u(input + sp, 0, 3) == 95);
-        const nextIsWord = sp < inputLen && ((Porffor.wasm.i32.load8_u(input + sp, 0, 4) >= 65 && Porffor.wasm.i32.load8_u(input + sp, 0, 4) <= 90) || (Porffor.wasm.i32.load8_u(input + sp, 0, 4) >= 97 && Porffor.wasm.i32.load8_u(input + sp, 0, 4) <= 122) || (Porffor.wasm.i32.load8_u(input + sp, 0, 4) >= 48 && Porffor.wasm.i32.load8_u(input + sp, 0, 4) <= 57) || Porffor.wasm.i32.load8_u(input + sp, 0, 4) == 95);
+        let prevIsWord: boolean = false;
+        if (sp > 0) {
+          const prevChar: i32 = Porffor.wasm.i32.load8_u(input + sp, 0, 3);
+          prevIsWord = Porffor.fastOr(
+            prevChar >= 65 && prevChar <= 90, // A-Z
+            prevChar >= 97 && prevChar <= 122, // a-z
+            prevChar >= 48 && prevChar <= 57, // 0-9
+            prevChar == 95 // _
+          );
+        }
+
+        let nextIsWord: boolean = false;
+        if (sp < inputLen) {
+          const nextChar: i32 = Porffor.wasm.i32.load8_u(input + sp, 0, 4);
+          nextIsWord = Porffor.fastOr(
+            nextChar >= 65 && nextChar <= 90, // A-Z
+            nextChar >= 97 && nextChar <= 122, // a-z
+            nextChar >= 48 && nextChar <= 57, // 0-9
+            nextChar == 95 // _
+          );
+        }
+
         if (prevIsWord == nextIsWord) {
           pc += 1;
         } else {

package/compiler/builtins/string.ts

@@ -353,11 +353,9 @@ export const __Porffor_strcat = (a: any, b: any): any => {
 };
 
 
-
 export const __String_prototype_at = (_this: string, index: number) => {
   const len: i32 = _this.length;
 
-  index |= 0;
   if (index < 0) index = len + index;
   if (Porffor.fastOr(index < 0, index >= len)) return undefined;
 
@@ -375,7 +373,6 @@ export const __String_prototype_at = (_this: string, index: number) => {
 export const __ByteString_prototype_at = (_this: bytestring, index: number) => {
   const len: i32 = _this.length;
 
-  index |= 0;
   if (index < 0) index = len + index;
   if (Porffor.fastOr(index < 0, index >= len)) return undefined;
 
@@ -393,7 +390,6 @@ export const __ByteString_prototype_at = (_this: bytestring, index: number) => {
 export const __String_prototype_charAt = (_this: string, index: number) => {
   const len: i32 = _this.length;
 
-  index |= 0;
   if (Porffor.fastOr(index < 0, index >= len)) return '';
 
   let out: string = Porffor.allocateBytes(8);
@@ -410,7 +406,6 @@ export const __String_prototype_charAt = (_this: string, index: number) => {
 export const __ByteString_prototype_charAt = (_this: bytestring, index: number) => {
   const len: i32 = _this.length;
 
-  index |= 0;
   if (Porffor.fastOr(index < 0, index >= len)) return '';
 
   let out: bytestring = Porffor.allocateBytes(8);
@@ -522,7 +517,6 @@ export const __ByteString_prototype_toLocaleLowerCase = (_this: bytestring) => _
 export const __String_prototype_codePointAt = (_this: string, index: number) => {
   const len: i32 = _this.length;
 
-  index |= 0;
   if (Porffor.fastOr(index < 0, index >= len)) return undefined;
 
   index *= 2;
@@ -545,7 +539,6 @@ export const __String_prototype_codePointAt = (_this: string, index: number) =>
 export const __ByteString_prototype_codePointAt = (_this: bytestring, index: number) => {
   const len: i32 = _this.length;
 
-  index |= 0;
   if (Porffor.fastOr(index < 0, index >= len)) return undefined;
 
   // bytestrings cannot have surrogates, so just do charCodeAt
@@ -565,7 +558,6 @@ export const __String_prototype_startsWith = (_this: string, searchString: strin
   const len: i32 = _this.length;
   if (position > 0) {
     if (position > len) position = len;
-      else position |= 0;
   } else position = 0;
 
   thisPtr += position * 2;
@@ -595,7 +587,6 @@ export const __ByteString_prototype_startsWith = (_this: bytestring, searchStrin
   const len: i32 = _this.length;
   if (position > 0) {
     if (position > len) position = len;
-      else position |= 0;
   } else position = 0;
 
   thisPtr += position;
@@ -628,7 +619,6 @@ export const __String_prototype_endsWith = (_this: string, searchString: string,
 
   if (endPosition > 0) {
     if (endPosition > len) endPosition = len;
-      else endPosition |= 0;
   } else endPosition = 0;
 
   endPosition -= searchLen;
@@ -669,7 +659,6 @@ export const __ByteString_prototype_endsWith = (_this: bytestring, searchString:
 
   if (endPosition > 0) {
     if (endPosition > len) endPosition = len;
-      else endPosition |= 0;
   } else endPosition = 0;
 
   endPosition -= searchLen;
@@ -702,7 +691,6 @@ export const __String_prototype_indexOf = (_this: string, searchString: string,
   const len: i32 = _this.length;
   if (position > 0) {
     if (position > len) position = len;
-      else position |= 0;
   } else position = 0;
 
   const thisPtrEnd: i32 = thisPtr + (len * 2) - searchLenX2;
@@ -743,7 +731,6 @@ export const __ByteString_prototype_indexOf = (_this: bytestring, searchString:
   const len: i32 = _this.length;
   if (position > 0) {
     if (position > len) position = len;
-      else position |= 0;
   } else position = 0;
 
   const thisPtrEnd: i32 = thisPtr + len - searchLen;
@@ -789,7 +776,6 @@ export const __String_prototype_lastIndexOf = (_this: string, searchString: stri
   if (position > 0) {
     const max: i32 = len - searchLen;
     if (position > max) position = max;
-      else position |= 0;
   } else position = 0;
 
   const thisPtrStart: i32 = thisPtr;
@@ -835,7 +821,6 @@ export const __ByteString_prototype_lastIndexOf = (_this: bytestring, searchStri
   if (position > 0) {
     const max: i32 = len - searchLen;
     if (position > max) position = max;
-      else position |= 0;
   } else position = 0;
 
   const thisPtrStart: i32 = thisPtr;
@@ -875,7 +860,6 @@ export const __String_prototype_includes = (_this: string, searchString: string,
   const len: i32 = _this.length;
   if (position > 0) {
     if (position > len) position = len;
-      else position |= 0;
   } else position = 0;
 
   const thisPtrEnd: i32 = thisPtr + (len * 2) - searchLenX2;
@@ -916,7 +900,6 @@ export const __ByteString_prototype_includes = (_this: bytestring, searchString:
   const len: i32 = _this.length;
   if (position > 0) {
     if (position > len) position = len;
-      else position |= 0;
   } else position = 0;
 
   const thisPtrEnd: i32 = thisPtr + len - searchLen;
@@ -952,7 +935,6 @@ export const __String_prototype_padStart = (_this: string, targetLength: number,
 
   const len: i32 = _this.length;
 
-  targetLength |= 0;
 
   const todo: i32 = targetLength - len;
   if (todo > 0) {
@@ -997,7 +979,6 @@ export const __ByteString_prototype_padStart = (_this: bytestring, targetLength:
 
   const len: i32 = _this.length;
 
-  targetLength |= 0;
 
   const todo: i32 = targetLength - len;
   if (todo > 0) {
@@ -1046,7 +1027,6 @@ export const __String_prototype_padEnd = (_this: string, targetLength: number, p
     outPtr += 2;
   }
 
-  targetLength |= 0;
 
   const todo: i32 = targetLength - len;
   if (todo > 0) {
@@ -1088,7 +1068,6 @@ export const __ByteString_prototype_padEnd = (_this: bytestring, targetLength: n
     Porffor.wasm.i32.store8(outPtr++, Porffor.wasm.i32.load8_u(thisPtr++, 0, 4), 0, 4);
   }
 
-  targetLength |= 0;
 
   const todo: i32 = targetLength - len;
   if (todo > 0) {
@@ -1123,8 +1102,6 @@ export const __String_prototype_substring = (_this: string, start: number, end:
       start = tmp;
     }
 
-  start |= 0;
-  end |= 0;
 
   if (start < 0) start = 0;
   if (start > len) start = len;
@@ -1161,8 +1138,6 @@ export const __ByteString_prototype_substring = (_this: bytestring, start: numbe
       start = tmp;
     }
 
-  start |= 0;
-  end |= 0;
 
   if (start < 0) start = 0;
   if (start > len) start = len;
@@ -1191,7 +1166,6 @@ export const __ByteString_prototype_substring = (_this: bytestring, start: numbe
 export const __String_prototype_substr = (_this: string, start: number, length: number) => {
   const len: i32 = _this.length;
 
-  start |= 0;
 
   if (start < 0) {
     start = len + start;
@@ -1200,7 +1174,6 @@ export const __String_prototype_substr = (_this: string, start: number, length:
 
   if (Porffor.wasm`local.get ${length+1}` == Porffor.TYPES.undefined) length = len - start;
 
-  length |= 0;
 
   if (start + length > len) length = len - start;
 
@@ -1228,7 +1201,6 @@ export const __String_prototype_substr = (_this: string, start: number, length:
 export const __ByteString_prototype_substr = (_this: bytestring, start: number, length: number) => {
   const len: i32 = _this.length;
 
-  start |= 0;
 
   if (start < 0) {
     start = len + start;
@@ -1237,7 +1209,6 @@ export const __ByteString_prototype_substr = (_this: bytestring, start: number,
 
   if (Porffor.wasm`local.get ${length+1}` == Porffor.TYPES.undefined) length = len - start;
 
-  length |= 0;
 
   if (start + length > len) length = len - start;
 
@@ -1264,8 +1235,6 @@ export const __String_prototype_slice = (_this: string, start: number, end: numb
   const len: i32 = _this.length;
   if (Porffor.wasm`local.get ${end+1}` == Porffor.TYPES.undefined) end = len;
 
-  start |= 0;
-  end |= 0;
 
   if (start < 0) {
     start = len + start;
@@ -1305,8 +1274,6 @@ export const __ByteString_prototype_slice = (_this: bytestring, start: number, e
   const len: i32 = _this.length;
   if (Porffor.wasm`local.get ${end+1}` == Porffor.TYPES.undefined) end = len;
 
-  start |= 0;
-  end |= 0;
 
   if (start < 0) {
     start = len + start;
@@ -1644,7 +1611,6 @@ export const __String_prototype_split = (_this: string, separator: any, limit: a
   let out: any[] = Porffor.allocate(), outLen: i32 = 0;
 
   if (Porffor.wasm`local.get ${limit+1}` == Porffor.TYPES.undefined) limit = Number.MAX_SAFE_INTEGER;
-  limit |= 0;
   if (limit < 0) limit = Number.MAX_SAFE_INTEGER;
 
   if (separator == null) {
@@ -1822,7 +1788,6 @@ i32.store8 0 12`;
   }
 
   if (Porffor.wasm`local.get ${limit+1}` == Porffor.TYPES.undefined) limit = Number.MAX_SAFE_INTEGER;
-  limit |= 0;
   if (limit < 0) limit = Number.MAX_SAFE_INTEGER;
 
   let tmp: bytestring = Porffor.allocate(), tmpLen: i32 = 0;

package/compiler/builtins/string_f64.ts

@@ -105,6 +105,58 @@ export const __String_fromCharCode = (...codes: any[]): bytestring|string => {
   return out;
 };
 
+export const __String_fromCodePoint = (...codePoints: any[]): string => {
+  let out: string = Porffor.allocate();
+
+  const len: i32 = codePoints.length;
+  let outLength: i32 = 0;
+
+  for (let i: i32 = 0; i < len; i++) {
+    const codepoint: number = ecma262.ToNumber(codePoints[i]);
+
+    if (codepoint != (codepoint | 0)) {
+      throw new RangeError('Invalid code point');
+    }
+
+    // Check if code point is valid (0 to 0x10FFFF)
+    if (Porffor.fastOr(codepoint < 0, codepoint > 0x10FFFF)) {
+      throw new RangeError('Invalid code point');
+    }
+
+    if (codepoint <= 0xFFFF) {
+      // BMP code point - single 16-bit unit
+      outLength++;
+    } else {
+      // Supplementary code point - surrogate pair (2 units)
+      outLength += 2;
+    }
+  }
+
+  out.length = outLength;
+  let outIndex: i32 = 0;
+
+  for (let i: i32 = 0; i < len; i++) {
+    const codepoint: number = ecma262.ToNumber(codePoints[i]);
+
+    if (codepoint <= 0xFFFF) {
+      // BMP code point
+      Porffor.wasm.i32.store16(Porffor.wasm`local.get ${out}` + outIndex * 2, codepoint, 0, 4);
+      outIndex++;
+    } else {
+      // Supplementary code point - encode as surrogate pair
+      const cpMinusBase: i32 = codepoint - 0x10000;
+      const highSurrogate: i32 = 0xD800 + (cpMinusBase >> 10);
+      const lowSurrogate: i32 = 0xDC00 + (cpMinusBase & 0x3FF);
+
+      Porffor.wasm.i32.store16(Porffor.wasm`local.get ${out}` + outIndex * 2, highSurrogate, 0, 4);
+      Porffor.wasm.i32.store16(Porffor.wasm`local.get ${out}` + outIndex * 2, lowSurrogate, 0, 6);
+      outIndex += 2;
+    }
+  }
+
+  return out;
+};
+
 // in f64 file as returns NaN which returns 0 in i32
 export const __String_prototype_charCodeAt = (_this: string, index: number) => {
   const len: i32 = _this.length;
@@ -122,4 +174,49 @@ export const __ByteString_prototype_charCodeAt = (_this: bytestring, index: numb
   if (Porffor.fastOr(index < 0, index >= len)) return NaN;
 
   return Porffor.wasm.i32.load8_u(Porffor.wasm`local.get ${_this}` + index, 0, 4);
+};
+
+// 22.1.2.4 String.raw ( template, ...substitutions )
+// https://tc39.es/ecma262/#sec-string.raw
+export const __String_raw = (template: any, ...substitutions: any[]): string => {
+  // 1. Let substitutionCount be the number of elements in substitutions.
+  const substitutionCount: i32 = substitutions.length;
+
+  // 2. Let cooked be ? ToObject(template).
+  // 3. Let literals be ? ToObject(? Get(cooked, "raw")).
+  const literals: any = template.raw;
+
+  // 4. Let literalCount be ? LengthOfArrayLike(literals).
+  const literalCount: number = ecma262.ToIntegerOrInfinity(Porffor.type(literals) == Porffor.TYPES.object ? (literals as object)['length'] : literals.length);
+
+  // 5. If literalCount ≤ 0, return the empty String.
+  if (literalCount <= 0) return '';
+
+  // 6. Let R be the empty String.
+  let R: string = '';
+
+  // 7. Let nextIndex be 0.
+  let nextIndex: i32 = 0;
+
+  // 8. Repeat,
+  while (true) {
+    // a. Let nextLiteralVal be ? Get(literals, ! ToString(𝔽(nextIndex))).
+    // b. Let nextLiteral be ? ToString(nextLiteralVal).
+    // c. Set R to the string-concatenation of R and nextLiteral.
+    R = __Porffor_concatStrings(R, literals[nextIndex]);
+
+    // d. If nextIndex + 1 = literalCount, return R.
+    if (nextIndex + 1 == literalCount) return R;
+
+    // e. If nextIndex < substitutionCount, then
+    if (nextIndex < substitutionCount) {
+      // i. Let nextSubVal be substitutions[nextIndex].
+      // ii. Let nextSub be ? ToString(nextSubVal).
+      // iii. Set R to the string-concatenation of R and nextSub.
+      R = __Porffor_concatStrings(R, substitutions[nextIndex]);
+    }
+
+    // f. Set nextIndex to nextIndex + 1.
+    nextIndex += 1;
+  }
 };

package/compiler/builtins.js

@@ -5,8 +5,11 @@ import { TYPES, TYPE_NAMES } from './types.js';
 import { number, unsignedLEB128 } from './encoding.js';
 import './prefs.js';
 
-export const importedFuncs = {};
-Object.defineProperty(importedFuncs, 'length', { configurable: true, writable: true, value: 0 });
+export let importedFuncs;
+export const setImports = (v = null) => {
+  importedFuncs = v ?? { length: 0 };
+};
+setImports();
 
 /**
  * Create an import function for the Porffor world to use.
@@ -18,51 +21,41 @@ Object.defineProperty(importedFuncs, 'length', { configurable: true, writable: t
  * @param {string} c - C source code to compile as import implementation
  */
 export const createImport = (name, params, returns, js = null, c = null) => {
-  const lazy = () => {
-    if (typeof params === 'function') params = params();
-    if (typeof returns === 'function') returns = returns();
-    if (typeof params === 'number') params = new Array(params).fill(valtypeBinary);
-    if (typeof returns === 'number') returns = new Array(returns).fill(valtypeBinary);
-  };
+  if (!globalThis.valtypeBinary) {
+    globalThis.valtype ??= Prefs.valtype ?? 'f64';
+    globalThis.valtypeBinary = Valtype[valtype];
+  }
+
+  if (typeof params === 'number') params = new Array(params).fill(valtypeBinary);
+  if (typeof returns === 'number') returns = new Array(returns).fill(valtypeBinary);
 
   if (name in importedFuncs) {
     // overwrite existing import
     const existing = importedFuncs[name];
-    lazy();
-
-    existing.params = params;
-    existing.returns = returns;
-    existing.js = js;
-    existing.c = c;
+    const call = +existing;
+    const replacement = new Number(call);
+    replacement.name = name;
+    replacement.import = existing.import;
+    replacement.params = params;
+    replacement.returns = returns;
+    replacement.js = js;
+    replacement.c = c;
+
+    importedFuncs[name] = replacement;
     return;
   }
 
   const call = importedFuncs.length;
   const ident = String.fromCharCode(97 + importedFuncs.length);
-  let obj;
-  const get = () => {
-    if (obj) return obj;
-    lazy();
-
-    obj = new Number(call);
-    obj.name = name;
-    obj.import = ident;
-    obj.params = params;
-    obj.returns = returns;
-    obj.js = js;
-    obj.c = c;
-    return obj;
-  };
 
-  Object.defineProperty(importedFuncs, name, {
-    get,
-    configurable: true,
-    enumerable: true
-  });
-  Object.defineProperty(importedFuncs, call, {
-    get,
-    configurable: true
-  });
+  const obj = importedFuncs[name] = importedFuncs[call] = new Number(call);
+  obj.name = name;
+  obj.import = ident;
+  obj.params = params;
+  obj.returns = returns;
+  obj.js = js;
+  obj.c = c;
+
   importedFuncs.length = call + 1;
 };