porffor 0.36.5 → 0.36.6

package/compiler/builtins/__internal_object.ts

@@ -1,26 +1,64 @@
-const underlyingFuncObjs: Map = new Map();
+const underlyingKeys: any[] = new Array(0);
+const underlyingVals: any[] = new Array(0);
 export const __Porffor_object_getObject = (obj: any): any => {
-  if (Porffor.rawType(obj) == Porffor.TYPES.function) {
-    const funcI32: i32 = Porffor.wasm`local.get ${obj}`;
-    let underlying: object = underlyingFuncObjs.get(funcI32);
-    if (underlying == null) {
-      underlying = {};
-
-      // set prototype and prototype.constructor if constructor
-      const flags: i32 = __Porffor_funcLut_flags(funcI32);
-      if (flags & 0b10) { // constructor
-        const proto = {};
-        const key1: bytestring = 'prototype';
-        __Porffor_object_expr_initWithFlags(underlying, key1, proto, 0b1000);
-
-        const key2: bytestring = 'constructor';
-        __Porffor_object_expr_initWithFlags(proto, key2, obj, 0b1010);
+  const t: i32 = Porffor.rawType(obj);
+  if (t == Porffor.TYPES.object) return obj;
+
+  if (Porffor.fastAnd(t > 0x05, t != Porffor.TYPES.string, t != Porffor.TYPES.bytestring, t != Porffor.TYPES.undefined)) {
+    let idx: i32 = underlyingKeys.indexOf(obj);
+    if (idx == -1) {
+      const underlying: object = {};
+
+      if (t == Porffor.TYPES.function) {
+        const flags: i32 = __Porffor_funcLut_flags(obj);
+        if (flags & 0b10) { // constructor
+          // set prototype and prototype.constructor if function and constructor
+          const proto = {};
+          const key1: bytestring = 'prototype';
+          __Porffor_object_expr_initWithFlags(underlying, key1, proto, 0b1000);
+
+          const key2: bytestring = 'constructor';
+          __Porffor_object_expr_initWithFlags(proto, key2, obj, 0b1010);
+        }
+      }
+
+      Porffor.array.fastPush(underlyingVals, underlying);
+      idx = Porffor.array.fastPush(underlyingKeys, obj) - 1;
+    }
+
+    return underlyingVals[idx];
+  }
+
+  return obj;
+};
+
+export const __Porffor_object_makeObject = (obj: any): any => {
+  const t: i32 = Porffor.rawType(obj);
+  if (t == Porffor.TYPES.object) return obj;
+
+  if (Porffor.fastAnd(t > 0x05, t != Porffor.TYPES.string, t != Porffor.TYPES.bytestring, t != Porffor.TYPES.undefined)) {
+    let idx: i32 = underlyingKeys.indexOf(obj);
+    if (idx == -1) {
+      const underlying: object = {};
+
+      if (t == Porffor.TYPES.function) {
+        const flags: i32 = __Porffor_funcLut_flags(obj);
+        if (flags & 0b10) { // constructor
+          // set prototype and prototype.constructor if function and constructor
+          const proto = {};
+          const key1: bytestring = 'prototype';
+          __Porffor_object_expr_initWithFlags(underlying, key1, proto, 0b1000);
+
+          const key2: bytestring = 'constructor';
+          __Porffor_object_expr_initWithFlags(proto, key2, obj, 0b1010);
+        }
       }
 
-      underlyingFuncObjs.set(funcI32, underlying);
+      Porffor.array.fastPush(underlyingVals, underlying);
+      idx = Porffor.array.fastPush(underlyingKeys, obj) - 1;
     }
 
-    return underlying;
+    return underlyingVals[idx];
   }
 
   return obj;

package/compiler/builtins/_internal_object.ts

@@ -18,7 +18,7 @@ import type {} from './porffor.d.ts';
 
 export const __Porffor_object_preventExtensions = (obj: any): void => {
   if (Porffor.wasm`local.get ${obj+1}` != Porffor.TYPES.object) {
-    obj = __Porffor_object_getObject(obj);
+    obj = __Porffor_object_makeObject(obj);
     if (Porffor.wasm`local.get ${obj+1}` != Porffor.TYPES.object) return;
   }
 
@@ -124,7 +124,7 @@ export const __Porffor_object_accessorSet = (entryPtr: i32): Function => {
 export const __Porffor_object_lookup = (obj: any, target: any): i32 => {
   if (Porffor.wasm`local.get ${obj}` == 0) return -1;
   if (Porffor.wasm`local.get ${obj+1}` != Porffor.TYPES.object) {
-    obj = __Porffor_object_getObject(obj);
+    obj = __Porffor_object_makeObject(obj);
     if (Porffor.wasm`local.get ${obj+1}` != Porffor.TYPES.object) return -1;
   }
 
@@ -171,8 +171,6 @@ export const __Porffor_object_lookup = (obj: any, target: any): i32 => {
 };
 
 export const __Porffor_object_get = (obj: any, key: any): any => {
-  if (Porffor.wasm`local.get ${obj}` == 0) throw new TypeError('Cannot get property of null');
-
   const trueType: i32 = Porffor.wasm`local.get ${obj+1}`;
   if (trueType == Porffor.TYPES.function) {
     const tmp1: bytestring = 'name';
@@ -197,7 +195,10 @@ return`;
     }
   }
 
-  if (trueType != Porffor.TYPES.object) obj = __Porffor_object_getObject(obj);
+  if (trueType != Porffor.TYPES.object) obj = __Porffor_object_makeObject(obj);
+
+  if (Porffor.wasm`local.get ${obj}` == 0) throw new TypeError('Cannot get property of null');
+
   let entryPtr: i32 = __Porffor_object_lookup(obj, key);
   if (entryPtr == -1) {
     if (Porffor.wasm`local.get ${obj+1}` == Porffor.TYPES.object) {
@@ -289,13 +290,13 @@ export const __Porffor_object_writeKey = (ptr: i32, key: any): void => {
 };
 
 export const __Porffor_object_set = (obj: any, key: any, value: any): any => {
-  if (Porffor.wasm`local.get ${obj}` == 0) throw new TypeError('Cannot set property of null');
-
   if (Porffor.wasm`local.get ${obj+1}` != Porffor.TYPES.object) {
-    obj = __Porffor_object_getObject(obj);
+    obj = __Porffor_object_makeObject(obj);
     if (Porffor.wasm`local.get ${obj+1}` != Porffor.TYPES.object) return value;
   }
 
+  if (Porffor.wasm`local.get ${obj}` == 0) throw new TypeError('Cannot set property of null');
+
   let entryPtr: i32 = __Porffor_object_lookup(obj, key);
   let flags: i32;
   if (entryPtr == -1) {
@@ -378,7 +379,7 @@ export const __Porffor_object_setStrict = (obj: any, key: any, value: any): any
   if (Porffor.wasm`local.get ${obj}` == 0) throw new TypeError('Cannot set property of null');
 
   if (Porffor.wasm`local.get ${obj+1}` != Porffor.TYPES.object) {
-    obj = __Porffor_object_getObject(obj);
+    obj = __Porffor_object_makeObject(obj);
     if (Porffor.wasm`local.get ${obj+1}` != Porffor.TYPES.object) return value;
   }
 
@@ -462,7 +463,7 @@ export const __Porffor_object_setStrict = (obj: any, key: any, value: any): any
 
 export const __Porffor_object_define = (obj: any, key: any, value: any, flags: i32): void => {
   if (Porffor.wasm`local.get ${obj+1}` != Porffor.TYPES.object) {
-    obj = __Porffor_object_getObject(obj);
+    obj = __Porffor_object_makeObject(obj);
     if (Porffor.wasm`local.get ${obj+1}` != Porffor.TYPES.object) return;
   }
 
@@ -699,7 +700,7 @@ export const __Porffor_object_isObjectOrSymbol = (arg: any): boolean => {
 
 // used for { foo: 5 }
 export const __Porffor_object_expr_init = (obj: any, key: any, value: any): void => {
-  if (Porffor.wasm`local.get ${obj+1}` != Porffor.TYPES.object) obj = __Porffor_object_getObject(obj);
+  if (Porffor.wasm`local.get ${obj+1}` != Porffor.TYPES.object) obj = __Porffor_object_makeObject(obj);
   let entryPtr: i32 = __Porffor_object_lookup(obj, key);
   if (entryPtr == -1) {
     // add new entry
@@ -724,7 +725,7 @@ export const __Porffor_object_expr_init = (obj: any, key: any, value: any): void
 };
 
 export const __Porffor_object_expr_initWithFlags = (obj: any, key: any, value: any, flags: i32): void => {
-  if (Porffor.wasm`local.get ${obj+1}` != Porffor.TYPES.object) obj = __Porffor_object_getObject(obj);
+  if (Porffor.wasm`local.get ${obj+1}` != Porffor.TYPES.object) obj = __Porffor_object_makeObject(obj);
   let entryPtr: i32 = __Porffor_object_lookup(obj, key);
   if (entryPtr == -1) {
     // add new entry
@@ -749,7 +750,7 @@ export const __Porffor_object_expr_initWithFlags = (obj: any, key: any, value: a
 
 // used for { get foo() {} }
 export const __Porffor_object_expr_get = (obj: any, key: any, get: any): void => {
-  if (Porffor.wasm`local.get ${obj+1}` != Porffor.TYPES.object) obj = __Porffor_object_getObject(obj);
+  if (Porffor.wasm`local.get ${obj+1}` != Porffor.TYPES.object) obj = __Porffor_object_makeObject(obj);
   let entryPtr: i32 = __Porffor_object_lookup(obj, key);
   let set: any = undefined;
   if (entryPtr == -1) {
@@ -779,7 +780,7 @@ export const __Porffor_object_expr_get = (obj: any, key: any, get: any): void =>
 
 // used for { set foo(v) {} }
 export const __Porffor_object_expr_set = (obj: any, key: any, set: any): void => {
-  if (Porffor.wasm`local.get ${obj+1}` != Porffor.TYPES.object) obj = __Porffor_object_getObject(obj);
+  if (Porffor.wasm`local.get ${obj+1}` != Porffor.TYPES.object) obj = __Porffor_object_makeObject(obj);
   let entryPtr: i32 = __Porffor_object_lookup(obj, key);
   let get: any = undefined;
   if (entryPtr == -1) {

package/compiler/builtins/object.ts

@@ -18,7 +18,6 @@ export const __Object_keys = (obj: any): any[] => {
   if (obj == null) throw new TypeError('Argument is nullish, expected object');
   const out: any[] = Porffor.allocate();
 
-  obj = __Porffor_object_getObject(obj);
   const t: i32 = Porffor.rawType(obj);
   if (t == Porffor.TYPES.object) {
     let ptr: i32 = Porffor.wasm`local.get ${obj}` + 5;
@@ -65,16 +64,24 @@ local.set ${key}`;
     }
 
     out.length = i;
-  } else if (Porffor.fastOr(
-    t == Porffor.TYPES.array,
-    t == Porffor.TYPES.bytestring,
-    t == Porffor.TYPES.string
-  )) {
-    const len: i32 = obj.length;
-    out.length = len;
+  } else {
+    if (Porffor.fastOr(
+      t == Porffor.TYPES.array,
+      t == Porffor.TYPES.bytestring,
+      t == Porffor.TYPES.string
+    )) {
+      const len: i32 = obj.length;
+      out.length = len;
+
+      for (let i: i32 = 0; i < len; i++) {
+        out[i] = __Number_prototype_toString(i);
+      }
+    }
 
-    for (let i: i32 = 0; i < len; i++) {
-      out[i] = __Number_prototype_toString(i);
+    obj = __Porffor_object_makeObject(obj);
+    if (Porffor.rawType(obj) == Porffor.TYPES.object) {
+      const objKeys: any[] = __Object_keys(obj);
+      for (const x of objKeys) Porffor.array.fastPush(out, x);
     }
   }
 
@@ -85,7 +92,6 @@ export const __Object_values = (obj: any): any[] => {
   if (obj == null) throw new TypeError('Argument is nullish, expected object');
   const out: any[] = Porffor.allocate();
 
-  obj = __Porffor_object_getObject(obj);
   const t: i32 = Porffor.rawType(obj);
   if (t == Porffor.TYPES.object) {
     let ptr: i32 = Porffor.wasm`local.get ${obj}` + 5;
@@ -112,16 +118,24 @@ local.set ${val+1}`;
     }
 
     out.length = i;
-  } else if (Porffor.fastOr(
-    t == Porffor.TYPES.array,
-    t == Porffor.TYPES.bytestring,
-    t == Porffor.TYPES.string
-  )) {
-    const len: i32 = obj.length;
-    out.length = len;
+  } else {
+    if (Porffor.fastOr(
+      t == Porffor.TYPES.array,
+      t == Porffor.TYPES.bytestring,
+      t == Porffor.TYPES.string
+    )) {
+      const len: i32 = obj.length;
+      out.length = len;
+
+      for (let i: i32 = 0; i < len; i++) {
+        out[i] = obj[i];
+      }
+    }
 
-    for (let i: i32 = 0; i < len; i++) {
-      out[i] = obj[i];
+    obj = __Porffor_object_makeObject(obj);
+    if (Porffor.rawType(obj) == Porffor.TYPES.object) {
+      const objVals: any[] = __Object_values(obj);
+      for (const x of objVals) Porffor.array.fastPush(out, x);
     }
   }
 
@@ -181,6 +195,11 @@ export const __Object_prototype_hasOwnProperty = (_this: any, prop: any) => {
     return Porffor.object.lookup(_this, p) != -1;
   }
 
+  const obj: any = __Porffor_object_makeObject(_this);
+  if (Porffor.rawType(obj) == Porffor.TYPES.object) {
+    if (Porffor.object.lookup(obj, p) != -1) return true;
+  }
+
   const keys: any[] = __Object_keys(_this);
   return __Array_prototype_includes(keys, p);
 };
@@ -262,14 +281,19 @@ export const __Porffor_object_assignAll = (target: any, source: any) => {
 export const __Object_prototype_propertyIsEnumerable = (_this: any, prop: any) => {
   const p: any = ecma262.ToPropertyKey(prop);
 
-  const obj: any = __Porffor_object_getObject(_this);
-  if (Porffor.rawType(obj) == Porffor.TYPES.object) {
+  if (Porffor.rawType(_this) == Porffor.TYPES.object) {
     const entryPtr: i32 = Porffor.object.lookup(_this, p);
     if (entryPtr == -1) return false;
 
     return Porffor.object.isEnumerable(entryPtr);
   }
 
+  const obj: any = __Porffor_object_makeObject(_this);
+  if (Porffor.rawType(obj) == Porffor.TYPES.object) {
+    const entryPtr: i32 = Porffor.object.lookup(obj, p);
+    if (entryPtr != -1) return Porffor.object.isEnumerable(entryPtr);
+  }
+
   const keys: any[] = __Object_keys(_this);
   return __Array_prototype_includes(keys, p);
 };
@@ -413,7 +437,7 @@ export const __Object_getOwnPropertyDescriptors = (obj: any): any => {
   const out: object = {};
 
   if (Porffor.rawType(obj) != Porffor.TYPES.object) {
-    obj = __Porffor_object_getObject(obj);
+    obj = __Porffor_object_makeObject(obj);
     if (Porffor.rawType(obj) != Porffor.TYPES.object) return out;
   }
 
@@ -475,16 +499,24 @@ local.set ${key}`;
     }
 
     out.length = i;
-  } else if (Porffor.fastOr(
-    t == Porffor.TYPES.array,
-    t == Porffor.TYPES.bytestring,
-    t == Porffor.TYPES.string
-  )) {
-    const len: i32 = obj.length;
-    out.length = len;
+  } else {
+    if (Porffor.fastOr(
+      t == Porffor.TYPES.array,
+      t == Porffor.TYPES.bytestring,
+      t == Porffor.TYPES.string
+    )) {
+      const len: i32 = obj.length;
+      out.length = len;
+
+      for (let i: i32 = 0; i < len; i++) {
+        out[i] = __Number_prototype_toString(i);
+      }
+    }
 
-    for (let i: i32 = 0; i < len; i++) {
-      out[i] = __Number_prototype_toString(i);
+    obj = __Porffor_object_makeObject(obj);
+    if (Porffor.rawType(obj) == Porffor.TYPES.object) {
+      const objKeys: any[] = __Object_getOwnPropertyNames(obj);
+      for (const x of objKeys) Porffor.array.fastPush(out, x);
     }
   }
 
@@ -495,6 +527,7 @@ export const __Object_getOwnPropertySymbols = (obj: any): any[] => {
   if (obj == null) throw new TypeError('Argument is nullish, expected object');
   const out: any[] = Porffor.allocate();
 
+  obj = __Porffor_object_makeObject(obj);
   const t: i32 = Porffor.rawType(obj);
   if (t == Porffor.TYPES.object) {
     let ptr: i32 = Porffor.wasm`local.get ${obj}` + 5;

package/compiler/builtins/reflect.ts

@@ -132,16 +132,24 @@ local.set ${key}`;
     }
 
     out.length = i;
-  } else if (Porffor.fastOr(
-    t == Porffor.TYPES.array,
-    t == Porffor.TYPES.bytestring,
-    t == Porffor.TYPES.string
-  )) {
-    const len: i32 = target.length;
-    out.length = len;
-
-    for (let i: i32 = 0; i < len; i++) {
-      out[i] = __Number_prototype_toString(i);
+  } else {
+    if (Porffor.fastOr(
+      t == Porffor.TYPES.array,
+      t == Porffor.TYPES.bytestring,
+      t == Porffor.TYPES.string
+    )) {
+      const len: i32 = obj.length;
+      out.length = len;
+
+      for (let i: i32 = 0; i < len; i++) {
+        out[i] = __Number_prototype_toString(i);
+      }
+    }
+
+    target = __Porffor_object_getObject(target);
+    if (Porffor.rawType(target) == Porffor.TYPES.object) {
+      const objKeys: any[] = __Reflect_ownKeys(target);
+      for (const x of objKeys) Porffor.array.fastPush(out, x);
     }
   }