porffor 0.39.2 → 0.40.0

package/compiler/builtins/promise.ts

@@ -94,7 +94,7 @@ export const __ecma262_RejectPromise = (promise: any[], reason: any): void => {
 
 export const __Porffor_promise_noop = () => {};
 
-export const __Porffor_promise_resolve = (promise: any, value: any): any => {
+export const __Porffor_promise_resolve = (value: any, promise: any): any => {
   // todo: if value is own promise, reject with typeerror
 
   if (__ecma262_IsPromise(value)) {
@@ -106,7 +106,7 @@ export const __Porffor_promise_resolve = (promise: any, value: any): any => {
   return undefined;
 };
 
-export const __Porffor_promise_reject = (promise: any, reason: any): any => {
+export const __Porffor_promise_reject = (reason: any, promise: any): any => {
   if (__ecma262_IsPromise(reason)) {
     // todo
   } else {
@@ -181,8 +181,8 @@ export const __Porffor_promise_runJobs = () => {
 
 // hack: cannot share scope so use a global
 let activePromise: any;
-export const __Porffor_promise_resolveActive = (value: any) => __Porffor_promise_resolve(activePromise, value);
-export const __Porffor_promise_rejectActive = (reason: any) => __Porffor_promise_reject(activePromise, reason);
+export const __Porffor_promise_resolveActive = (value: any) => __Porffor_promise_resolve(value, activePromise);
+export const __Porffor_promise_rejectActive = (reason: any) => __Porffor_promise_reject(reason, activePromise);
 
 export const Promise = function (executor: any): void {
   if (!new.target) throw new TypeError("Constructor Promise requires 'new'");
@@ -191,7 +191,13 @@ export const Promise = function (executor: any): void {
   const obj: any[] = __Porffor_promise_create();
 
   activePromise = obj;
-  executor(__Porffor_promise_resolveActive, __Porffor_promise_rejectActive);
+
+  try {
+    executor(__Porffor_promise_resolveActive, __Porffor_promise_rejectActive);
+  } catch (e) {
+    // executor threw, reject promise
+    __ecma262_RejectPromise(obj, e);
+  }
 
   const pro: Promise = obj;
   return pro;
@@ -200,7 +206,7 @@ export const Promise = function (executor: any): void {
 export const __Promise_resolve = (value: any): Promise => {
   const obj: any[] = __Porffor_promise_create();
 
-  __Porffor_promise_resolve(obj, value);
+  __Porffor_promise_resolve(value, obj);
 
   const pro: Promise = obj;
   return pro;
@@ -209,7 +215,7 @@ export const __Promise_resolve = (value: any): Promise => {
 export const __Promise_reject = (reason: any): Promise => {
   const obj: any[] = __Porffor_promise_create();
 
-  __Porffor_promise_reject(obj, reason);
+  __Porffor_promise_reject(reason, obj);
 
   const pro: Promise = obj;
   return pro;
@@ -431,6 +437,5 @@ export const __Porffor_promise_await = (value: any) => {
   if (state == 1) return result;
 
   // rejected
-  // todo: throw result instead of fixed error here
-  throw Error('Uncaught await promise rejection');
+  throw result;
 };

package/compiler/builtins_precompiled.js

@@ -2053,14 +2053,14 @@ params:[],typedParams:1,returns:[124,127],typedReturns:1,
 locals:[],localNames:[],
 };
 this.__Porffor_promise_resolve = {
-wasm:(_,{t,builtin})=>[[32,2],[32,3],[16,builtin('__ecma262_IsPromise')],[33,4],[33,5],[32,4],[33,6],[2,127],...t([67,195],()=>[[32,6],[65,195,0],[70],[32,6],[65,195,1],[70],[114],[4,64],[32,5],[252,3],[40,1,0],[12,1],[11]]),[32,5],[252,3],[11],[4,64],[5],[32,0],[32,1],[32,2],[32,3],[16,builtin('__ecma262_FulfillPromise')],[33,4],[26],[11],[68,0],[65,128,1],[15]],
+wasm:(_,{t,builtin})=>[[32,0],[32,1],[16,builtin('__ecma262_IsPromise')],[33,4],[33,5],[32,4],[33,6],[2,127],...t([67,195],()=>[[32,6],[65,195,0],[70],[32,6],[65,195,1],[70],[114],[4,64],[32,5],[252,3],[40,1,0],[12,1],[11]]),[32,5],[252,3],[11],[4,64],[5],[32,2],[32,3],[32,0],[32,1],[16,builtin('__ecma262_FulfillPromise')],[33,4],[26],[11],[68,0],[65,128,1],[15]],
 params:[124,127,124,127],typedParams:1,returns:[124,127],typedReturns:1,
-locals:[127,124,127],localNames:["promise","promise#type","value","value#type","#last_type","#logicinner_tmp","#typeswitch_tmp1"],
+locals:[127,124,127],localNames:["value","value#type","promise","promise#type","#last_type","#logicinner_tmp","#typeswitch_tmp1"],
 };
 this.__Porffor_promise_reject = {
-wasm:(_,{t,builtin})=>[[32,2],[32,3],[16,builtin('__ecma262_IsPromise')],[33,4],[33,5],[32,4],[33,6],[2,127],...t([67,195],()=>[[32,6],[65,195,0],[70],[32,6],[65,195,1],[70],[114],[4,64],[32,5],[252,3],[40,1,0],[12,1],[11]]),[32,5],[252,3],[11],[4,64],[5],[32,0],[32,1],[32,2],[32,3],[16,builtin('__ecma262_RejectPromise')],[33,4],[26],[11],[68,0],[65,128,1],[15]],
+wasm:(_,{t,builtin})=>[[32,0],[32,1],[16,builtin('__ecma262_IsPromise')],[33,4],[33,5],[32,4],[33,6],[2,127],...t([67,195],()=>[[32,6],[65,195,0],[70],[32,6],[65,195,1],[70],[114],[4,64],[32,5],[252,3],[40,1,0],[12,1],[11]]),[32,5],[252,3],[11],[4,64],[5],[32,2],[32,3],[32,0],[32,1],[16,builtin('__ecma262_RejectPromise')],[33,4],[26],[11],[68,0],[65,128,1],[15]],
 params:[124,127,124,127],typedParams:1,returns:[124,127],typedReturns:1,
-locals:[127,124,127],localNames:["promise","promise#type","reason","reason#type","#last_type","#logicinner_tmp","#typeswitch_tmp1"],
+locals:[127,124,127],localNames:["reason","reason#type","promise","promise#type","#last_type","#logicinner_tmp","#typeswitch_tmp1"],
 };
 this.__Porffor_promise_create = {
 wasm:(_,{builtin})=>[[65,192,0],[16,builtin('__Porffor_allocateBytes')],[183],[34,0],[33,3],[68,0],[33,4],[32,3],[252,3],[32,4],[252,3],[65,9],[108],[106],[34,2],[68,0],[34,1],[57,0,4],[32,2],[65,128,1],[58,0,12],[32,0],[33,3],[68,1],[33,4],[32,3],[252,3],[32,4],[252,3],[65,9],[108],[106],[34,2],[68,0],[34,1],[57,0,4],[32,2],[65,1],[58,0,12],[65,128,4],[16,builtin('__Porffor_allocateBytes')],[183],[33,5],[32,0],[33,3],[68,2],[33,4],[32,3],[252,3],[32,4],[252,3],[65,9],[108],[106],[34,2],[32,5],[34,1],[57,0,4],[32,2],[65,208,0],[58,0,12],[65,128,4],[16,builtin('__Porffor_allocateBytes')],[183],[33,6],[32,0],[33,3],[68,3],[33,4],[32,3],[252,3],[32,4],[252,3],[65,9],[108],[106],[34,2],[32,6],[34,1],[57,0,4],[32,2],[65,208,0],[58,0,12],[32,0],[65,208,0],[15]],
@@ -2088,33 +2088,33 @@ globalInits:{jobQueue:(_,{allocPage,glbl,loc})=>[...number(allocPage(_,'array: p
 table:1,
 };
 this.__Porffor_promise_resolveActive = {
-wasm:(_,{glbl,builtin})=>[...glbl(35,'activePromise',124),...glbl(35,'activePromise#type',127),[32,0],[32,1],[16,builtin('__Porffor_promise_resolve')],[34,2],[15]],
+wasm:(_,{glbl,builtin})=>[[32,0],[32,1],...glbl(35,'activePromise',124),...glbl(35,'activePromise#type',127),[16,builtin('__Porffor_promise_resolve')],[34,2],[15]],
 params:[124,127],typedParams:1,returns:[124,127],typedReturns:1,
 locals:[127],localNames:["value","value#type","#last_type"],
 globalInits:{jobQueue:(_,{allocPage,glbl,loc})=>[...number(allocPage(_,'array: promise.ts/jobQueue','f64'),124),...glbl(36,'jobQueue',124),...glbl(35,'jobQueue',124),[252,3],[33,loc('#makearray_pointer_tmp',127)],[32,loc('#makearray_pointer_tmp',127)],[65,0],[54,1,0],[32,loc('#makearray_pointer_tmp',127)],[68,0],[252,3],[54,1,0],[32,loc('#makearray_pointer_tmp',127)],[26]]},
 };
 this.__Porffor_promise_rejectActive = {
-wasm:(_,{glbl,builtin})=>[...glbl(35,'activePromise',124),...glbl(35,'activePromise#type',127),[32,0],[32,1],[16,builtin('__Porffor_promise_reject')],[34,2],[15]],
+wasm:(_,{glbl,builtin})=>[[32,0],[32,1],...glbl(35,'activePromise',124),...glbl(35,'activePromise#type',127),[16,builtin('__Porffor_promise_reject')],[34,2],[15]],
 params:[124,127],typedParams:1,returns:[124,127],typedReturns:1,
 locals:[127],localNames:["reason","reason#type","#last_type"],
 globalInits:{jobQueue:(_,{allocPage,glbl,loc})=>[...number(allocPage(_,'array: promise.ts/jobQueue','f64'),124),...glbl(36,'jobQueue',124),...glbl(35,'jobQueue',124),[252,3],[33,loc('#makearray_pointer_tmp',127)],[32,loc('#makearray_pointer_tmp',127)],[65,0],[54,1,0],[32,loc('#makearray_pointer_tmp',127)],[68,0],[252,3],[54,1,0],[32,loc('#makearray_pointer_tmp',127)],[26]]},
 };
 this.Promise = {
-wasm:(_,{t,glbl,builtin,funcRef,internalThrow})=>[[32,0],[33,6],[32,1],[33,7],[2,124],...t([67,195],()=>[[32,7],[65,195,0],[70],[32,7],[65,195,1],[70],[114],[4,64],[32,6],[252,3],[40,1,0],[69],[184],[12,1],[11]]),[32,6],[68,0],[97],[184],[11],[252,3],[4,64],...internalThrow(_,'TypeError',`Constructor Promise requires 'new'`),[11],[32,5],[184],[68,6],[98],[4,64],...internalThrow(_,'TypeError',`Promise executor is not a function`),[11],[16,builtin('__Porffor_promise_create')],[33,9],[34,8],...glbl(36,'activePromise',124),...glbl(35,'activePromise',124),[65,208,0],...glbl(36,'activePromise#type',127),[26],[32,4],[33,22],[32,5],[33,7],[2,124],...t([6],()=>[[32,7],[65,6],[70],[4,64],...funcRef('__Porffor_promise_resolveActive'),[65,6],[33,10],[33,11],...funcRef('__Porffor_promise_rejectActive'),[65,6],[33,12],[33,13],[68,0],[65,128,1],[33,14],[33,15],[68,0],[65,128,1],[33,16],[33,17],[68,0],[65,128,1],[33,18],[33,19],[32,22],[252,3],[34,20],[65,192,0],[108],[65,4],[106],[45,0,128,128,4,"read func lut"],[33,21],[2,124],[2,64],[2,64],[2,64],[2,64],[2,64],[2,64],[32,20],[65,192,0],[108],[47,0,128,128,4,"read func lut"],[14,6,0,1,2,3,4,5,0],[11],[32,21],[65,1],[113],[4,124],[32,21],[65,2],[113],[4,124],[68,0],[65,128,1],[68,0],[65,128,1],[32,20],[17,2,0,"no_type_return"],[5],[32,20],[17,0,0,"no_type_return"],[11],[5],[32,21],[65,2],[113],[4,124],[68,0],[65,128,1],[68,0],[65,128,1],[32,20],[17,2,0],[33,9],[5],[32,20],[17,0,0],[33,9],[11],[11],[12,5],[11],[32,21],[65,1],[113],[4,124],[32,21],[65,2],[113],[4,124],[68,0],[65,128,1],[68,0],[65,128,1],[32,11],[32,10],[32,20],[17,3,0,"no_type_return"],[5],[32,11],[32,10],[32,20],[17,1,0,"no_type_return"],[11],[5],[32,21],[65,2],[113],[4,124],[68,0],[65,128,1],[68,0],[65,128,1],[32,11],[32,10],[32,20],[17,3,0],[33,9],[5],[32,11],[32,10],[32,20],[17,1,0],[33,9],[11],[11],[12,4],[11],[32,21],[65,1],[113],[4,124],[32,21],[65,2],[113],[4,124],[68,0],[65,128,1],[68,0],[65,128,1],[32,11],[32,10],[32,13],[32,12],[32,20],[17,4,0,"no_type_return"],[5],[32,11],[32,10],[32,13],[32,12],[32,20],[17,2,0,"no_type_return"],[11],[5],[32,21],[65,2],[113],[4,124],[68,0],[65,128,1],[68,0],[65,128,1],[32,11],[32,10],[32,13],[32,12],[32,20],[17,4,0],[33,9],[5],[32,11],[32,10],[32,13],[32,12],[32,20],[17,2,0],[33,9],[11],[11],[12,3],[11],[32,21],[65,1],[113],[4,124],[32,21],[65,2],[113],[4,124],[68,0],[65,128,1],[68,0],[65,128,1],[32,11],[32,10],[32,13],[32,12],[32,15],[32,14],[32,20],[17,5,0,"no_type_return"],[5],[32,11],[32,10],[32,13],[32,12],[32,15],[32,14],[32,20],[17,3,0,"no_type_return"],[11],[5],[32,21],[65,2],[113],[4,124],[68,0],[65,128,1],[68,0],[65,128,1],[32,11],[32,10],[32,13],[32,12],[32,15],[32,14],[32,20],[17,5,0],[33,9],[5],[32,11],[32,10],[32,13],[32,12],[32,15],[32,14],[32,20],[17,3,0],[33,9],[11],[11],[12,2],[11],[32,21],[65,1],[113],[4,124],[32,21],[65,2],[113],[4,124],[68,0],[65,128,1],[68,0],[65,128,1],[32,11],[32,10],[32,13],[32,12],[32,15],[32,14],[32,17],[32,16],[32,20],[17,6,0,"no_type_return"],[5],[32,11],[32,10],[32,13],[32,12],[32,15],[32,14],[32,17],[32,16],[32,20],[17,4,0,"no_type_return"],[11],[5],[32,21],[65,2],[113],[4,124],[68,0],[65,128,1],[68,0],[65,128,1],[32,11],[32,10],[32,13],[32,12],[32,15],[32,14],[32,17],[32,16],[32,20],[17,6,0],[33,9],[5],[32,11],[32,10],[32,13],[32,12],[32,15],[32,14],[32,17],[32,16],[32,20],[17,4,0],[33,9],[11],[11],[12,1],[11],[32,21],[65,1],[113],[4,124],[32,21],[65,2],[113],[4,124],[68,0],[65,128,1],[68,0],[65,128,1],[32,11],[32,10],[32,13],[32,12],[32,15],[32,14],[32,17],[32,16],[32,19],[32,18],[32,20],[17,7,0,"no_type_return"],[5],[32,11],[32,10],[32,13],[32,12],[32,15],[32,14],[32,17],[32,16],[32,19],[32,18],[32,20],[17,5,0,"no_type_return"],[11],[5],[32,21],[65,2],[113],[4,124],[68,0],[65,128,1],[68,0],[65,128,1],[32,11],[32,10],[32,13],[32,12],[32,15],[32,14],[32,17],[32,16],[32,19],[32,18],[32,20],[17,7,0],[33,9],[5],[32,11],[32,10],[32,13],[32,12],[32,15],[32,14],[32,17],[32,16],[32,19],[32,18],[32,20],[17,5,0],[33,9],[11],[11],[11],[12,1],[11]]),...internalThrow(_,'TypeError',`executor is not a function`),[68,0],[11],[26],[32,8],[34,23],[65,36],[15]],
+wasm:(_,{t,glbl,builtin,funcRef,internalThrow})=>[[32,0],[33,6],[32,1],[33,7],[2,124],...t([67,195],()=>[[32,7],[65,195,0],[70],[32,7],[65,195,1],[70],[114],[4,64],[32,6],[252,3],[40,1,0],[69],[184],[12,1],[11]]),[32,6],[68,0],[97],[184],[11],[252,3],[4,64],...internalThrow(_,'TypeError',`Constructor Promise requires 'new'`),[11],[32,5],[184],[68,6],[98],[4,64],...internalThrow(_,'TypeError',`Promise executor is not a function`),[11],[16,builtin('__Porffor_promise_create')],[33,9],[34,8],...glbl(36,'activePromise',124),...glbl(35,'activePromise',124),[65,208,0],...glbl(36,'activePromise#type',127),[26],[6,64],[32,4],[33,22],[32,5],[33,7],[2,124],...t([6],()=>[[32,7],[65,6],[70],[4,64],...funcRef('__Porffor_promise_resolveActive'),[65,6],[33,10],[33,11],...funcRef('__Porffor_promise_rejectActive'),[65,6],[33,12],[33,13],[68,0],[65,128,1],[33,14],[33,15],[68,0],[65,128,1],[33,16],[33,17],[68,0],[65,128,1],[33,18],[33,19],[32,22],[252,3],[34,20],[65,192,0],[108],[65,4],[106],[45,0,128,128,4,"read func lut"],[33,21],[2,124],[2,64],[2,64],[2,64],[2,64],[2,64],[2,64],[32,20],[65,192,0],[108],[47,0,128,128,4,"read func lut"],[14,6,0,1,2,3,4,5,0],[11],[32,21],[65,1],[113],[4,124],[32,21],[65,2],[113],[4,124],[68,0],[65,128,1],[68,0],[65,128,1],[32,20],[17,2,0,"no_type_return"],[5],[32,20],[17,0,0,"no_type_return"],[11],[5],[32,21],[65,2],[113],[4,124],[68,0],[65,128,1],[68,0],[65,128,1],[32,20],[17,2,0],[33,9],[5],[32,20],[17,0,0],[33,9],[11],[11],[12,5],[11],[32,21],[65,1],[113],[4,124],[32,21],[65,2],[113],[4,124],[68,0],[65,128,1],[68,0],[65,128,1],[32,11],[32,10],[32,20],[17,3,0,"no_type_return"],[5],[32,11],[32,10],[32,20],[17,1,0,"no_type_return"],[11],[5],[32,21],[65,2],[113],[4,124],[68,0],[65,128,1],[68,0],[65,128,1],[32,11],[32,10],[32,20],[17,3,0],[33,9],[5],[32,11],[32,10],[32,20],[17,1,0],[33,9],[11],[11],[12,4],[11],[32,21],[65,1],[113],[4,124],[32,21],[65,2],[113],[4,124],[68,0],[65,128,1],[68,0],[65,128,1],[32,11],[32,10],[32,13],[32,12],[32,20],[17,4,0,"no_type_return"],[5],[32,11],[32,10],[32,13],[32,12],[32,20],[17,2,0,"no_type_return"],[11],[5],[32,21],[65,2],[113],[4,124],[68,0],[65,128,1],[68,0],[65,128,1],[32,11],[32,10],[32,13],[32,12],[32,20],[17,4,0],[33,9],[5],[32,11],[32,10],[32,13],[32,12],[32,20],[17,2,0],[33,9],[11],[11],[12,3],[11],[32,21],[65,1],[113],[4,124],[32,21],[65,2],[113],[4,124],[68,0],[65,128,1],[68,0],[65,128,1],[32,11],[32,10],[32,13],[32,12],[32,15],[32,14],[32,20],[17,5,0,"no_type_return"],[5],[32,11],[32,10],[32,13],[32,12],[32,15],[32,14],[32,20],[17,3,0,"no_type_return"],[11],[5],[32,21],[65,2],[113],[4,124],[68,0],[65,128,1],[68,0],[65,128,1],[32,11],[32,10],[32,13],[32,12],[32,15],[32,14],[32,20],[17,5,0],[33,9],[5],[32,11],[32,10],[32,13],[32,12],[32,15],[32,14],[32,20],[17,3,0],[33,9],[11],[11],[12,2],[11],[32,21],[65,1],[113],[4,124],[32,21],[65,2],[113],[4,124],[68,0],[65,128,1],[68,0],[65,128,1],[32,11],[32,10],[32,13],[32,12],[32,15],[32,14],[32,17],[32,16],[32,20],[17,6,0,"no_type_return"],[5],[32,11],[32,10],[32,13],[32,12],[32,15],[32,14],[32,17],[32,16],[32,20],[17,4,0,"no_type_return"],[11],[5],[32,21],[65,2],[113],[4,124],[68,0],[65,128,1],[68,0],[65,128,1],[32,11],[32,10],[32,13],[32,12],[32,15],[32,14],[32,17],[32,16],[32,20],[17,6,0],[33,9],[5],[32,11],[32,10],[32,13],[32,12],[32,15],[32,14],[32,17],[32,16],[32,20],[17,4,0],[33,9],[11],[11],[12,1],[11],[32,21],[65,1],[113],[4,124],[32,21],[65,2],[113],[4,124],[68,0],[65,128,1],[68,0],[65,128,1],[32,11],[32,10],[32,13],[32,12],[32,15],[32,14],[32,17],[32,16],[32,19],[32,18],[32,20],[17,7,0,"no_type_return"],[5],[32,11],[32,10],[32,13],[32,12],[32,15],[32,14],[32,17],[32,16],[32,19],[32,18],[32,20],[17,5,0,"no_type_return"],[11],[5],[32,21],[65,2],[113],[4,124],[68,0],[65,128,1],[68,0],[65,128,1],[32,11],[32,10],[32,13],[32,12],[32,15],[32,14],[32,17],[32,16],[32,19],[32,18],[32,20],[17,7,0],[33,9],[5],[32,11],[32,10],[32,13],[32,12],[32,15],[32,14],[32,17],[32,16],[32,19],[32,18],[32,20],[17,5,0],[33,9],[11],[11],[11],[12,1],[11]]),...internalThrow(_,'TypeError',`executor is not a function`),[68,0],[11],[26],[7,0],[33,24],[34,23],[33,25],[32,24],[33,26],[32,8],[65,208,0],[32,25],[32,26],[16,builtin('__ecma262_RejectPromise')],[33,9],[26],[11],[32,8],[34,27],[65,36],[15]],
 params:[124,127,124,127,124,127],typedParams:1,returns:[124,127],typedReturns:1,
-locals:[124,127,124,127,127,124,127,124,127,124,127,124,127,124,127,127,124,124],localNames:["#newtarget","#newtarget#type","#this","#this#type","executor","executor#type","#logicinner_tmp","#typeswitch_tmp1","obj","#last_type","#indirect_arg0_type","#indirect_arg0_val","#indirect_arg1_type","#indirect_arg1_val","#indirect_arg2_type","#indirect_arg2_val","#indirect_arg3_type","#indirect_arg3_val","#indirect_arg4_type","#indirect_arg4_val","#indirect_func","#indirect_flags","#indirect_callee","pro"],
+locals:[124,127,124,127,127,124,127,124,127,124,127,124,127,124,127,127,124,124,127,124,127,124],localNames:["#newtarget","#newtarget#type","#this","#this#type","executor","executor#type","#logicinner_tmp","#typeswitch_tmp1","obj","#last_type","#indirect_arg0_type","#indirect_arg0_val","#indirect_arg1_type","#indirect_arg1_val","#indirect_arg2_type","#indirect_arg2_val","#indirect_arg3_type","#indirect_arg3_val","#indirect_arg4_type","#indirect_arg4_val","#indirect_func","#indirect_flags","#indirect_callee","#catch_tmp1","#catch_tmp1#type","e","e#type","pro"],
 usedTypes:[80,36],
 globalInits:{jobQueue:(_,{allocPage,glbl,loc})=>[...number(allocPage(_,'array: promise.ts/jobQueue','f64'),124),...glbl(36,'jobQueue',124),...glbl(35,'jobQueue',124),[252,3],[33,loc('#makearray_pointer_tmp',127)],[32,loc('#makearray_pointer_tmp',127)],[65,0],[54,1,0],[32,loc('#makearray_pointer_tmp',127)],[68,0],[252,3],[54,1,0],[32,loc('#makearray_pointer_tmp',127)],[26]]},
 table:1,constr:1,
 };
 this.__Promise_resolve = {
-wasm:(_,{builtin})=>[[16,builtin('__Porffor_promise_create')],[33,3],[34,2],[65,208,0],[32,0],[32,1],[16,builtin('__Porffor_promise_resolve')],[33,3],[26],[32,2],[34,4],[65,36],[15]],
+wasm:(_,{builtin})=>[[16,builtin('__Porffor_promise_create')],[33,3],[33,2],[32,0],[32,1],[32,2],[65,208,0],[16,builtin('__Porffor_promise_resolve')],[33,3],[26],[32,2],[34,4],[65,36],[15]],
 params:[124,127],typedParams:1,returns:[124,127],typedReturns:1,
 locals:[124,127,124],localNames:["value","value#type","obj","#last_type","pro"],
 usedTypes:[80,36],
 };
 this.__Promise_reject = {
-wasm:(_,{builtin})=>[[16,builtin('__Porffor_promise_create')],[33,3],[34,2],[65,208,0],[32,0],[32,1],[16,builtin('__Porffor_promise_reject')],[33,3],[26],[32,2],[34,4],[65,36],[15]],
+wasm:(_,{builtin})=>[[16,builtin('__Porffor_promise_create')],[33,3],[33,2],[32,0],[32,1],[32,2],[65,208,0],[16,builtin('__Porffor_promise_reject')],[33,3],[26],[32,2],[34,4],[65,36],[15]],
 params:[124,127],typedParams:1,returns:[124,127],typedReturns:1,
 locals:[124,127,124],localNames:["reason","reason#type","obj","#last_type","pro"],
 usedTypes:[80,36],
@@ -2221,7 +2221,7 @@ params:[124,127],typedParams:1,returns:[124,127],typedReturns:1,
 locals:[127],localNames:["_this","_this#type","#last_type"],
 };
 this.__Porffor_promise_await = {
-wasm:(_,{internalThrow})=>[[32,1],[184],[68,36],[98],[4,64],[32,0],[32,1],[15],[11],[32,0],[34,2],[33,4],[68,1],[34,5],[252,3],[65,9],[108],[32,4],[252,3],[106],[34,7],[43,0,4],[32,7],[45,0,12],[33,6],[34,3],[68,0],[97],[4,64],[32,0],[32,1],[15],[11],[32,2],[33,4],[68,0],[34,5],[252,3],[65,9],[108],[32,4],[252,3],[106],[34,7],[43,0,4],[32,7],[45,0,12],[34,6],[33,9],[33,8],[32,3],[68,1],[97],[4,64],[32,8],[32,9],[15],[11],...internalThrow(_,'Error',`Uncaught await promise rejection`),[68,0],[65,128,1],[15]],
+wasm:()=>[[32,1],[184],[68,36],[98],[4,64],[32,0],[32,1],[15],[11],[32,0],[34,2],[33,4],[68,1],[34,5],[252,3],[65,9],[108],[32,4],[252,3],[106],[34,7],[43,0,4],[32,7],[45,0,12],[33,6],[34,3],[68,0],[97],[4,64],[32,0],[32,1],[15],[11],[32,2],[33,4],[68,0],[34,5],[252,3],[65,9],[108],[32,4],[252,3],[106],[34,7],[43,0,4],[32,7],[45,0,12],[34,6],[33,9],[33,8],[32,3],[68,1],[97],[4,64],[32,8],[32,9],[15],[11],[32,8],[32,9],[8,0]],
 params:[124,127],typedParams:1,returns:[124,127],typedReturns:1,
 locals:[124,124,124,124,127,127,124,127],localNames:["value","value#type","promise","state","#member_obj","#member_prop","#last_type","#loadArray_offset","result","result#type"],
 usedTypes:[80],

package/compiler/codegen.js

@@ -404,16 +404,14 @@ const generateReturn = (scope, decl) => {
   const arg = decl.argument ?? DEFAULT_VALUE();
 
   if (scope.async) {
-    typeUsed(scope, TYPES.promise);
-
     return [
       // resolve promise with return value
-      [ Opcodes.local_get, scope.locals['#async_out_promise'].idx ],
-      ...number(TYPES.promise, Valtype.i32),
-
       ...generate(scope, arg),
       ...(scope.returnType != null ? [] : getNodeType(scope, arg)),
 
+      [ Opcodes.local_get, scope.locals['#async_out_promise'].idx ],
+      ...number(TYPES.promise, Valtype.i32),
+
       [ Opcodes.call, includeBuiltin(scope, '__Porffor_promise_resolve').index ],
       [ Opcodes.drop ],
       [ Opcodes.drop ],
@@ -4735,7 +4733,9 @@ const generateLabel = (scope, decl) => {
 const generateThrow = (scope, decl) => {
   scope.throws = true;
 
-  const exceptionMode = Prefs.exceptionMode ?? 'stack';
+  let exceptionMode = Prefs.exceptionMode ?? 'stack';
+  if (globalThis.precompile) exceptionMode = decl.argument.callee != null ? 'lut' : 'stack';
+
   if (exceptionMode === 'lut') {
     let message = decl.argument.value, constructor = null;
 
@@ -4761,7 +4761,7 @@ const generateThrow = (scope, decl) => {
 
     return [
       ...number(exceptId, Valtype.i32),
-      [ Opcodes.throw, tags[0].idx ]
+      [ Opcodes.throw, 0 ]
     ];
   }
 
@@ -4775,7 +4775,7 @@ const generateThrow = (scope, decl) => {
     return [
       ...generate(scope, decl.argument),
       ...getNodeType(scope, decl.argument),
-      [ Opcodes.throw, tags[0].idx ]
+      [ Opcodes.throw, globalThis.precompile ? 1 : 0 ]
     ];
   }
 };
@@ -6023,7 +6023,9 @@ const generateFunc = (scope, decl) => {
       if (decl.async) {
         // make out promise local
         allocVar(func, '#async_out_promise', false, false);
+
         func.async = true;
+        typeUsed(func, TYPES.promise);
       }
 
       const wasm = prelude.concat(generate(func, body));
@@ -6033,10 +6035,29 @@ const generateFunc = (scope, decl) => {
         wasm.unshift(
           [ Opcodes.call, includeBuiltin(func, '__Porffor_promise_create').index ],
           [ Opcodes.drop ],
-          [ Opcodes.local_set, func.locals['#async_out_promise'].idx ]
+          [ Opcodes.local_set, func.locals['#async_out_promise'].idx ],
+
+          // wrap in try for later catch
+          [ Opcodes.try, Blocktype.void ]
         );
 
-        // todo: wrap in try and reject thrown value once supported
+        // reject with thrown value if caught error
+        wasm.push(
+          [ Opcodes.catch, 0 ],
+
+          [ Opcodes.local_get, func.locals['#async_out_promise'].idx ],
+          ...number(TYPES.promise, Valtype.i32),
+
+          [ Opcodes.call, includeBuiltin(func, '__Porffor_promise_reject').index ],
+          [ Opcodes.drop ],
+          [ Opcodes.drop ],
+          [ Opcodes.end ],
+
+          // return promise at the end of func
+          [ Opcodes.local_get, func.locals['#async_out_promise'].idx ],
+          ...number(TYPES.promise, Valtype.i32),
+          [ Opcodes.return ]
+        );
       }
 
       if (name === 'main') {

package/compiler/precompile.js

@@ -25,7 +25,7 @@ const compile = async (file, _funcs) => {
     first = source.slice(0, source.indexOf('\n'));
   }
 
-  let args = ['--module', '--todo-time=compile', '--truthy=no_nan_negative', '--no-rm-unused-types', '--scoped-page-names', '--funsafe-no-unlikely-proto-checks', '--zero-checks=charCodeAt', '--fast-length', '--parse-types', '--opt-types', '--no-passive-data', '--active-data', '--exception-mode=lut'];
+  let args = ['--module', '--todo-time=compile', '--truthy=no_nan_negative', '--no-rm-unused-types', '--scoped-page-names', '--funsafe-no-unlikely-proto-checks', '--zero-checks=charCodeAt', '--fast-length', '--parse-types', '--opt-types', '--no-passive-data', '--active-data'];
   if (first.startsWith('// @porf')) {
     args = first.slice('// @porf '.length).split(' ').concat(args);
   }
@@ -152,13 +152,16 @@ const compile = async (file, _funcs) => {
           y.splice(0, 10, 'alloc', pageName, x.pages.get(pageName).type, valtypeBinary);
         }
 
+        if (n[0] === Opcodes.throw) {
+          if (y[0] === Opcodes.i32_const && n[1] === 0) {
+            const id = read_signedLEB128(y.slice(1));
+            y.splice(0, 10, 'throw', exceptions[id].constructor, exceptions[id].message);
 
-        if (y[0] === Opcodes.i32_const && n[0] === Opcodes.throw) {
-          const id = read_signedLEB128(y.slice(1));
-          y.splice(0, 10, 'throw', exceptions[id].constructor, exceptions[id].message);
-
-          // remove throw inst
-          wasm.splice(i + 1, 1);
+            // remove throw inst
+            wasm.splice(i + 1, 1);
+          } else {
+            n[1]--;
+          }
         }
       }
     };

package/compiler/wrap.js

@@ -316,8 +316,8 @@ ${flags & 0b0001 ? `    get func idx: ${get}
     case TYPES.test262error:
     case TYPES.__porffor_todoerror: {
       const obj = porfToJSValue({ memory, funcs, pages }, value, TYPES.object);
-      const constr = globalThis[TYPE_NAMES[type]] ?? Error;
-      const err = new constr(obj.message);
+      const err = new (globalThis[TYPE_NAMES[type]] ?? Error)(obj.message);
+
       err.name = obj.name;
       err.stack = `${TYPE_NAMES[type]}: ${obj.message}`;
       return err;

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

package/runner/repl.js

@@ -111,7 +111,7 @@ const run = (source, _context, _filename, callback, run = true) => {
 
     prev = prev + ';\n' + source.trim();
   } catch (e) {
-    console.log('Uncaught', e.stack);
+    console.log('Uncaught', e.stack ? e.stack : e);
   }
 
   callback();