porffor 0.20.8 → 0.20.9

package/compiler/builtins/_internal_object.ts

@@ -128,4 +128,95 @@ export const __Porffor_object_set = (_this: object, key: any, value: any): any =
     0, 12);
 
   return value;
+};
+
+export const __Porffor_object_define = (_this: object, key: any, value: any, flags: any): any => {
+  let entryPtr: i32 = __Porffor_object_lookup(_this, key);
+  if (entryPtr == -1) {
+    // add new entry
+    // bump size +1
+    const size: i32 = Porffor.wasm.i32.load(_this, 0, 0);
+    Porffor.wasm.i32.store(_this, size + 1, 0, 0);
+
+    // entryPtr = current end of object
+    entryPtr = Porffor.wasm`local.get ${_this}` + 4 + size * 14;
+
+    // encode key type, set MSB if regular string
+    let keyEnc: i32 = Porffor.wasm`local.get ${key}`;
+    if (Porffor.wasm`local.get ${key+1}` == Porffor.TYPES.string) keyEnc |= 0x80000000;
+
+    // write key value and type (MSB)
+    Porffor.wasm.i32.store(entryPtr, keyEnc, 0, 0);
+  } else {
+    // existing entry, check and maybe modify it
+    const tail: i32 = Porffor.wasm.i32.load16_u(entryPtr, 0, 12);
+
+    if ((tail & 0b0010) == 0) {
+      // not already configurable, check to see if we can redefine
+      if ((tail & 0b1111) != flags) {
+        // flags have changed, perform checks
+        let err: boolean = false;
+
+        // descriptor type (accessor/data) and/or flags (other than writable) have changed
+        if ((tail & 0b0111) != flags) err = true;
+          else if (!(tail & 0b0001) && !(tail & 0b1000)) {
+          // data descriptor and already non-writable only checks
+          // trying to change writable false -> true
+          if (flags & 0b1000) {
+            err = true;
+          } else {
+            // if already non-writable, check value isn't being changed
+            Porffor.wasm`
+local.get ${entryPtr}
+f64.load 0 4
+local.get ${value}
+f64.ne
+
+local.get ${entryPtr}
+i32.load8_u 0 13
+local.get ${value+1}
+i32.ne
+i32.or
+local.set ${err}`;
+          }
+        }
+
+        if (err) throw new TypeError('Cannot redefine property');
+      }
+    }
+  }
+
+  // write new value value (lol)
+  Porffor.wasm.f64.store(entryPtr, value, 0, 4);
+
+  // write new tail (value type + flags)
+  Porffor.wasm.i32.store16(entryPtr,
+    flags + (Porffor.wasm`local.get ${value+1}` << 8),
+    0, 12);
+};
+
+export const __Porffor_object_isEnumerable = (ptr: i32): boolean => {
+  return Porffor.wasm.i32.load8_u(ptr, 0, 12) & 0b0100;
+};
+
+export const __Porffor_object_isObject = (arg: any): boolean => {
+  const t: i32 = Porffor.wasm`local.get ${arg+1}`;
+  return Porffor.fastAnd(
+    arg != 0, // null
+    t > 0x05,
+    t != Porffor.TYPES.undefined,
+    t != Porffor.TYPES.string,
+    t != Porffor.TYPES.bytestring,
+  );
+};
+
+export const __Porffor_object_isObjectOrSymbol = (arg: any): boolean => {
+  const t: i32 = Porffor.wasm`local.get ${arg+1}`;
+  return Porffor.fastAnd(
+    arg != 0, // null
+    t > 0x04,
+    t != Porffor.TYPES.undefined,
+    t != Porffor.TYPES.string,
+    t != Porffor.TYPES.bytestring,
+  );
 };

package/compiler/builtins/object.ts

@@ -21,15 +21,12 @@ export const __Object_keys = (obj: any): any[] => {
 
   const t: i32 = Porffor.rawType(obj);
   if (t == Porffor.TYPES.object) {
-    const size: i32 = Porffor.wasm.i32.load(obj, 0, 0);
-    let len: i32 = size;
-
     let ptr: i32 = Porffor.wasm`local.get ${obj}` + 4;
-    const endPtr: i32 = ptr + size * 14;
+    const endPtr: i32 = ptr + Porffor.wasm.i32.load(obj, 0, 0) * 14;
 
     let i: i32 = 0;
     for (; ptr < endPtr; ptr += 14) {
-      // todo: check enumerable flag
+      if (!Porffor.object.isEnumerable(ptr)) continue;
 
       let key: any;
       Porffor.wasm`local raw i32
@@ -60,7 +57,7 @@ local.set ${key}`;
       out[i++] = key;
     }
 
-    out.length = len;
+    out.length = i;
   } else if (Porffor.fastOr(
     t == Porffor.TYPES.array,
     t == Porffor.TYPES.bytestring,
@@ -84,15 +81,12 @@ export const __Object_values = (obj: any): any[] => {
 
   const t: i32 = Porffor.rawType(obj);
   if (t == Porffor.TYPES.object) {
-    const size: i32 = Porffor.wasm.i32.load(obj, 0, 0);
-    let len: i32 = size;
-
     let ptr: i32 = Porffor.wasm`local.get ${obj}` + 4;
-    const endPtr: i32 = ptr + size * 14;
+    const endPtr: i32 = ptr + Porffor.wasm.i32.load(obj, 0, 0) * 14;
 
     let i: i32 = 0;
     for (; ptr < endPtr; ptr += 14) {
-      // todo: check enumerable flag
+      if (!Porffor.object.isEnumerable(ptr)) continue;
 
       let val: any;
       Porffor.wasm`local ptr32 i32
@@ -110,7 +104,7 @@ local.set ${val+1}`;
       out[i++] = val;
     }
 
-    out.length = len;
+    out.length = i;
   } else if (Porffor.fastOr(
     t == Porffor.TYPES.array,
     t == Porffor.TYPES.bytestring,
@@ -154,7 +148,7 @@ export const __Object_fromEntries = (iterable: any): object => {
   const out: object = {};
 
   for (const x of iterable) {
-    if (Porffor.rawType(x) < 0x06) throw new TypeError('Iterator contains non-object');
+    if (!Porffor.object.isObject(x)) throw new TypeError('Iterator contains non-object');
     out[ecma262.ToPropertyKey(x[0])] = x[1];
   }
 
@@ -167,7 +161,7 @@ export const __Object_prototype_hasOwnProperty = (_this: any, prop: any) => {
 
   const t: i32 = Porffor.rawType(_this);
   if (t == Porffor.TYPES.object) {
-    return __Porffor_object_lookup(_this, prop) != -1;
+    return Porffor.object.lookup(_this, p) != -1;
   }
 
   const keys: any[] = __Object_keys(_this);
@@ -196,6 +190,49 @@ export const __Object_assign = (target: any, ...sources: any[]) => {
   return target;
 };
 
+export const __Object_defineProperty = (target: any, prop: any, descriptor: any) => {
+  if (!Porffor.object.isObject(target)) throw new TypeError('Target is a non-object');
+
+  // if (Porffor.rawType(descriptor) < 0x06) {
+  if (Porffor.rawType(descriptor) != Porffor.TYPES.object) {
+    throw new TypeError('Descriptor is a non-object');
+  }
+
+  const p: any = ecma262.ToPropertyKey(prop);
+
+  const desc: object = descriptor;
+
+  // base keys
+  const configurable: any = desc.configurable; // defaults to false/undefined
+  const enumerable: any = desc.enumerable; // defaults to false/undefined
+
+  // data descriptor keys
+  const value: any = desc.value;
+  const writable: any = desc.writable;
+
+  const get: any = desc.get;
+  const set: any = desc.set;
+
+  let accessor: boolean = false;
+
+  if (get || set) {
+    if (value || writable) {
+      throw new TypeError('Descriptor cannot define both accessor and data descriptor attributes');
+    }
+
+    accessor = true;
+  }
+
+  let flags: i32 = 0b0000;
+  if (accessor) flags |= 0b0001;
+  if (configurable) flags |= 0b0010;
+  if (enumerable) flags |= 0b0100;
+  if (writable) flags |= 0b1000;
+
+  Porffor.object.define(target, p, value, flags);
+  return target;
+};
+
 
 export const __Object_prototype_toString = (_this: object) => {
   let out: bytestring = '[object Object]';

package/compiler/builtins/weakref.ts

@@ -3,7 +3,7 @@ import type {} from './porffor.d.ts';
 export const WeakRef = function (target: any): WeakRef {
   if (!new.target) throw new TypeError("Constructor WeakRef requires 'new'");
 
-  if (Porffor.rawType(target) < 0x05) throw new TypeError('Target for WeakRef needs to be an object or symbol');
+  if (!Porffor.object.isObjectOrSymbol(target)) throw new TypeError('Target for WeakRef needs to be an object or symbol');
 
   const out: WeakRef = Porffor.allocateBytes(9);
 

package/compiler/builtins/z_ecma262.ts

@@ -22,10 +22,9 @@ export const __ecma262_ToIntegerOrInfinity = (argument: unknown): number => {
   return number;
 };
 
-// todo: support non-bytestring properly
 // 7.1.17 ToString (argument)
 // https://tc39.es/ecma262/#sec-tostring
-export const __ecma262_ToString = (argument: unknown): bytestring => {
+export const __ecma262_ToString = (argument: unknown): any => {
   const type: i32 = Porffor.rawType(argument);
 
   // 1. If argument is a String, return argument.

package/compiler/builtins/z_map.ts

@@ -98,7 +98,7 @@ export const Map = function (iterable: any): Map {
   Porffor.wasm.i32.store(out, vals, 0, 4);
 
   if (iterable != null) for (const x of iterable) {
-    if (Porffor.rawType(x) < 0x06) throw new TypeError('Iterator contains non-object');
+    if (!Porffor.object.isObject(x)) throw new TypeError('Iterator contains non-object');
     __Map_prototype_set(out, x[0], x[1]);
   }
 

package/compiler/builtins/z_weakmap.ts

@@ -3,7 +3,7 @@ import type {} from './porffor.d.ts';
 export const __WeakMap_prototype_has = (_this: WeakMap, key: any) => __Map_prototype_has(_this, key);
 
 export const __WeakMap_prototype_set = (_this: WeakMap, key: any, value: any) => {
-  if (Porffor.rawType(key) < 0x05) throw new TypeError('Value in WeakSet needs to be an object or symbol');
+  if (!Porffor.object.isObjectOrSymbol(key)) throw new TypeError('Value in WeakSet needs to be an object or symbol');
 
   __Map_prototype_set(_this, key, value);
   return _this;
@@ -23,7 +23,7 @@ export const WeakMap = function (iterable: any): WeakMap {
   Porffor.wasm.i32.store(out, vals, 0, 4);
 
   if (iterable != null) for (const x of iterable) {
-    if (Porffor.rawType(x) < 0x06) throw new TypeError('Iterator contains non-object');
+    if (!Porffor.object.isObject(x)) throw new TypeError('Iterator contains non-object');
     __WeakMap_prototype_set(out, x[0], x[1]);
   }
 

package/compiler/builtins/z_weakset.ts

@@ -3,7 +3,7 @@ import type {} from './porffor.d.ts';
 export const __WeakSet_prototype_has = (_this: WeakSet, value: any) => __Set_prototype_has(_this, value);
 
 export const __WeakSet_prototype_add = (_this: WeakSet, value: any) => {
-  if (Porffor.rawType(value) < 0x05) throw new TypeError('Value in WeakSet needs to be an object or symbol');
+  if (!Porffor.object.isObjectOrSymbol(value)) throw new TypeError('Value in WeakSet needs to be an object or symbol');
 
   __Set_prototype_add(_this, value);
   return _this;

package/compiler/codegen.js

@@ -2918,7 +2918,7 @@ const generateAssign = (scope, decl, _global, _name, valueUnused = false) => {
         ...(op === '=' ? [] : [ [ Opcodes.local_tee, localTmp(scope, '#objset_object', Valtype.i32) ] ]),
         ...getNodeType(scope, object),
 
-        ...generate(scope, property),
+        ...generate(scope, property, false, '#member_prop'),
         ...getNodeType(scope, property),
         ...toPropertyKey(scope, op === '='),
         ...(op === '=' ? [] : [ [ Opcodes.local_set, localTmp(scope, '#objset_property_type', Valtype.i32) ] ]),
@@ -4212,6 +4212,7 @@ const makeArray = (scope, decl, global = false, name = '$undeclared', initEmpty
     const local = global ? globals[name] : scope.locals[name];
     if (
       Prefs.data && firstAssign && useRawElements &&
+      name !== '#member_prop' &&
       (!globalThis.precompile || !global)
     ) {
       makeData(scope, elements, rawPtr, itemType, initEmpty);
@@ -4727,7 +4728,7 @@ const generateMember = (scope, decl, _global, _name) => {
       [ Opcodes.br, 1 ],
       [ Opcodes.end ],
 
-      ...generate(scope, property),
+      ...generate(scope, property, false, '#member_prop'),
       [ Opcodes.local_set, localTmp(scope, '#member_prop') ]
     );
 
@@ -4739,7 +4740,7 @@ const generateMember = (scope, decl, _global, _name) => {
       ...generate(scope, object),
       [ Opcodes.local_set, localTmp(scope, '#member_obj') ],
 
-      ...generate(scope, property),
+      ...generate(scope, property, false, '#member_prop'),
       [ Opcodes.local_set, localTmp(scope, '#member_prop') ]
     );
   }