porffor 0.55.17 → 0.55.19

package/compiler/builtins/object.ts

@@ -1,6 +1,6 @@
 import type {} from './porffor.d.ts';
 
-export const Object = function (value: any): object {
+export const Object = function (value: any): any {
   if (value == null) {
     // if nullish, return new empty object
     const obj: object = Porffor.allocate();
@@ -8,6 +8,7 @@ export const Object = function (value: any): object {
   }
 
   // primitives into primitive objects
+  if ((Porffor.rawType(value) | 0b10000000) == Porffor.TYPES.bytestring) return new String(value);
   if (Porffor.rawType(value) == Porffor.TYPES.number) return new Number(value);
   if (Porffor.rawType(value) == Porffor.TYPES.boolean) return new Boolean(value);
 
@@ -159,11 +160,11 @@ export const __Object_prototype_hasOwnProperty = (_this: any, prop: any) => {
   return __Array_prototype_includes(keys, p);
 };
 
-export const __Object_hasOwn = (obj: any, prop: any) => {
+export const __Object_hasOwn = (obj: any, prop: any): boolean => {
   return __Object_prototype_hasOwnProperty(obj, prop);
 };
 
-export const __Porffor_object_in = (obj: any, prop: any) => {
+export const __Porffor_object_in = (obj: any, prop: any): boolean => {
   if (__Object_prototype_hasOwnProperty(obj, prop)) {
     return true;
   }
@@ -180,7 +181,7 @@ export const __Porffor_object_in = (obj: any, prop: any) => {
   return false;
 };
 
-export const __Porffor_object_instanceof = (obj: any, constr: any, checkProto: any) => {
+export const __Porffor_object_instanceof = (obj: any, constr: any, checkProto: any): boolean => {
   if (Porffor.rawType(constr) != Porffor.TYPES.function) {
     throw new TypeError('instanceof right-hand side is not a function');
   }
@@ -202,7 +203,7 @@ export const __Porffor_object_instanceof = (obj: any, constr: any, checkProto: a
 };
 
 
-export const __Object_assign = (target: any, ...sources: any[]) => {
+export const __Object_assign = (target: any, ...sources: any[]): any => {
   if (target == null) throw new TypeError('Argument is nullish, expected object');
 
   for (const x of sources) {
@@ -220,7 +221,7 @@ export const __Object_assign = (target: any, ...sources: any[]) => {
 };
 
 // Object.assign but also non enumerable properties and 1 source
-export const __Porffor_object_assignAll = (target: any, source: any) => {
+export const __Porffor_object_assignAll = (target: any, source: any): any => {
   if (target == null) throw new TypeError('Argument is nullish, expected object');
 
   const keys: any[] = Reflect.ownKeys(source);
@@ -337,7 +338,7 @@ export const __Object_isSealed = (obj: any): any => {
 };
 
 
-export const __Object_getOwnPropertyDescriptor = (obj: any, prop: any): any => {
+export const __Object_getOwnPropertyDescriptor = (obj: any, prop: any): object|undefined => {
   const p: any = ecma262.ToPropertyKey(prop);
 
   const entryPtr: i32 = Porffor.object.lookup(obj, p);
@@ -387,7 +388,7 @@ local.set ${value+1}`;
   return out;
 };
 
-export const __Object_getOwnPropertyDescriptors = (obj: any): any => {
+export const __Object_getOwnPropertyDescriptors = (obj: any): object => {
   const out: object = {};
 
   if (Porffor.rawType(obj) != Porffor.TYPES.object) {
@@ -515,7 +516,7 @@ local.set ${key}`;
 };
 
 
-export const __Object_defineProperty = (target: any, prop: any, desc: any) => {
+export const __Object_defineProperty = (target: any, prop: any, desc: any): any => {
   if (!Porffor.object.isObject(target)) throw new TypeError('Target is a non-object');
   if (!Porffor.object.isObject(desc)) throw new TypeError('Descriptor is a non-object');
 
@@ -593,7 +594,7 @@ export const __Object_defineProperty = (target: any, prop: any, desc: any) => {
   return target;
 };
 
-export const __Object_defineProperties = (target: any, props: any) => {
+export const __Object_defineProperties = (target: any, props: any): any => {
   if (!Porffor.object.isObject(target)) throw new TypeError('Target is a non-object');
   if (!Porffor.object.isObjectOrSymbol(props)) throw new TypeError('Props needs to be an object or symbol');
 
@@ -604,7 +605,7 @@ export const __Object_defineProperties = (target: any, props: any) => {
   return target;
 };
 
-export const __Object_create = (proto: any, props: any) => {
+export const __Object_create = (proto: any, props: any): object => {
   if (!Porffor.object.isObjectOrNull(proto)) throw new TypeError('Prototype should be an object or null');
 
   const out: object = {};
@@ -618,7 +619,7 @@ export const __Object_create = (proto: any, props: any) => {
 };
 
 
-export const __Object_groupBy = (items: any, callbackFn: any) => {
+export const __Object_groupBy = (items: any, callbackFn: any): object => {
   const out: object = {};
 
   let i = 0;
@@ -636,13 +637,13 @@ export const __Object_groupBy = (items: any, callbackFn: any) => {
 };
 
 
-export const __Object_getPrototypeOf = (obj: any) => {
+export const __Object_getPrototypeOf = (obj: any): any => {
   if (obj == null) throw new TypeError('Object is nullish, expected object');
 
   return obj.__proto__;
 };
 
-export const __Object_setPrototypeOf = (obj: any, proto: any) => {
+export const __Object_setPrototypeOf = (obj: any, proto: any): any => {
   if (obj == null) throw new TypeError('Object is nullish, expected object');
   if (!Porffor.object.isObjectOrNull(proto)) throw new TypeError('Prototype should be an object or null');
 

package/compiler/builtins/promise.ts

@@ -144,7 +144,7 @@ export const __Porffor_then = (promise: any[], fulfillReaction: any[], rejectRea
   }
 };
 
-export const __Porffor_promise_resolve = (value: any, promise: any): any => {
+export const __Porffor_promise_resolve = (value: any, promise: any): void => {
   // if value is own promise, reject with typeerror
   if (value === promise) throw new TypeError('cannot resolve promise with itself');
 
@@ -156,13 +156,10 @@ export const __Porffor_promise_resolve = (value: any, promise: any): any => {
   } else {
     __ecma262_FulfillPromise(promise, value);
   }
-
-  return undefined;
 };
 
-export const __Porffor_promise_reject = (reason: any, promise: any): any => {
+export const __Porffor_promise_reject = (reason: any, promise: any): void => {
   __ecma262_RejectPromise(promise, reason);
-  return undefined;
 };
 
 export const __Porffor_promise_create = (): any[] => {
@@ -187,12 +184,12 @@ export const __Porffor_promise_create = (): any[] => {
   return obj;
 };
 
-export const __Porffor_promise_runNext = (func: Function) => {
+export const __Porffor_promise_runNext = (func: Function): void => {
   const reaction: any[] = __Porffor_promise_newReaction(func, undefined, 1);
   __ecma262_HostEnqueuePromiseJob(__ecma262_NewPromiseReactionJob(reaction, undefined));
 };
 
-export const __Porffor_promise_runJobs = () => {
+export const __Porffor_promise_runJobs = (): void => {
   while (true) {
     let x: any = jobQueue.shift();
     if (x == null) break;
@@ -225,10 +222,10 @@ 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(value, activePromise);
-export const __Porffor_promise_rejectActive = (reason: any) => __Porffor_promise_reject(reason, activePromise);
+export const __Porffor_promise_resolveActive = (value: any): void => __Porffor_promise_resolve(value, activePromise);
+export const __Porffor_promise_rejectActive = (reason: any): void => __Porffor_promise_reject(reason, activePromise);
 
-export const Promise = function (executor: any): void {
+export const Promise = function (executor: any): Promise {
   if (!new.target) throw new TypeError("Constructor Promise requires 'new'");
   if (Porffor.rawType(executor) != Porffor.TYPES.function) throw new TypeError('Promise executor is not a function');
 
@@ -242,17 +239,15 @@ export const Promise = function (executor: any): void {
     __ecma262_RejectPromise(obj, e);
   }
 
-  const pro: Promise = obj;
-  return pro;
+  return obj as Promise;
 };
 
-export const __Promise_withResolvers = (): Promise => {
+export const __Promise_withResolvers = (): object => {
   const obj: any[] = __Porffor_promise_create();
   activePromise = obj;
 
-  const promise: Promise = obj;
   const out: object = Porffor.allocate();
-  out.promise = promise;
+  out.promise = obj as Promise;
 
   out.resolve = __Porffor_promise_resolveActive;
   out.reject = __Porffor_promise_rejectActive;
@@ -265,8 +260,7 @@ export const __Promise_resolve = (value: any): Promise => {
 
   __Porffor_promise_resolve(value, obj);
 
-  const pro: Promise = obj;
-  return pro;
+  return obj as Promise;
 };
 
 export const __Promise_reject = (reason: any): Promise => {
@@ -274,8 +268,7 @@ export const __Promise_reject = (reason: any): Promise => {
 
   __Porffor_promise_reject(reason, obj);
 
-  const pro: Promise = obj;
-  return pro;
+  return obj as Promise;
 };
 
 
@@ -296,19 +289,18 @@ export const __Promise_prototype_then = (_this: any, onFulfilled: any, onRejecte
 
   __Porffor_then(_this, fulfillReaction, rejectReaction);
 
-  const pro: Promise = outPromise;
-  return pro;
+  return outPromise as Promise;
 };
 
 // 27.2.5.1 Promise.prototype.catch (onRejected)
 // https://tc39.es/ecma262/#sec-promise.prototype.catch
-export const __Promise_prototype_catch = (_this: any, onRejected: any): Promise => {
+export const __Promise_prototype_catch = (_this: any, onRejected: any) => {
   // 1. Let promise be the this value.
   // 2. Return ? Invoke(promise, "then", « undefined, onRejected »).
   return __Promise_prototype_then(_this, undefined, onRejected);
 };
 
-export const __Promise_prototype_finally = (_this: any, onFinally: any): Promise => {
+export const __Promise_prototype_finally = (_this: any, onFinally: any) => {
   // custom impl based on then but also not (sorry)
   if (!__ecma262_IsPromise(_this)) throw new TypeError('Promise.prototype.then called on non-Promise');
 
@@ -332,8 +324,7 @@ export const __Promise_prototype_finally = (_this: any, onFinally: any): Promise
     __ecma262_HostEnqueuePromiseJob(__ecma262_NewPromiseReactionJob(finallyReaction, value));
   }
 
-  const pro: Promise = outPromise;
-  return pro;
+  return outPromise as Promise;
 };
 
 
@@ -480,18 +471,16 @@ export const __Promise_prototype_toString = (_this: any) => '[object Promise]';
 export const __Promise_prototype_toLocaleString = (_this: any) => __Promise_prototype_toString(_this);
 
 
-export const __Porffor_promise_await = (value: any) => {
+export const __Porffor_promise_await = (value: any): any => {
   if (Porffor.rawType(value) != Porffor.TYPES.promise) return value;
 
   // hack: peek value instead of awaiting
-  const promise: any[] = value;
-
-  const state: i32 = promise[1];
+  const state: i32 = (value as any[])[1];
 
   // pending
   if (state == 0) return value;
 
-  const result: any = promise[0];
+  const result: any = (value as any[])[0];
 
   // fulfilled
   if (state == 1) return result;

package/compiler/builtins/string_f64.ts

@@ -28,8 +28,7 @@ export const String = function (...args: any[]): string|bytestring|StringObject
   // force bytestrings to strings
   if (Porffor.rawType(s) == Porffor.TYPES.bytestring) s = Porffor.bytestringToString(s, s.length);
 
-  const O: StringObject = s;
-  return O;
+  return s as StringObject;
 };
 
 export const __String_fromCharCode = (...codes: any[]): bytestring|string => {

package/compiler/builtins/symbol.ts

@@ -17,8 +17,7 @@ export const Symbol = (description: any): Symbol => {
   }
 
   // 4. Return a new Symbol whose [[Description]] is descString.
-  const sym: Symbol = Porffor.array.fastPush(descStore, descString);
-  return sym;
+  return Porffor.array.fastPush(descStore, descString) as Symbol;
 };
 
 export const __Symbol_prototype_description$get = (_this: Symbol) => {
@@ -55,7 +54,6 @@ export const __Symbol_prototype_toString = (_this: Symbol) => {
   Porffor.wasm.i32.store8(Porffor.wasm`local.get ${out}` + descLen, 41, 0, 11);
 
   out.length = 8 + descLen;
-
   return out;
 };
 

package/compiler/builtins/z_ecma262.ts

@@ -71,13 +71,18 @@ export const __ecma262_ToNumber = (argument: unknown): number => {
 // https://tc39.es/ecma262/#sec-tonumeric
 export const __ecma262_ToNumeric = (value: unknown): number => {
   // 1. Let primValue be ? ToPrimitive(value, number).
-  // we do not have ToPrimitive
+  // only run ToPrimitive if pure object for perf
+  let primValue: any = value;
+  if (Porffor.rawType(value) == Porffor.TYPES.object && Porffor.wasm`local.get ${value}` != 0)
+    primValue = __ecma262_ToPrimitive_Number(value);
 
   // 2. If primValue is a BigInt, return primValue.
-  // todo: do this when we have bigints
+  if (Porffor.comptime.flag`hasType.bigint`) {
+    if (Porffor.rawType(primValue) == Porffor.TYPES.bigint) return primValue;
+  }
 
   // 3. Return ? ToNumber(primValue).
-  return __ecma262_ToNumber(value);
+  return __ecma262_ToNumber(primValue);
 };
 
 // 7.1.5 ToIntegerOrInfinity (argument)
@@ -154,8 +159,7 @@ export const __ecma262_ToString = (argument: unknown): any => {
 
   // hack: StringObject -> String
   if (type == Porffor.TYPES.stringobject) {
-    const remap: string = argument;
-    return remap;
+    return argument as string;
   }
 
   // 9. Assert: argument is an Object.
@@ -171,9 +175,8 @@ export const __ecma262_ToString = (argument: unknown): any => {
 // https://tc39.es/ecma262/#sec-topropertykey
 export const __ecma262_ToPropertyKey = (argument: any): any => {
   // 1. Let key be ? ToPrimitive(argument, string).
-  let key: any = argument;
-
   // only run ToPrimitive if pure object for perf
+  let key: any = argument;
   if (Porffor.rawType(argument) == Porffor.TYPES.object && Porffor.wasm`local.get ${argument}` != 0)
     key = __ecma262_ToPrimitive_String(argument);
 

package/compiler/builtins.js

@@ -131,8 +131,7 @@ export const BuiltinFuncs = function() {
       number(TYPES.number, Valtype.i32),
       [ Opcodes.local_get, 1 ],
       number(TYPES.number, Valtype.i32),
-      [ Opcodes.call, builtin('__Math_pow') ],
-      [ Opcodes.drop ],
+      [ Opcodes.call, builtin('__Math_pow') ]
     ]
   };
 
@@ -756,6 +755,7 @@ export const BuiltinFuncs = function() {
     params: [ Valtype.i32, Valtype.i32 ],
     locals: [],
     returns: [],
+    returnType: TYPES.undefined,
     wasm: [
       // dst
       [ Opcodes.local_get, 1 ],

package/compiler/builtins_objects.js

@@ -74,9 +74,7 @@ export default function({ builtinFuncs }, Prefs) {
             number(flags, Valtype.i32),
             number(TYPES.number, Valtype.i32),
 
-            [ Opcodes.call, builtin('__Porffor_object_expr_initWithFlags') ],
-            [ Opcodes.drop ],
-            [ Opcodes.drop ]
+            [ Opcodes.call, builtin('__Porffor_object_expr_initWithFlags') ]
           );
         }