porffor 0.55.4 → 0.55.6

package/compiler/codegen.js

@@ -2134,12 +2134,13 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
         funcs.push(func);
       }
 
+      const arg = decl.arguments[0] ?? DEFAULT_VALUE();
       const idx = funcIndex[rhemynName];
       return [
         // make string arg
-        ...generate(scope, decl.arguments[0]),
+        ...generate(scope, arg),
         Opcodes.i32_to_u,
-        ...getNodeType(scope, decl.arguments[0]),
+        ...getNodeType(scope, arg),
 
         // call regex func
         [ Opcodes.call, idx ],
@@ -2150,7 +2151,6 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
     }
 
     protoName = decl.callee.property.name;
-
     target = decl.callee.object;
   }
 
@@ -2163,6 +2163,7 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
         type: 'CallExpression',
         callee: target,
         arguments: decl.arguments.slice(1),
+        optional: decl.optional,
         _thisWasm: [
           ...generate(scope, decl.arguments[0] ?? DEFAULT_VALUE()),
           [ Opcodes.local_tee, valTmp ],
@@ -2269,6 +2270,7 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
 
         protoBC[type] = () => generate(scope, {
           type: 'CallExpression',
+          optional: decl.optional,
           callee: {
             type: 'Identifier',
             name: x
@@ -2370,7 +2372,8 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
           ...protoBC,
 
           // TODO: error better
-          default: internalThrow(scope, 'TypeError', `'${protoName}' proto func tried to be called on a type without an impl`, !unusedValue)
+          default: decl.optional ? withType(scope, [ number(UNDEFINED) ], TYPES.undefined)
+            : internalThrow(scope, 'TypeError', `'${protoName}' proto func tried to be called on a type without an impl`, !unusedValue)
         }, unusedValue ? Blocktype.void : valtypeBinary),
         ...(unusedValue ? [ number(UNDEFINED) ] : [])
       ];
@@ -2392,7 +2395,8 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
           ...protoBC,
 
           // TODO: error better
-          default: def
+          default: decl.optional ? withType(scope, [ number(UNDEFINED) ], TYPES.undefined)
+            : def
         }, valtypeBinary)
       ];
     }
@@ -2580,7 +2584,8 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
           ...setLastType(scope)
         ],
 
-        default: internalThrow(scope, 'TypeError', `${unhackName(name)} is not a function`, Valtype.f64)
+        default: decl.optional ? withType(scope, [ number(UNDEFINED) ], TYPES.undefined)
+          : internalThrow(scope, 'TypeError', `${unhackName(name)} is not a function`, Valtype.f64)
       }, Valtype.f64),
       ...(valtypeBinary === Valtype.i32 && scope.returns[0] !== Valtype.f64 ? [ [ Opcodes.f64_convert_i32_s ] ] : [])
     ];
@@ -3180,7 +3185,7 @@ const setDefaultFuncName = (decl, name) => {
   if (decl.type === 'ClassExpression') {
     // check if it has a name definition
     for (const x of decl.body.body) {
-      if (x.key.name === 'name') return;
+      if (x.static && x.key.name === 'name') return;
     }
   }
 
@@ -3258,7 +3263,7 @@ const generateVarDstr = (scope, kind, pattern, init, defaultValue, global) => {
       const [ _func, out ] = generateFunc(scope, init, true);
 
       const funcName = init.id?.name;
-      if (name !== funcName) {
+      if (name !== funcName && funcIndex[funcName]) {
         funcIndex[name] = funcIndex[funcName];
         delete funcIndex[funcName];
       }

package/compiler/wrap.js

@@ -537,7 +537,7 @@ export default (source, module = undefined, customImports = {}, print = str => p
   }
 
   if (Prefs.disassemble) {
-    return { exports, wasm, times, disams: funcs.map(x => disassemble(x.wasm, x.name, x.index, x.locals, x.params, x.returns, funcs, globals, exceptions)), c };
+    return { exports, wasm, times, disasms: funcs.map(x => disassemble(x.wasm, x.name, x.index, x.locals, x.params, x.returns, funcs, globals, exceptions)), c };
   }
 
   return { exports, wasm, times, pages, c };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "porffor",
   "description": "a basic experimental wip aot optimizing js -> wasm engine/compiler/runtime in js",
-  "version": "0.55.4",
+  "version": "0.55.6",
   "author": "CanadaHonk",
   "license": "MIT",
   "scripts": {},

package/r.js

@@ -1,2 +1,6 @@
-function print() {}
-print();
+const a = {
+    b() { return this._b; },
+    _b: { c: 42 }
+};
+
+console.log((a?.b)())

package/runner/index.js

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