porffor 0.37.20 → 0.37.22

package/compiler/builtins/__internal_object.ts

@@ -4,7 +4,7 @@ export const __Porffor_object_underlying = (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)) {
+  if (Porffor.fastAnd(t > 0x05, t != Porffor.TYPES.undefined)) {
     let idx: i32 = underlyingKeys.indexOf(obj);
     if (idx == -1) {
       const underlying: object = {};
@@ -22,6 +22,47 @@ export const __Porffor_object_underlying = (obj: any): any => {
         }
       }
 
+      if (t == Porffor.TYPES.array) {
+        const arr: any[] = obj;
+        const len: i32 = arr.length;
+
+        const key3: bytestring = 'length';
+        __Porffor_object_expr_initWithFlags(underlying, key3, len, 0b1000);
+
+        // todo: this should somehow be kept in sync?
+        for (let i: i32 = 0; i < len; i++) {
+          __Porffor_object_expr_initWithFlags(underlying, __Number_prototype_toString(i), arr[i], 0b1110);
+        }
+      }
+
+      if (t == Porffor.TYPES.string) {
+        const str: string = obj;
+        const len: i32 = str.length;
+
+        const key3: bytestring = 'length';
+        __Porffor_object_expr_initWithFlags(underlying, key1, len, 0b0000);
+
+        for (let i: i32 = 0; i < len; i++) {
+          __Porffor_object_expr_initWithFlags(underlying, __Number_prototype_toString(i), str[i], 0b0100);
+        }
+
+        Porffor.object.preventExtensions(underlying);
+      }
+
+      if (t == Porffor.TYPES.bytestring) {
+        const str: bytestring = obj;
+        const len: i32 = str.length;
+
+        const key3: bytestring = 'length';
+        __Porffor_object_expr_initWithFlags(underlying, key1, len, 0b0000);
+
+        for (let i: i32 = 0; i < len; i++) {
+          __Porffor_object_expr_initWithFlags(underlying, __Number_prototype_toString(i), str[i], 0b0100);
+        }
+
+        Porffor.object.preventExtensions(underlying);
+      }
+
       Porffor.array.fastPush(underlyingVals, underlying);
       idx = Porffor.array.fastPush(underlyingKeys, obj) - 1;
     }

package/compiler/builtins/object.ts

@@ -18,6 +18,7 @@ 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_underlying(obj);
   const t: i32 = Porffor.rawType(obj);
   if (t == Porffor.TYPES.object) {
     let ptr: i32 = Porffor.wasm`local.get ${obj}` + 5;
@@ -64,25 +65,6 @@ 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;
-
-      for (let i: i32 = 0; i < len; i++) {
-        out[i] = __Number_prototype_toString(i);
-      }
-    }
-
-    obj = __Porffor_object_underlying(obj);
-    if (Porffor.rawType(obj) == Porffor.TYPES.object) {
-      const objKeys: any[] = __Object_keys(obj);
-      for (const x of objKeys) Porffor.array.fastPush(out, x);
-    }
   }
 
   return out;
@@ -92,6 +74,7 @@ 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_underlying(obj);
   const t: i32 = Porffor.rawType(obj);
   if (t == Porffor.TYPES.object) {
     let ptr: i32 = Porffor.wasm`local.get ${obj}` + 5;
@@ -118,25 +101,6 @@ 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;
-
-      for (let i: i32 = 0; i < len; i++) {
-        out[i] = obj[i];
-      }
-    }
-
-    obj = __Porffor_object_underlying(obj);
-    if (Porffor.rawType(obj) == Porffor.TYPES.object) {
-      const objVals: any[] = __Object_values(obj);
-      for (const x of objVals) Porffor.array.fastPush(out, x);
-    }
   }
 
   return out;
@@ -454,6 +418,7 @@ export const __Object_getOwnPropertyNames = (obj: any): any[] => {
   if (obj == null) throw new TypeError('Argument is nullish, expected object');
   const out: any[] = Porffor.allocate();
 
+  obj = __Porffor_object_underlying(obj);
   const t: i32 = Porffor.rawType(obj);
   if (t == Porffor.TYPES.object) {
     let ptr: i32 = Porffor.wasm`local.get ${obj}` + 5;
@@ -499,25 +464,6 @@ 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;
-
-      for (let i: i32 = 0; i < len; i++) {
-        out[i] = __Number_prototype_toString(i);
-      }
-    }
-
-    obj = __Porffor_object_underlying(obj);
-    if (Porffor.rawType(obj) == Porffor.TYPES.object) {
-      const objKeys: any[] = __Object_getOwnPropertyNames(obj);
-      for (const x of objKeys) Porffor.array.fastPush(out, x);
-    }
   }
 
   return out;

package/compiler/builtins/promise.ts

@@ -366,7 +366,6 @@ export const __Promise_allSettled = (promises: any): Promise => {
       _allLen++;
       if (__ecma262_IsPromise(x)) {
         x.then(r => {
-          // Porffor.print(r);
           const o = {};
           let status: bytestring = '';
           status = 'fulfilled';