porffor 0.30.2 → 0.30.3

package/compiler/builtins/object.ts

@@ -669,7 +669,7 @@ export const __Object_prototype_valueOf = (_this: any) => {
 
 
 export const __Porffor_object_spread = (dst: object, src: any): object => {
-  if (src == null) return;
+  if (src == null) return dst;
 
   // todo/perf: optimize this (and assign) for object instead of reading over object 2x
   const keys: any[] = __Object_keys(src);
@@ -681,5 +681,25 @@ export const __Porffor_object_spread = (dst: object, src: any): object => {
     Porffor.object.expr.init(dst, keys[i], vals[i]);
   }
 
+  return dst;
+};
+
+export const __Porffor_object_rest = (dst: object, src: any, ...blocklist: any[]): object => {
+  if (src == null) return dst;
+
+  // todo: use ToPropertyKey on blocklist?
+
+  // todo/perf: optimize this (and assign) for object instead of reading over object 2x
+  const keys: any[] = __Object_keys(src);
+  const vals: any[] = __Object_values(src);
+
+  const len: i32 = keys.length;
+  for (let i: i32 = 0; i < len; i++) {
+    const k: any = keys[i];
+    if (blocklist.includes(k)) continue;
+
+    Porffor.object.expr.init(dst, k, vals[i]);
+  }
+
   return dst;
 };

package/compiler/builtins_precompiled.js

@@ -1915,11 +1915,18 @@ export const BuiltinFuncs = function() {
     locals: [], localNames: ["_this","_this#type"],
   };
   this.__Porffor_object_spread = {
-    wasm: (scope, {builtin}) => [[32,2],[33,4],[32,3],[33,5],[2,127],[32,5],[65,0],[70],[4,64,"TYPESWITCH|empty"],[65,1],[12,1],[11],[32,5],[65,7],[70],[4,64,"TYPESWITCH|Object"],[32,4],[68,0,0,0,0,0,0,0,0],[97],[12,1],[11],[32,5],[65,128,1],[70],[4,64,"TYPESWITCH|undefined"],[65,1],[12,1],[11],[65,0],[11,"TYPESWITCH_end"],[4,64],[68,0,0,0,0,0,0,0,0],[65,128,1],[15],[11],[32,2],[32,3],[16, builtin('__Object_keys')],[26],[33,6],[32,2],[32,3],[16, builtin('__Object_values')],[26],[33,8],[32,6],[252,3],[40,1,0],[184],[33,9],[68,0,0,0,0,0,0,0,0],[33,10],[3,64],[32,10],[32,9],[99],[4,64],[32,0],[252,2],[65,7],[32,6],[33,11],[32,10],[34,12],[252,3],[65,9],[108],[32,11],[252,3],[106],[34,13],[43,0,4],[32,13],[45,0,12],[33,7],[252,2],[32,7],[32,8],[33,11],[32,10],[34,12],[252,3],[65,9],[108],[32,11],[252,3],[106],[34,13],[43,0,4],[32,13],[45,0,12],[34,7],[16, builtin('__Porffor_object_expr_init')],[33,7],[183],[26],[32,10],[68,0,0,0,0,0,0,240,63],[160],[33,10],[12,1],[11],[11],[32,0],[65,7],[15]],
+    wasm: (scope, {builtin}) => [[32,2],[33,4],[32,3],[33,5],[2,127],[32,5],[65,0],[70],[4,64,"TYPESWITCH|empty"],[65,1],[12,1],[11],[32,5],[65,7],[70],[4,64,"TYPESWITCH|Object"],[32,4],[68,0,0,0,0,0,0,0,0],[97],[12,1],[11],[32,5],[65,128,1],[70],[4,64,"TYPESWITCH|undefined"],[65,1],[12,1],[11],[65,0],[11,"TYPESWITCH_end"],[4,64],[32,0],[65,7],[15],[11],[32,2],[32,3],[16, builtin('__Object_keys')],[26],[33,6],[32,2],[32,3],[16, builtin('__Object_values')],[26],[33,8],[32,6],[252,3],[40,1,0],[184],[33,9],[68,0,0,0,0,0,0,0,0],[33,10],[3,64],[32,10],[32,9],[99],[4,64],[32,0],[252,2],[65,7],[32,6],[33,11],[32,10],[34,12],[252,3],[65,9],[108],[32,11],[252,3],[106],[34,13],[43,0,4],[32,13],[45,0,12],[33,7],[252,2],[32,7],[32,8],[33,11],[32,10],[34,12],[252,3],[65,9],[108],[32,11],[252,3],[106],[34,13],[43,0,4],[32,13],[45,0,12],[34,7],[16, builtin('__Porffor_object_expr_init')],[33,7],[183],[26],[32,10],[68,0,0,0,0,0,0,240,63],[160],[33,10],[12,1],[11],[11],[32,0],[65,7],[15]],
     params: [124,127,124,127], typedParams: 1,
     returns: [124,127], typedReturns: 1,
     locals: [124,127,124,127,124,124,124,124,124,127,127,127], localNames: ["dst","dst#type","src","src#type","#logicinner_tmp","#typeswitch_tmp1","keys","#last_type","vals","len","i","#member_obj","#member_prop","#loadArray_offset","#member_allocd","#swap"],
   };
+  this.__Porffor_object_rest = {
+    wasm: (scope, {builtin}) => [[32,2],[33,6],[32,3],[33,7],[2,127],[32,7],[65,0],[70],[4,64,"TYPESWITCH|empty"],[65,1],[12,1],[11],[32,7],[65,7],[70],[4,64,"TYPESWITCH|Object"],[32,6],[68,0,0,0,0,0,0,0,0],[97],[12,1],[11],[32,7],[65,128,1],[70],[4,64,"TYPESWITCH|undefined"],[65,1],[12,1],[11],[65,0],[11,"TYPESWITCH_end"],[4,64],[32,0],[65,7],[15],[11],[32,2],[32,3],[16, builtin('__Object_keys')],[26],[33,8],[32,2],[32,3],[16, builtin('__Object_values')],[26],[33,10],[32,8],[252,3],[40,1,0],[184],[33,11],[68,0,0,0,0,0,0,0,0],[33,12],[3,64],[32,12],[32,11],[99],[4,64],[2,64],[32,8],[33,15],[32,12],[34,16],[252,3],[65,9],[108],[32,15],[252,3],[106],[34,17],[43,0,4],[32,17],[45,0,12],[33,14],[33,13],[32,4],[33,20],[65,208,0],[33,21],[32,20],[32,21],[32,13],[32,14],[68,0,0,0,0,0,0,0,0],[65,128,1],[16, builtin('__Array_prototype_includes')],[33,9],[33,6],[32,9],[33,7],[2,127],[32,7],[65,195,0],[70],[4,64,"TYPESWITCH|String"],[32,6],[252,3],[40,1,0],[12,1],[11],[32,7],[65,195,1],[70],[4,64,"TYPESWITCH|ByteString"],[32,6],[252,3],[40,1,0],[12,1],[11],[32,6],[252,3],[11,"TYPESWITCH_end"],[4,64],[12,1],[11],[32,0],[252,2],[65,7],[32,13],[252,2],[32,14],[32,10],[33,15],[32,12],[34,16],[252,3],[65,9],[108],[32,15],[252,3],[106],[34,17],[43,0,4],[32,17],[45,0,12],[34,9],[16, builtin('__Porffor_object_expr_init')],[33,9],[183],[26],[11],[32,12],[68,0,0,0,0,0,0,240,63],[160],[33,12],[12,1],[11],[11],[32,0],[65,7],[15]],
+    params: [124,127,124,127,124,127], typedParams: 1,
+    returns: [124,127], typedReturns: 1,
+    locals: [124,127,124,127,124,124,124,124,127,124,124,127,127,127,124,127], localNames: ["dst","dst#type","src","src#type","blocklist","blocklist#type","#logicinner_tmp","#typeswitch_tmp1","keys","#last_type","vals","len","i","k","k#type","#member_obj","#member_prop","#loadArray_offset","#member_allocd","#swap","#proto_target","#proto_target#type"],
+    hasRestArgument: 1,
+  };
   this.__ecma262_NewPromiseReactionJob = {
     wasm: (scope, {builtin}) => [[65,22],[16, builtin('__Porffor_allocateBytes')],[183],[34,4],[33,7],[68,0,0,0,0,0,0,0,0],[33,8],[32,7],[252,3],[32,8],[252,3],[65,9],[108],[106],[34,6],[32,0],[34,5],[57,0,4],[32,6],[65,208,0],[58,0,12],[32,4],[33,7],[68,0,0,0,0,0,0,240,63],[33,8],[32,7],[252,3],[32,8],[252,3],[65,9],[108],[106],[34,6],[32,2],[34,5],[57,0,4],[32,6],[32,3],[58,0,12],[32,4],[65,208,0],[15]],
     params: [124,127,124,127], typedParams: 1,

package/compiler/codegen.js

@@ -3216,8 +3216,11 @@ const generateVarDstr = (scope, kind, pattern, init, defaultValue, global) => {
     let out = generateVarDstr(scope, 'const', tmpName, init, defaultValue, false);
 
     const properties = [...pattern.properties];
+    const usedProps = [];
     for (const prop of properties) {
       if (prop.type == 'Property') { // let { foo } = {}
+        usedProps.push(!prop.computed && prop.key.type !== 'Literal' ? { type: 'Literal', value: prop.key.name } : prop.key);
+
         if (prop.value.type === 'AssignmentPattern') { // let { foo = defaultValue } = {}
           decls.push(
             ...generateVarDstr(scope, kind, prop.value.left, {
@@ -3243,11 +3246,12 @@ const generateVarDstr = (scope, kind, pattern, init, defaultValue, global) => {
             type: 'CallExpression',
             callee: {
               type: 'Identifier',
-              name: '__Porffor_object_spread'
+              name: '__Porffor_object_rest'
             },
             arguments: [
               { type: 'ObjectExpression', properties: [] },
-              { type: 'Identifier', name: tmpName }
+              { type: 'Identifier', name: tmpName },
+              ...usedProps
             ]
           }, undefined, global)
         );

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "porffor",
   "description": "a basic experimental wip aot optimizing js -> wasm engine/compiler/runtime in js",
-  "version": "0.30.2+2e9f2148f",
+  "version": "0.30.3+8ee696663",
   "author": "CanadaHonk",
   "license": "MIT",
   "scripts": {},

package/runner/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import fs from 'node:fs';
-globalThis.version = '0.30.2+2e9f2148f';
+globalThis.version = '0.30.3+8ee696663';
 
 // deno compat
 if (typeof process === 'undefined' && typeof Deno !== 'undefined') {