porffor 0.57.9 → 0.57.11

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/precompile.js

@@ -1,8 +1,14 @@
 import { Opcodes, Valtype } from './wasmSpec.js';
 import { read_signedLEB128 } from './encoding.js';
 import { TYPES, TYPE_NAMES } from './types.js';
+import { createImport } from './builtins.js';
 import { log } from './log.js';
 
+createImport('print', 1, 0);
+createImport('printChar', 1, 0);
+createImport('time', 0, 1);
+createImport('timeOrigin', 0, 1);
+
 import process from 'node:process';
 globalThis.process = process;
 

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.9",
+  "version": "0.57.11",
   "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.9';
+globalThis.version = '0.57.11';
 
 // deno compat
 if (typeof process === 'undefined' && typeof Deno !== 'undefined') {