porffor 0.48.6 → 0.48.7

package/compiler/codegen.js

@@ -164,7 +164,8 @@ const funcRef = func => {
         [ Opcodes.local_get, 0 ], // new.target value
         Opcodes.i32_to_u,
         [ Opcodes.if, Blocktype.void ], // if value is non-zero
-          ...internalThrow(wrapperFunc, 'TypeError', `${unhackName(func.name)} is not a constructor`), // throw type error
+          // ...internalThrow(wrapperFunc, 'TypeError', `${unhackName(func.name)} is not a constructor`), // throw type error
+          ...internalThrow(wrapperFunc, 'TypeError', `Function is not a constructor`), // throw type error
         [ Opcodes.end ]
       );
     }
@@ -1730,7 +1731,11 @@ const generateSequence = (scope, decl) => {
 };
 
 const generateChain = (scope, decl) => {
-  return generate(scope, decl.expression);
+  scope.chainMembers = 0;
+  const out = generate(scope, decl.expression);
+  scope.chainMembers = null;
+
+  return out;
 };
 
 const ArrayUtil = {
@@ -1859,6 +1864,21 @@ const aliasPrimObjsBC = bc => {
   add(TYPES.string, TYPES.stringobject);
 };
 
+const typeIsIterable = wasm => [
+  // array, set, string, bytestring, generator
+  ...typeIsOneOf(wasm, [ TYPES.array, TYPES.set, TYPES.string, TYPES.bytestring, TYPES.__porffor_generator ]),
+  // typed array
+  ...wasm,
+  ...number(TYPES.uint8array, Valtype.i32),
+  [ Opcodes.i32_ge_s ],
+  ...wasm,
+  ...number(TYPES.float64array, Valtype.i32),
+  [ Opcodes.i32_le_s ],
+  [ Opcodes.i32_and ],
+  [ Opcodes.i32_or ],
+  [ Opcodes.i32_eqz ],
+];
+
 const createThisArg = (scope, decl) => {
   const name = decl.callee?.name;
   if (decl._new) {
@@ -2273,6 +2293,36 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
     }
   }
 
+  let args = decl.arguments.slice();
+  if (args.at(-1)?.type === 'SpreadElement') {
+    // hack: support spread element if last by doing essentially:
+    // const foo = () => ...;
+    // foo(a, b, ...c) -> _ = c; foo(a, b, _[0], _[1], ...)
+    const arg = args.at(-1).argument;
+    out.push(
+      ...generate(scope, arg),
+      [ Opcodes.local_set, localTmp(scope, '#spread') ],
+      ...getNodeType(scope, arg),
+      [ Opcodes.local_set, localTmp(scope, '#spread#type', Valtype.i32) ],
+
+      ...typeIsIterable([ [ Opcodes.local_get, localTmp(scope, '#spread#type', Valtype.i32) ] ]),
+      [ Opcodes.if, Blocktype.void ],
+        ...internalThrow(scope, 'TypeError', 'Cannot spread a non-iterable'),
+      [ Opcodes.end ]
+    );
+
+    args.pop();
+    for (let i = 0; i < 8; i++) {
+      args.push({
+        type: 'MemberExpression',
+        object: { type: 'Identifier', name: '#spread' },
+        property: { type: 'Literal', value: i },
+        computed: true,
+        optional: false
+      });
+    }
+  }
+
   let idx;
   if (Object.hasOwn(funcIndex, name)) {
     idx = funcIndex[name];
@@ -2350,11 +2400,9 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
     funcs.table = true;
     scope.table = true;
 
-    let args = decl.arguments;
     const wrapperArgc = Prefs.indirectWrapperArgc ?? 8;
-    if (args.length < wrapperArgc) {
-      args = args.concat(new Array(wrapperArgc - args.length).fill(DEFAULT_VALUE()));
-    }
+    const underflow = wrapperArgc - args.length;
+    for (let i = 0; i < underflow; i++) args.push(DEFAULT_VALUE());
 
     for (let i = 0; i < args.length; i++) {
       const arg = args[i];
@@ -2442,7 +2490,6 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
     return internalThrow(scope, 'TypeError', `${unhackName(name)} is not a constructor`, true);
   }
 
-  let args = [...decl.arguments];
   const internalProtoFunc = func && func.internal && func.name.includes('_prototype_');
   if (!globalThis.precompile && internalProtoFunc && !decl._protoInternalCall) {
     // just function called, not as prototype, add this to start
@@ -2455,34 +2502,10 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
     paramOffset += 4;
   }
 
-  if (args.at(-1)?.type === 'SpreadElement') {
-    // hack: support spread element if last by doing essentially:
-    // const foo = (a, b, c, d) => ...
-    // foo(a, b, ...c) -> _ = c; foo(a, b, _[0], _[1])
-    const arg = args.at(-1).argument;
-    out.push(
-      ...generate(scope, arg),
-      [ Opcodes.local_set, localTmp(scope, '#spread') ],
-      ...getNodeType(scope, arg),
-      [ Opcodes.local_set, localTmp(scope, '#spread#type', Valtype.i32) ]
-    );
-
-    args.pop();
-    const leftover = paramCount - args.length;
-    for (let i = 0; i < leftover; i++) {
-      args.push({
-        type: 'MemberExpression',
-        object: { type: 'Identifier', name: '#spread' },
-        property: { type: 'Literal', value: i },
-        computed: true,
-        optional: false
-      });
-    }
-  }
-
   if (func && args.length < paramCount) {
     // too little args, push undefineds
-    args = args.concat(new Array(paramCount - (func.hasRestArgument ? 1 : 0) - args.length).fill(DEFAULT_VALUE()));
+    const underflow = paramCount - (func.hasRestArgument ? 1 : 0) - args.length;
+    for (let i = 0; i < underflow; i++) args.push(DEFAULT_VALUE());
   }
 
   if (func && func.hasRestArgument) {
@@ -3126,7 +3149,7 @@ const generateVarDstr = (scope, kind, pattern, init, defaultValue, global) => {
     let out = generateVarDstr(scope, 'const', tmpName, init, defaultValue, false);
 
     let i = 0;
-    const elements = [...pattern.elements];
+    const elements = pattern.elements.slice();
     for (const e of elements) {
       switch (e?.type) {
         case 'RestElement': { // let [ ...foo ] = []
@@ -3187,24 +3210,11 @@ const generateVarDstr = (scope, kind, pattern, init, defaultValue, global) => {
 
     out = out.concat([
       // check tmp is iterable
-      // array or string or bytestring
-      ...typeIsOneOf(getType(scope, tmpName), [ TYPES.array, TYPES.string, TYPES.bytestring, TYPES.__porffor_generator ]),
-      // typed array
-      ...getType(scope, tmpName),
-      ...number(TYPES.uint8array, Valtype.i32),
-      [ Opcodes.i32_ge_s ],
-      ...getType(scope, tmpName),
-      ...number(TYPES.float64array, Valtype.i32),
-      [ Opcodes.i32_le_s ],
-      [ Opcodes.i32_and ],
-      [ Opcodes.i32_or ],
-      [ Opcodes.i32_eqz ],
+      ...typeIsIterable(getType(scope, tmpName)),
       [ Opcodes.if, Blocktype.void ],
         ...internalThrow(scope, 'TypeError', 'Cannot array destructure a non-iterable'),
       [ Opcodes.end ],
-
-      ...decls
-    ]);
+    ], decls);
 
     return out;
   }
@@ -3214,7 +3224,7 @@ const generateVarDstr = (scope, kind, pattern, init, defaultValue, global) => {
     const tmpName = '#destructure' + uniqId();
     let out = generateVarDstr(scope, 'const', tmpName, init, defaultValue, false);
 
-    const properties = [...pattern.properties];
+    const properties = pattern.properties.slice();
     const usedProps = [];
     for (const prop of properties) {
       if (prop.type == 'Property') { // let { foo } = {}
@@ -3277,10 +3287,8 @@ const generateVarDstr = (scope, kind, pattern, init, defaultValue, global) => {
       [ Opcodes.i32_or ],
       [ Opcodes.if, Blocktype.void ],
         ...internalThrow(scope, 'TypeError', 'Cannot object destructure undefined or null'),
-      [ Opcodes.end ],
-
-      ...decls
-    ]);
+      [ Opcodes.end ]
+    ], decls);
 
     return out;
   }
@@ -4125,18 +4133,7 @@ const generateForOf = (scope, decl) => {
     [ Opcodes.local_set, counter ],
 
     // check tmp is iterable
-    // array or string or bytestring
-    ...typeIsOneOf(iterType, [ TYPES.array, TYPES.set, TYPES.string, TYPES.bytestring, TYPES.__porffor_generator ]),
-    // typed array
-    ...iterType,
-    ...number(TYPES.uint8array, Valtype.i32),
-    [ Opcodes.i32_ge_s ],
-    ...iterType,
-    ...number(TYPES.float64array, Valtype.i32),
-    [ Opcodes.i32_le_s ],
-    [ Opcodes.i32_and ],
-    [ Opcodes.i32_or ],
-    [ Opcodes.i32_eqz ],
+    ...typeIsIterable(iterType),
     [ Opcodes.if, Blocktype.void ],
       ...internalThrow(scope, 'TypeError', `Tried for..of on non-iterable type`),
     [ Opcodes.end ],
@@ -5284,7 +5281,7 @@ const countLength = (func, name = undefined) => {
   return count;
 };
 
-const generateMember = (scope, decl, _global, _name, _objectWasm = undefined) => {
+const generateMember = (scope, decl, _global, _name) => {
   let final = [], finalEnd, extraBC = {};
   let name = decl.object.name;
 
@@ -5302,6 +5299,8 @@ const generateMember = (scope, decl, _global, _name, _objectWasm = undefined) =>
   const object = decl.object;
   const property = getProperty(decl);
 
+  let chainCount = scope.chainMembers != null ? ++scope.chainMembers : 0;
+
   // generate now so type is gotten correctly later (it gets cached)
   generate(scope, object);
 
@@ -5640,7 +5639,7 @@ const generateMember = (scope, decl, _global, _name, _objectWasm = undefined) =>
   if (decl.optional) {
     out.unshift(
       [ Opcodes.block, valtypeBinary ],
-      ...(_objectWasm ? _objectWasm : generate(scope, object)),
+      ...generate(scope, object),
       [ Opcodes.local_tee, localTmp(scope, '#member_obj') ],
       ...(scope.locals['#member_obj#type'] ? [
         ...getNodeType(scope, object),
@@ -5651,7 +5650,7 @@ const generateMember = (scope, decl, _global, _name, _objectWasm = undefined) =>
       [ Opcodes.if, Blocktype.void ],
       ...setLastType(scope, TYPES.undefined),
       ...number(0),
-      [ Opcodes.br, 1 ],
+      [ Opcodes.br, chainCount ],
       [ Opcodes.end ],
 
       ...generate(scope, property, false, '#member_prop'),
@@ -5663,7 +5662,7 @@ const generateMember = (scope, decl, _global, _name, _objectWasm = undefined) =>
     );
   } else {
     out.unshift(
-      ...(_objectWasm ? _objectWasm : generate(scope, object)),
+      ...generate(scope, object),
       [ Opcodes.local_set, localTmp(scope, '#member_obj') ],
       ...(scope.locals['#member_obj#type'] ? [
         ...getNodeType(scope, object),
@@ -5673,6 +5672,17 @@ const generateMember = (scope, decl, _global, _name, _objectWasm = undefined) =>
       ...generate(scope, property, false, '#member_prop'),
       [ Opcodes.local_set, localTmp(scope, '#member_prop') ]
     );
+
+    // todo: maybe this just needs 1 block?
+    if (chainCount > 0) {
+      out.unshift(
+        [ Opcodes.block, valtypeBinary ]
+      );
+
+      out.push(
+        [ Opcodes.end ]
+      );
+    }
   }
 
   if (final.length > 0) {
@@ -6153,7 +6163,9 @@ const generateFunc = (scope, decl, forceNoExpr = false) => {
         typeUsed(func, TYPES.promise);
       }
 
-      wasm = wasm.concat(generate(func, body));
+      const preface = wasm;
+      wasm = generate(func, body);
+      wasm.unshift(...preface);
 
       if (func.generator) {
         // make generator at the start

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