porffor 0.59.5 → 0.59.6

package/compiler/builtins/array.ts

@@ -525,6 +525,7 @@ export const __Array_prototype_reverse = (_this: any[]) => {
 
 // @porf-typed-array
 export const __Array_prototype_forEach = (_this: any[], callbackFn: any, thisArg: any) => {
+  if (Porffor.type(callbackFn) != Porffor.TYPES.function) throw new TypeError('Callback must be a function');
   const len: i32 = _this.length;
   let i: i32 = 0;
   while (i < len) {
@@ -534,6 +535,7 @@ export const __Array_prototype_forEach = (_this: any[], callbackFn: any, thisArg
 
 // @porf-typed-array
 export const __Array_prototype_filter = (_this: any[], callbackFn: any, thisArg: any) => {
+  if (Porffor.type(callbackFn) != Porffor.TYPES.function) throw new TypeError('Callback must be a function');
   const out: any[] = Porffor.allocate();
 
   const len: i32 = _this.length;
@@ -550,6 +552,7 @@ export const __Array_prototype_filter = (_this: any[], callbackFn: any, thisArg:
 
 // @porf-typed-array
 export const __Array_prototype_map = (_this: any[], callbackFn: any, thisArg: any) => {
+  if (Porffor.type(callbackFn) != Porffor.TYPES.function) throw new TypeError('Callback must be a function');
   const len: i32 = _this.length;
   const out: any[] = Porffor.allocate();
   out.length = len;
@@ -563,6 +566,7 @@ export const __Array_prototype_map = (_this: any[], callbackFn: any, thisArg: an
 };
 
 export const __Array_prototype_flatMap = (_this: any[], callbackFn: any, thisArg: any) => {
+  if (Porffor.type(callbackFn) != Porffor.TYPES.function) throw new TypeError('Callback must be a function');
   const len: i32 = _this.length;
   const out: any[] = Porffor.allocate();
 
@@ -580,6 +584,7 @@ export const __Array_prototype_flatMap = (_this: any[], callbackFn: any, thisArg
 
 // @porf-typed-array
 export const __Array_prototype_find = (_this: any[], callbackFn: any, thisArg: any) => {
+  if (Porffor.type(callbackFn) != Porffor.TYPES.function) throw new TypeError('Callback must be a function');
   const len: i32 = _this.length;
   let i: i32 = 0;
   while (i < len) {
@@ -590,6 +595,7 @@ export const __Array_prototype_find = (_this: any[], callbackFn: any, thisArg: a
 
 // @porf-typed-array
 export const __Array_prototype_findLast = (_this: any[], callbackFn: any, thisArg: any) => {
+  if (Porffor.type(callbackFn) != Porffor.TYPES.function) throw new TypeError('Callback must be a function');
   let i: i32 = _this.length;
   while (i > 0) {
     const el: any = _this[--i];
@@ -599,15 +605,18 @@ export const __Array_prototype_findLast = (_this: any[], callbackFn: any, thisAr
 
 // @porf-typed-array
 export const __Array_prototype_findIndex = (_this: any[], callbackFn: any, thisArg: any) => {
+  if (Porffor.type(callbackFn) != Porffor.TYPES.function) throw new TypeError('Callback must be a function');
   const len: i32 = _this.length;
   let i: i32 = 0;
   while (i < len) {
-    if (!!callbackFn.call(thisArg, _this[i], i++, _this)) return i;
+    if (!!callbackFn.call(thisArg, _this[i], i, _this)) return i;
+    i++;
   }
 };
 
 // @porf-typed-array
 export const __Array_prototype_findLastIndex = (_this: any[], callbackFn: any, thisArg: any) => {
+  if (Porffor.type(callbackFn) != Porffor.TYPES.function) throw new TypeError('Callback must be a function');
   let i: i32 = _this.length;
   while (i > 0) {
     if (!!callbackFn.call(thisArg, _this[--i], i, _this)) return i;
@@ -616,6 +625,7 @@ export const __Array_prototype_findLastIndex = (_this: any[], callbackFn: any, t
 
 // @porf-typed-array
 export const __Array_prototype_every = (_this: any[], callbackFn: any, thisArg: any) => {
+  if (Porffor.type(callbackFn) != Porffor.TYPES.function) throw new TypeError('Callback must be a function');
   const len: i32 = _this.length;
   let i: i32 = 0;
   while (i < len) {
@@ -628,6 +638,7 @@ export const __Array_prototype_every = (_this: any[], callbackFn: any, thisArg:
 
 // @porf-typed-array
 export const __Array_prototype_some = (_this: any[], callbackFn: any, thisArg: any) => {
+  if (Porffor.type(callbackFn) != Porffor.TYPES.function) throw new TypeError('Callback must be a function');
   const len: i32 = _this.length;
   let i: i32 = 0;
   while (i < len) {
@@ -639,10 +650,12 @@ export const __Array_prototype_some = (_this: any[], callbackFn: any, thisArg: a
 
 // @porf-typed-array
 export const __Array_prototype_reduce = (_this: any[], callbackFn: any, initialValue: any) => {
+  if (Porffor.type(callbackFn) != Porffor.TYPES.function) throw new TypeError('Callback must be a function');
   const len: i32 = _this.length;
   let acc: any = initialValue;
   let i: i32 = 0;
   if (acc === undefined) {
+    if (len == 0) throw new TypeError('Reduce of empty array with no initial value');
     acc = _this[i++];
   }
 
@@ -655,10 +668,12 @@ export const __Array_prototype_reduce = (_this: any[], callbackFn: any, initialV
 
 // @porf-typed-array
 export const __Array_prototype_reduceRight = (_this: any[], callbackFn: any, initialValue: any) => {
+  if (Porffor.type(callbackFn) != Porffor.TYPES.function) throw new TypeError('Callback must be a function');
   const len: i32 = _this.length;
   let acc: any = initialValue;
   let i: i32 = len;
   if (acc === undefined) {
+    if (len == 0) throw new TypeError('Reduce of empty array with no initial value');
     acc = _this[--i];
   }
 

package/compiler/builtins/string.ts

@@ -545,7 +545,7 @@ export const __ByteString_prototype_codePointAt = (_this: bytestring, index: num
   return Porffor.wasm.i32.load8_u(Porffor.wasm`local.get ${_this}` + index, 0, 4);
 };
 
-export const __String_prototype_startsWith = (_this: string, searchString: string, position: number) => {
+export const __String_prototype_startsWith = (_this: string, searchString: string, position: number = 0) => {
   // todo: handle bytestring searchString
 
   // todo/perf: investigate whether for counter vs while ++s are faster
@@ -573,7 +573,7 @@ export const __String_prototype_startsWith = (_this: string, searchString: strin
   return true;
 };
 
-export const __ByteString_prototype_startsWith = (_this: bytestring, searchString: bytestring, position: number) => {
+export const __ByteString_prototype_startsWith = (_this: bytestring, searchString: bytestring, position: number = 0) => {
   // if searching non-bytestring, bytestring will not start with it
   // todo: change this to just check if = string and ToString others
   if (Porffor.wasm`local.get ${searchString+1}` != Porffor.TYPES.bytestring) return false;
@@ -603,7 +603,7 @@ export const __ByteString_prototype_startsWith = (_this: bytestring, searchStrin
 };
 
 
-export const __String_prototype_endsWith = (_this: string, searchString: string, endPosition: number) => {
+export const __String_prototype_endsWith = (_this: string, searchString: string, endPosition: any = undefined) => {
   // todo: handle bytestring searchString
 
   let i: i32 = Porffor.wasm`local.get ${_this}`,
@@ -641,7 +641,7 @@ export const __String_prototype_endsWith = (_this: string, searchString: string,
   return true;
 };
 
-export const __ByteString_prototype_endsWith = (_this: bytestring, searchString: bytestring, endPosition: number) => {
+export const __ByteString_prototype_endsWith = (_this: bytestring, searchString: bytestring, endPosition: any = undefined) => {
   // if searching non-bytestring, bytestring will not start with it
   // todo: change this to just check if = string and ToString others
   if (Porffor.wasm`local.get ${searchString+1}` != Porffor.TYPES.bytestring) return false;
@@ -679,7 +679,7 @@ export const __ByteString_prototype_endsWith = (_this: bytestring, searchString:
 };
 
 
-export const __String_prototype_indexOf = (_this: string, searchString: string, position: number) => {
+export const __String_prototype_indexOf = (_this: string, searchString: string, position: number = 0) => {
   // todo: handle bytestring searchString
 
   let thisPtr: i32 = Porffor.wasm`local.get ${_this}`;
@@ -717,7 +717,7 @@ export const __String_prototype_indexOf = (_this: string, searchString: string,
   return -1;
 };
 
-export const __ByteString_prototype_indexOf = (_this: bytestring, searchString: bytestring, position: number) => {
+export const __ByteString_prototype_indexOf = (_this: bytestring, searchString: bytestring, position: number = 0) => {
   // if searching non-bytestring, bytestring will not start with it
   // todo: change this to just check if = string and ToString others
   if (Porffor.wasm`local.get ${searchString+1}` != Porffor.TYPES.bytestring) return -1;
@@ -758,7 +758,7 @@ export const __ByteString_prototype_indexOf = (_this: bytestring, searchString:
 };
 
 
-export const __String_prototype_lastIndexOf = (_this: string, searchString: string, position: number) => {
+export const __String_prototype_lastIndexOf = (_this: string, searchString: string, position: any = undefined) => {
   // todo: handle bytestring searchString
 
   let thisPtr: i32 = Porffor.wasm`local.get ${_this}`;
@@ -802,7 +802,7 @@ export const __String_prototype_lastIndexOf = (_this: string, searchString: stri
   return -1;
 };
 
-export const __ByteString_prototype_lastIndexOf = (_this: bytestring, searchString: bytestring, position: number) => {
+export const __ByteString_prototype_lastIndexOf = (_this: bytestring, searchString: bytestring, position: any = undefined) => {
   // if searching non-bytestring, bytestring will not start with it
   // todo: change this to just check if = string and ToString others
   if (Porffor.wasm`local.get ${searchString+1}` != Porffor.TYPES.bytestring) return -1;
@@ -848,7 +848,7 @@ export const __ByteString_prototype_lastIndexOf = (_this: bytestring, searchStri
 };
 
 
-export const __String_prototype_includes = (_this: string, searchString: string, position: number) => {
+export const __String_prototype_includes = (_this: string, searchString: string, position: number = 0) => {
   // todo: handle bytestring searchString
 
   let thisPtr: i32 = Porffor.wasm`local.get ${_this}`;
@@ -886,7 +886,7 @@ export const __String_prototype_includes = (_this: string, searchString: string,
   return false;
 };
 
-export const __ByteString_prototype_includes = (_this: bytestring, searchString: bytestring, position: number) => {
+export const __ByteString_prototype_includes = (_this: bytestring, searchString: bytestring, position: number = 0) => {
   // if searching non-bytestring, bytestring will not start with it
   // todo: change this to just check if = string and ToString others
   if (Porffor.wasm`local.get ${searchString+1}` != Porffor.TYPES.bytestring) return -1;
@@ -927,7 +927,7 @@ export const __ByteString_prototype_includes = (_this: bytestring, searchString:
 };
 
 
-export const __String_prototype_padStart = (_this: string, targetLength: number, padString: string) => {
+export const __String_prototype_padStart = (_this: string, targetLength: number, padString: string = undefined) => {
   let out: string = Porffor.allocate();
 
   let outPtr: i32 = Porffor.wasm`local.get ${out}`;
@@ -969,7 +969,7 @@ export const __String_prototype_padStart = (_this: string, targetLength: number,
   return out;
 };
 
-export const __ByteString_prototype_padStart = (_this: bytestring, targetLength: number, padString: bytestring) => {
+export const __ByteString_prototype_padStart = (_this: bytestring, targetLength: number, padString: bytestring = undefined) => {
   // todo: handle padString being non-bytestring
 
   let out: bytestring = Porffor.allocate();
@@ -1010,7 +1010,7 @@ export const __ByteString_prototype_padStart = (_this: bytestring, targetLength:
 };
 
 
-export const __String_prototype_padEnd = (_this: string, targetLength: number, padString: string) => {
+export const __String_prototype_padEnd = (_this: string, targetLength: number, padString: string = undefined) => {
   let out: string = Porffor.allocate();
 
   let outPtr: i32 = Porffor.wasm`local.get ${out}`;
@@ -1052,7 +1052,7 @@ export const __String_prototype_padEnd = (_this: string, targetLength: number, p
   return out;
 };
 
-export const __ByteString_prototype_padEnd = (_this: bytestring, targetLength: number, padString: bytestring) => {
+export const __ByteString_prototype_padEnd = (_this: bytestring, targetLength: number, padString: bytestring = undefined) => {
   // todo: handle padString being non-bytestring
 
   let out: bytestring = Porffor.allocate();
@@ -1612,6 +1612,10 @@ export const __String_prototype_split = (_this: string, separator: any, limit: a
 
   if (Porffor.wasm`local.get ${limit+1}` == Porffor.TYPES.undefined) limit = Number.MAX_SAFE_INTEGER;
   if (limit < 0) limit = Number.MAX_SAFE_INTEGER;
+  if (limit == 0) {
+    out.length = 0;
+    return out;
+  }
 
   if (separator == null) {
     out.length = 1;
@@ -1628,6 +1632,10 @@ i32.store8 0 12`;
     return out;
   }
 
+  if (Porffor.type(separator) != Porffor.TYPES.string && Porffor.type(separator) != Porffor.TYPES.bytestring) {
+    separator = ecma262.ToString(separator);
+  }
+
   let tmp: string = Porffor.allocate(), tmpLen: i32 = 0;
   const thisLen: i32 = _this.length * 2, sepLen: i32 = separator.length;
   if (sepLen == 1) {
@@ -1671,9 +1679,9 @@ i32.store8 0 12`;
       tmpLen++;
     }
   } else if (sepLen == 0) {
-    const clammedLimit: i32 = limit > thisLen ? thisLen : limit;
     tmpLen = 1;
-    for (let i = 0; i <= clammedLimit; i+=2) {
+    let produced: i32 = 0;
+    for (let i = 0; i < thisLen && produced < limit; i += 2) {
       tmp = Porffor.allocateBytes(8);
       const x: i32 = Porffor.wasm.i32.load16_u(Porffor.wasm`local.get ${_this}` + i, 0, 4);
 
@@ -1698,6 +1706,7 @@ i32.add
 i32.const 67
 i32.store8 0 12`;
       outLen++;
+      produced++;
     }
     return out;
   } else {
@@ -1738,12 +1747,13 @@ i32.store8 0 12`;
         }
       } else sepInd = 0;
 
-      Porffor.wasm.i32.store16(Porffor.wasm`local.get ${tmp}` + tmpLen, x, 0, 4);
+      Porffor.wasm.i32.store16(Porffor.wasm`local.get ${tmp}` + tmpLen * 2, x, 0, 4);
       tmpLen++;
     }
   }
 
-  if (tmpLen > 0 && outLen < limit) {
+  if (outLen < limit) {
+    // per spec, push final (possibly empty) segment unless limited
     tmp.length = tmpLen;
     Porffor.wasm`
 local.get ${out}
@@ -1772,6 +1782,13 @@ i32.store8 0 12`;
 export const __ByteString_prototype_split = (_this: bytestring, separator: any, limit: any) => {
   let out: any[] = Porffor.allocate(), outLen: i32 = 0;
 
+  if (Porffor.wasm`local.get ${limit+1}` == Porffor.TYPES.undefined) limit = Number.MAX_SAFE_INTEGER;
+  if (limit < 0) limit = Number.MAX_SAFE_INTEGER;
+  if (limit == 0) {
+    out.length = 0;
+    return out;
+  }
+
   if (separator == null) {
     out.length = 1;
     // out[0] = _this; (but in wasm as it is a f64 array and we are in i32 space)
@@ -1787,8 +1804,9 @@ i32.store8 0 12`;
     return out;
   }
 
-  if (Porffor.wasm`local.get ${limit+1}` == Porffor.TYPES.undefined) limit = Number.MAX_SAFE_INTEGER;
-  if (limit < 0) limit = Number.MAX_SAFE_INTEGER;
+  if (Porffor.type(separator) != Porffor.TYPES.string && Porffor.type(separator) != Porffor.TYPES.bytestring) {
+    separator = ecma262.ToString(separator);
+  }
 
   let tmp: bytestring = Porffor.allocate(), tmpLen: i32 = 0;
   const thisLen: i32 = _this.length, sepLen: i32 = separator.length;
@@ -1833,9 +1851,9 @@ i32.store8 0 12`;
       tmpLen++;
     }
   } else if (sepLen == 0) {
-    const clammedLimit: i32 = limit > thisLen ? thisLen : limit;
     tmpLen = 1;
-    for (let i = 0; i <= clammedLimit; i++) {
+    let produced: i32 = 0;
+    for (let i = 0; i < thisLen && produced < limit; i++) {
       tmp = Porffor.allocateBytes(8);
       const x: i32 = Porffor.wasm.i32.load8_u(Porffor.wasm`local.get ${_this}` + i, 0, 4);
 
@@ -1861,6 +1879,7 @@ i32.add
 i32.const 195
 i32.store8 0 12`;
       outLen++;
+      produced++;
     }
     return out;
   } else {
@@ -1906,7 +1925,7 @@ i32.store8 0 12`;
     }
   }
 
-  if (tmpLen > 0 && outLen < limit) {
+  if (outLen < limit) {
     tmp.length = tmpLen;
     Porffor.wasm`
 local.get ${out}