porffor 0.30.0 → 0.30.1

package/compiler/builtins/object.ts

@@ -665,4 +665,21 @@ export const __Object_prototype_toLocaleString = (_this: any) => __Object_protot
 export const __Object_prototype_valueOf = (_this: any) => {
   // todo: ToObject
   return _this;
+};
+
+
+export const __Porffor_object_spread = (dst: object, src: any): object => {
+  if (src == null) return;
+
+  // 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++) {
+    // target[keys[i]] = vals[i];
+    Porffor.object.expr.init(dst, keys[i], vals[i]);
+  }
+
+  return dst;
 };

package/compiler/builtins_precompiled.js

@@ -1914,6 +1914,12 @@ export const BuiltinFuncs = function() {
     returns: [124,127], typedReturns: 1,
     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]],
+    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.__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

@@ -1438,11 +1438,25 @@ const getType = (scope, _name) => {
 
   if (Object.hasOwn(builtinVars, name)) return number(builtinVars[name].type ?? TYPES.number, Valtype.i32);
 
-  if (typedInput && scope.locals[name]?.metadata?.type != null) return number(scope.locals[name].metadata.type, Valtype.i32);
-  if (Object.hasOwn(scope.locals, name)) return [ [ Opcodes.local_get, scope.locals[name + '#type'].idx ] ];
+  if (Object.hasOwn(scope.locals, name)) {
+    if (scope.locals[name]?.metadata?.type != null) return number(scope.locals[name].metadata.type, Valtype.i32);
 
-  if (typedInput && globals[name]?.metadata?.type != null) return number(globals[name].metadata.type, Valtype.i32);
-  if (Object.hasOwn(globals, name)) return [ [ Opcodes.global_get, globals[name + '#type'].idx ] ];
+    const typeLocal = scope.locals[name + '#type'];
+    if (typeLocal) return [ [ Opcodes.local_get, typeLocal.idx ] ];
+
+    // todo: warn here?
+    return number(TYPES.undefined, Valtype.i32);
+  }
+
+  if (Object.hasOwn(globals, name)) {
+    if (globals[name]?.metadata?.type != null) return number(globals[name].metadata.type, Valtype.i32);
+
+    const typeLocal = globals[name + '#type'];
+    if (typeLocal) return [ [ Opcodes.global_get, typeLocal.idx ] ];
+
+    // todo: warn here?
+    return number(TYPES.undefined, Valtype.i32);
+  }
 
   if (Object.hasOwn(builtinFuncs, name) || Object.hasOwn(importedFuncs, name) ||
       Object.hasOwn(funcIndex, name) || Object.hasOwn(internalConstrs, name))
@@ -1458,17 +1472,31 @@ const setType = (scope, _name, type) => {
 
   const out = typeof type === 'number' ? number(type, Valtype.i32) : type;
 
-  if (typedInput && scope.locals[name]?.metadata?.type != null) return [];
-  if (Object.hasOwn(scope.locals, name)) return [
-    ...out,
-    [ Opcodes.local_set, scope.locals[name + '#type'].idx ]
-  ];
+  if (Object.hasOwn(scope.locals, name)) {
+    if (scope.locals[name]?.metadata?.type != null) return [];
 
-  if (typedInput && globals[name]?.metadata?.type != null) return [];
-  if (Object.hasOwn(globals, name)) return [
-    ...out,
-    [ Opcodes.global_set, globals[name + '#type'].idx ]
-  ];
+    const typeLocal = scope.locals[name + '#type'];
+    if (typeLocal) return [
+      ...out,
+      [ Opcodes.local_set, typeLocal.idx ]
+    ];
+
+    // todo: warn here?
+    return [];
+  }
+
+  if (Object.hasOwn(globals, name)) {
+    if (globals[name]?.metadata?.type != null) return [];
+
+    const typeLocal = globals[name + '#type'];
+    if (typeLocal) return [
+      ...out,
+      [ Opcodes.global_set, typeLocal.idx ]
+    ];
+
+    // todo: warn here?
+    return [];
+  }
 
   // throw new Error('could not find var');
   return [];
@@ -3096,7 +3124,7 @@ const generateVarDstr = (scope, kind, pattern, init, defaultValue, global) => {
             elements.push(...e.argument.elements);
           } else {
             decls.push(
-              ...generateVarDstr(scope, kind, e.argument.name, {
+              ...generateVarDstr(scope, kind, e.argument, {
                 type: 'CallExpression',
                 callee: {
                   type: 'Identifier',
@@ -3202,8 +3230,22 @@ const generateVarDstr = (scope, kind, pattern, init, defaultValue, global) => {
             }, undefined, global)
           );
         }
-      } else { // let { ...foo } = {}
-        return todo(scope, 'object rest destructuring is not supported yet')
+      } else if (prop.type === 'RestElement') { // let { ...foo } = {}
+        decls.push(
+          ...generateVarDstr(scope, kind, prop.argument, {
+            type: 'CallExpression',
+            callee: {
+              type: 'Identifier',
+              name: '__Porffor_object_spread'
+            },
+            arguments: [
+              { type: 'ObjectExpression', properties: [] },
+              { type: 'Identifier', name: tmpName }
+            ]
+          }, undefined, global)
+        );
+      } else {
+        return todo(scope, `${prop.type} is not supported in object patterns`);
       }
     }
 
@@ -3979,10 +4021,9 @@ const generateForOf = (scope, decl) => {
 
   // setup local for left
   let setVar;
-
   if (decl.left.type === 'Identifier') {
     // todo: should be sloppy mode only
-    setVar = generateVarDstr(scope, 'var', decl.left.name, { type: 'Identifier', name: tmpName }, undefined, true);
+    setVar = generateVarDstr(scope, 'var', decl.left, { type: 'Identifier', name: tmpName }, undefined, true);
   } else {
     // todo: verify this is correct
     const global = scope.name === 'main' && decl.left.kind === 'var';
@@ -4347,14 +4388,13 @@ const generateForIn = (scope, decl) => {
   localTmp(scope, tmpName + '#type', Valtype.i32);
 
   let setVar;
-
   if (decl.left.type === 'Identifier') {
     // todo: should be sloppy mode only
-    setVar = generateVarDstr(scope, 'var', decl.left.name, { type: 'Identifier', name: tmpName }, undefined, true);
+    setVar = generateVarDstr(scope, 'var', decl.left, { type: 'Identifier', name: tmpName }, undefined, true);
   } else {
     // todo: verify this is correct
     const global = scope.name === 'main' && decl.left.kind === 'var';
-    setVar = generateVarDstr(scope, 'var', decl.left.declarations[0].id, { type: 'Identifier', name: tmpName }, undefined, global);
+    setVar = generateVarDstr(scope, 'var', decl.left?.declarations?.[0]?.id ?? decl.left, { type: 'Identifier', name: tmpName }, undefined, global);
   }
 
   // set type for local
@@ -5090,12 +5130,33 @@ const generateObject = (scope, decl, global = false, name = '$undeclared') => {
   ];
 
   if (decl.properties.length > 0) {
-    const tmp = localTmp(scope, `#objectexpr${uniqId()}`, Valtype.i32);
+    const tmpName = `#objectexpr${uniqId()}`;
+    const tmp = localTmp(scope, tmpName, Valtype.i32);
+    addVarMetadata(scope, tmpName, false, { type: TYPES.object });
+
     out.push([ Opcodes.local_tee, tmp ]);
 
     for (const x of decl.properties) {
       // method, shorthand are made into useful values by parser for us :)
-      const { computed, kind, key, value } = x;
+      const { type, argument, computed, kind, key, value } = x;
+
+      if (type === 'SpreadElement') {
+        out.push(
+          ...generateCall(scope, {
+            type: 'CallExpression',
+            callee: {
+              type: 'Identifier',
+              name: '__Porffor_object_spread'
+            },
+            arguments: [
+              { type: 'Identifier', name: tmpName },
+              argument
+            ]
+          }),
+          [ Opcodes.drop ]
+        );
+        continue;
+      }
 
       let k = key;
       if (!computed && key.type !== 'Literal') k = {

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.0+b1785d63e",
+  "version": "0.30.1+616eeaaf5",
   "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.0+b1785d63e';
+globalThis.version = '0.30.1+616eeaaf5';
 
 // deno compat
 if (typeof process === 'undefined' && typeof Deno !== 'undefined') {