porffor 0.50.28 → 0.55.0

package/compiler/builtins/error.js

@@ -1,7 +1,10 @@
 export default () => {
   let out = '';
 
-  const error = name => out += `export const ${name} = function (message: any) {
+  const errors = [];
+  const error = name => {
+    errors.push(name);
+    out += `export const ${name} = function (message: any) {
   if (message === undefined) message = '';
     else message = ecma262.ToString(message);
 
@@ -25,6 +28,7 @@ export const __${name}_prototype_toString = (_this: ${name}) => {
 
   return obj.name + ': ' + message;
 };`;
+  };
 
   error('Error');
   error('AggregateError');
@@ -38,7 +42,12 @@ export const __${name}_prototype_toString = (_this: ${name}) => {
   error('Test262Error');
   error('TodoError');
 
-  out += `\nexport const __Test262Error_thrower = message => { throw new Test262Error(message); };`;
+  out += `
+export const __Test262Error_thrower = message => {
+  throw new Test262Error(message);
+};
+
+export const __Error_isError = (x: unknown): boolean => Porffor.fastOr(${errors.map(x => `Porffor.rawType(x) == Porffor.TYPES.${x.toLowerCase()}`).join(', ')});`;
 
   return out;
 };

package/compiler/builtins/function.ts

@@ -14,4 +14,9 @@ export const __Function_prototype_toLocaleString = (_this: Function) => __Functi
 export const __Function_prototype_apply = (_this: Function, thisArg: any, argsArray: any) => {
   argsArray = Array.from(argsArray ?? []);
   return Reflect.apply(_this, thisArg, argsArray);
+};
+
+export const __Function_prototype_bind = (_this: Function, thisArg: any, argsArray: any) => {
+  // todo: no good way to bind without dynamic functions or closure yet, just return function
+  return _this;
 };

package/compiler/builtins_precompiled.js

@@ -1691,6 +1691,11 @@ params:[124,127],typedParams:1,returns:[124,127],typedReturns:1,
 locals:[],localNames:["message","message#type"],
 usesTag:1,
 }
+this.__Error_isError = {
+wasm:()=>[[32,1],[184],[68,40],[97],[32,1],[184],[68,41],[97],[114],[32,1],[184],[68,42],[97],[114],[32,1],[184],[68,43],[97],[114],[32,1],[184],[68,44],[97],[114],[32,1],[184],[68,45],[97],[114],[32,1],[184],[68,46],[97],[114],[32,1],[184],[68,47],[97],[114],[32,1],[184],[68,48],[97],[114],[32,1],[184],[68,49],[97],[114],[184],[65,2],[15]],
+params:[124,127],typedParams:1,returns:[124,127],typedReturns:1,
+locals:[],localNames:["x","x#type"],
+}
 this.escape = {
 wasm:(_,{i32ify,makeString,builtin})=>[...i32ify(makeString(_,"\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0001\\u0001\\u0000\\u0001\\u0001\\u0001\\u0001\\u0001\\u0001\\u0001\\u0001\\u0001\\u0001\\u0001\\u0001\\u0001\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0001\\u0001\\u0001\\u0001\\u0001\\u0001\\u0001\\u0001\\u0001\\u0001\\u0001\\u0001\\u0001\\u0001\\u0001\\u0001\\u0001\\u0001\\u0001\\u0001\\u0001\\u0001\\u0001\\u0001\\u0001\\u0001\\u0001\\u0000\\u0000\\u0000\\u0000\\u0001\\u0000\\u0001\\u0001\\u0001\\u0001\\u0001\\u0001\\u0001\\u0001\\u0001\\u0001\\u0001\\u0001\\u0001\\u0001\\u0001\\u0001\\u0001\\u0001\\u0001\\u0001\\u0001\\u0001\\u0001\\u0001\\u0001\\u0001\\u0000\\u0000\\u0000\\u0000\\u0000",1)),[33,2],[32,0],[40,1,0],[34,3],[33,4],[32,0],[33,5],[32,1],[65,195,1],[70],[4,64],[32,5],[32,3],[106],[33,6],[3,64],[32,5],[32,6],[72],[4,64],[32,5],[32,5],[65,1],[106],[33,5],[45,0,4],[34,7],[65,128,1],[72],[4,64],[32,2],[32,7],[106],[45,0,4],[4,64],[12,3],[26],[11],[11],[32,4],[65,2],[106],[33,4],[12,1],[11],[11],[32,4],[32,3],[70],[4,64],[32,0],[32,1],[15],[26],[11],[16,builtin('__Porffor_allocate')],[34,8],[32,4],[54,1,0],[32,0],[33,5],[32,8],[33,9],[3,64],[32,5],[32,6],[72],[4,64],[32,5],[32,5],[65,1],[106],[33,5],[45,0,4],[34,7],[65,128,1],[72],[4,64],[32,2],[32,7],[106],[45,0,4],[4,64],[32,9],[32,9],[65,1],[106],[33,9],[32,7],[58,0,4],[12,3],[26],[11],[11],[32,9],[32,9],[65,1],[106],[33,9],[65,37],[58,0,4],[32,7],[65,15],[113],[65,48],[106],[34,10],[65,57],[74],[4,64],[32,10],[65,7],[106],[33,10],[11],[32,7],[65,4],[117],[65,48],[106],[34,11],[65,57],[74],[4,64],[32,11],[65,7],[106],[33,11],[11],[32,9],[32,9],[65,1],[106],[33,9],[32,11],[58,0,4],[32,9],[32,9],[65,1],[106],[33,9],[32,10],[58,0,4],[12,1],[11],[11],[32,8],[65,195,1],[15],[26],[11],[32,5],[32,3],[65,2],[108],[106],[33,6],[3,64],[32,5],[32,6],[72],[4,64],[32,5],[47,0,4],[33,7],[32,5],[65,2],[106],[33,5],[32,7],[65,128,1],[72],[4,64],[32,2],[32,7],[106],[45,0,4],[4,64],[12,3],[26],[11],[11],[32,7],[65,128,2],[72],[4,64],[32,4],[65,2],[106],[33,4],[5],[32,4],[65,5],[106],[33,4],[11],[12,1],[11],[11],[32,4],[32,3],[70],[4,64],[32,0],[32,1],[15],[26],[11],[16,builtin('__Porffor_allocate')],[34,8],[32,4],[54,1,0],[32,0],[33,5],[32,8],[33,9],[3,64],[32,5],[32,6],[72],[4,64],[32,5],[47,0,4],[33,7],[32,5],[65,2],[106],[33,5],[32,7],[65,128,1],[72],[4,64],[32,2],[32,7],[106],[45,0,4],[4,64],[32,9],[32,9],[65,1],[106],[33,9],[32,7],[58,0,4],[12,3],[26],[11],[11],[32,7],[65,128,2],[72],[4,64],[32,9],[32,9],[65,1],[106],[33,9],[65,37],[58,0,4],[32,7],[65,15],[113],[65,48],[106],[34,10],[65,57],[74],[4,64],[32,10],[65,7],[106],[33,10],[11],[32,7],[65,4],[117],[65,48],[106],[34,11],[65,57],[74],[4,64],[32,11],[65,7],[106],[33,11],[11],[32,9],[32,9],[65,1],[106],[33,9],[32,11],[58,0,4],[32,9],[32,9],[65,1],[106],[33,9],[32,10],[58,0,4],[5],[32,9],[65,165,234,1],[59,0,4],[32,9],[65,2],[106],[33,9],[32,7],[65,12],[117],[65,15],[113],[65,48],[106],[34,12],[65,57],[74],[4,64],[32,12],[65,7],[106],[33,12],[11],[32,9],[32,9],[65,1],[106],[33,9],[32,12],[58,0,4],[32,7],[65,8],[117],[65,15],[113],[65,48],[106],[34,12],[65,57],[74],[4,64],[32,12],[65,7],[106],[33,12],[11],[32,9],[32,9],[65,1],[106],[33,9],[32,12],[58,0,4],[32,7],[65,4],[117],[65,15],[113],[65,48],[106],[34,12],[65,57],[74],[4,64],[32,12],[65,7],[106],[33,12],[11],[32,9],[32,9],[65,1],[106],[33,9],[32,12],[58,0,4],[32,7],[65,15],[113],[65,48],[106],[34,12],[65,57],[74],[4,64],[32,12],[65,7],[106],[33,12],[11],[32,9],[32,9],[65,1],[106],[33,9],[32,12],[58,0,4],[11],[12,1],[11],[11],[32,8],[65,195,1],[15]],
 params:[127,127],typedParams:1,returns:[127,127],typedReturns:1,
@@ -1717,6 +1722,12 @@ locals:[124,124,127,127],localNames:["_this","_this#type","thisArg","thisArg#typ
 usedTypes:[80],
 usesTag:1,
 }
+this.__Function_prototype_bind = {
+wasm:(_,{internalThrow})=>[[32,1],[65,6],[71],[4,64],...internalThrow(_,'TypeError',`Function.prototype.bind expects 'this' to be a Function`),[11],[32,0],[65,6],[15]],
+params:[124,127,124,127,124,127],typedParams:1,returns:[124,127],typedReturns:1,
+locals:[],localNames:["_this","_this#type","thisArg","thisArg#type","argsArray","argsArray#type"],
+usesTag:1,
+}
 this.__Porffor_Generator = {
 wasm:()=>[[32,0],[34,2],[65,50],[15]],
 params:[124,127],typedParams:1,returns:[124,127],typedReturns:1,

package/compiler/codegen.js

@@ -492,6 +492,11 @@ const lookup = (scope, name, failEarly = false) => {
       if (parentLookup != null) return [ number(UNDEFINED) ];
     }
 
+    if (scope.name === name) {
+      // fallback for own func but with a different var/id name
+      return funcRef(funcByIndex(scope.index));
+    }
+
     if (failEarly) return null;
 
     return [ [ null, () => hoistLookup(scope, name), 1 ] ];
@@ -514,6 +519,18 @@ const generateIdent = (scope, decl) => {
 const generateYield = (scope, decl) => {
   const arg = decl.argument ?? DEFAULT_VALUE();
 
+  if (!scope.generator) {
+    // todo: access upper-scoped generator
+    return [
+      ...generate(scope, arg),
+      [ Opcodes.drop ],
+
+      // use undefined as yield expression value
+      number(0),
+      ...setLastType(scope, TYPES.undefined)
+    ];
+  }
+
   // just support a single yield like a return for now
   return [
     // return value in generator
@@ -2419,6 +2436,9 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
   let idx;
   if (Object.hasOwn(funcIndex, name)) {
     idx = funcIndex[name];
+  } else if (scope.name === name) {
+    // fallback for own func but with a different var/id name
+    idx = scope.index;
   } else if (Object.hasOwn(importedFuncs, name)) {
     idx = importedFuncs[name];
     scope.usesImports = true;
@@ -3234,18 +3254,23 @@ const generateVarDstr = (scope, kind, pattern, init, defaultValue, global) => {
 
   const topLevel = scope.name === '#main';
   if (pattern.type === 'Identifier') {
-    let out = [];
     const name = pattern.name;
 
     hoist(scope, name, kind === 'var' ? 1 : 2, global);
 
     if (init && isFuncType(init.type)) {
-      // hack for let a = function () { ... }
-      if (!init.id) {
-        setDefaultFuncName(init, name);
-        generateFunc(scope, init, true);
-        return out;
+      // opt: make decl with func expression like declaration
+      setDefaultFuncName(init, name);
+      const [ _func, out ] = generateFunc(scope, init, true);
+
+      const funcName = init.id?.name;
+      if (name !== funcName) {
+        funcIndex[name] = funcIndex[funcName];
+        delete funcIndex[funcName];
       }
+
+      out.push([ Opcodes.drop ]);
+      return out;
     }
 
     if (defaultValue && isFuncType(defaultValue.type)) {
@@ -3253,6 +3278,7 @@ const generateVarDstr = (scope, kind, pattern, init, defaultValue, global) => {
       setDefaultFuncName(defaultValue, name);
     }
 
+    let out = [];
     if (topLevel && Object.hasOwn(builtinVars, name)) {
       // cannot redeclare
       if (kind !== 'var') return internalThrow(scope, 'SyntaxError', `Identifier '${unhackName(name)}' has already been declared`);
@@ -3611,23 +3637,6 @@ const generateAssign = (scope, decl, _global, _name, valueUnused = false) => {
   const { type, name } = decl.left;
   const [ local, isGlobal ] = lookupName(scope, name);
 
-  // if (isFuncType(decl.right.type)) {
-  //   // hack for a = function () { ... }
-  //   decl.right.id = { name };
-
-  //   const func = generateFunc(scope, decl.right);
-
-  //   return [
-  //     number(func.index - importedFuncs.length),
-  //     ...(local != null ? [
-  //       [ isGlobal ? Opcodes.global_set : Opcodes.local_set, local.idx ],
-  //       [ isGlobal ? Opcodes.global_get : Opcodes.local_get, local.idx ],
-
-  //       ...setType(scope, name, TYPES.function)
-  //     ] : [])
-  //   ];
-  // }
-
   const op = decl.operator.slice(0, -1) || '=';
 
   // hack: .length setter
@@ -5299,7 +5308,7 @@ const generateMeta = (scope, decl) => {
       [ Opcodes.local_get, scope.locals['#newtarget'].idx ]
     ];
 
-    // not constructor so does not exist, return undefined
+    // todo: access upper-scoped new.target
     return [ number(UNDEFINED) ];
   }
 
@@ -5679,6 +5688,9 @@ const generateMember = (scope, decl, _global, _name) => {
 
   // hack: .name
   if (decl.property.name === 'name' && hasFuncWithName(name) && !scope.noFastFuncMembers) {
+    // function name can mismatch variable/access name
+    name = funcByName(name)?.name ?? name;
+
     // eg: __String_prototype_toLowerCase -> toLowerCase
     if (name.startsWith('__')) name = name.split('_').pop();
     if (name.startsWith('#')) name = '';

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.50.28",
+  "version": "0.55.0",
   "author": "CanadaHonk",
   "license": "MIT",
   "scripts": {},

package/runner/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import fs from 'node:fs';
-globalThis.version = '0.50.28';
+globalThis.version = '0.55.0';
 
 // deno compat
 if (typeof process === 'undefined' && typeof Deno !== 'undefined') {
@@ -162,7 +162,7 @@ if (process.argv.length >= 4) {
   }
 }
 
-if (file.startsWith('https://')) { // https only :)
+if (file && file.startsWith('https://')) { // https only :)
   // rce warning, make user confirm (disabled)
   // const rl = (await import('readline')).createInterface({ input: process.stdin, output: process.stdout });
   // const ans = await new Promise(resolve => rl.question(`\u001b[1mAre you sure you want to download this URL:\u001b[0m ${file} (y/n)? `, ans => {