porffor 0.57.8 → 0.57.10

package/compiler/builtins.js

@@ -9,18 +9,31 @@ export const importedFuncs = {};
 Object.defineProperty(importedFuncs, 'length', { configurable: true, writable: true, value: 0 });
 
 export const createImport = (name, params, returns, js = null, c = null) => {
-  if (name in importedFuncs) return false;
+  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 (name in importedFuncs) {
+    // overwrite existing import
+    const existing = importedFuncs[name];
+    lazy();
+
+    existing.params = params;
+    existing.returns = returns;
+    existing.js = js;
+    existing.c = c;
+    return;
+  }
 
   const call = importedFuncs.length;
   const ident = String.fromCharCode(97 + importedFuncs.length);
   let obj;
   const get = () => {
     if (obj) return obj;
-
-    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);
+    lazy();
 
     obj = new Number(call);
     obj.name = name;

package/compiler/codegen.js

@@ -2703,7 +2703,7 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
 
   if (
     func?.returns?.length === 0 ||
-    (idx === importedFuncs[name] && importedFuncs[importedFuncs[name]]?.returns === 0)
+    (idx === importedFuncs[name] && importedFuncs[importedFuncs[name]]?.returns?.length === 0)
   ) {
     out.push(number(UNDEFINED));
   }
@@ -5750,7 +5750,7 @@ const generateMember = (scope, decl, _global, _name) => {
       if (func) return withType(scope, [ number(countLength(func, name)) ], TYPES.number);
 
       if (Object.hasOwn(builtinFuncs, name)) return withType(scope, [ number(countLength(builtinFuncs[name], name)) ], TYPES.number);
-      if (Object.hasOwn(importedFuncs, name)) return withType(scope, [ number(importedFuncs[name].params.length ?? importedFuncs[name].params) ], TYPES.number);
+      if (Object.hasOwn(importedFuncs, name)) return withType(scope, [ number(importedFuncs[name].params.length) ], TYPES.number);
       if (Object.hasOwn(internalConstrs, name)) return withType(scope, [ number(internalConstrs[name].length ?? 0) ], TYPES.number);
     }
 

package/compiler/disassemble.js

@@ -102,8 +102,8 @@ export default (wasm, name = '', ind = 0, locals = {}, params = [], returns = []
       const callFunc = funcs.find(x => x.index === idx);
       if (callFunc) out += ` ;; $${callFunc.name} ${makeSignature(callFunc.params, callFunc.returns)}`;
       if (globalThis.importFuncs && idx < importFuncs.length) {
-        const importFunc = importFuncs[idx];
-        out += ` ;; import ${importFunc.name} ${makeSignature(typeof importFunc.params === 'object' ? importFunc.params : new Array(importFunc.params).fill(valtypeBinary), new Array(importFunc.returns).fill(valtypeBinary),)}`;
+        const importFunc = globalThis.importFuncs[idx];
+        out += ` ;; import ${importFunc.name} ${makeSignature(importFunc.params, importFunc.returns)}`;
       }
     }
 

package/compiler/wrap.js

@@ -383,21 +383,6 @@ export default (source, module = undefined, customImports = {}, print = str => p
 
   for (const x in customImports) {
     const custom = customImports[x];
-
-    if (x in importedFuncs) {
-      // overwrite with user custom import
-      const existing = importedFuncs[x];
-      if (typeof custom === 'function') {
-        existing.js = custom;
-      } else {
-        existing.params = custom.params;
-        existing.returns = custom.returns;
-        existing.js = custom.js;
-        existing.c = custom.c;
-      }
-      continue;
-    }
-
     // todo: make a simpler api for just js functions at some point using function.length etc
     createImport(x, custom.params, custom.returns, custom.js, custom.c);
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "porffor",
   "description": "An ahead-of-time JavaScript compiler",
-  "version": "0.57.8",
+  "version": "0.57.10",
   "author": "Oliver Medhurst <honk@goose.icu>",
   "license": "MIT",
   "scripts": {},

package/runtime/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import fs from 'node:fs';
-globalThis.version = '0.57.8';
+globalThis.version = '0.57.10';
 
 // deno compat
 if (typeof process === 'undefined' && typeof Deno !== 'undefined') {