porffor 0.34.20 → 0.34.21

package/CONTRIBUTING.md

@@ -366,7 +366,7 @@ builtins/tostring_number: impl radix
 
 ## Test262
 
-For the first time, ensure you run `./test262/setup.sh`.
+For the first time, ensure you run `./test262/setup.sh` (Unix) or `.\test262\setup.cmd` (Windows).
 
 Run `node test262` to run all the tests and get an output of total overall test results.
 

package/compiler/assemble.js

@@ -33,15 +33,11 @@ const encodeNames = funcs => {
     funcs.map(x => unsignedLEB128(x.asmIndex).concat(encodeString(x.name))),
   );
   const localsSection = encodeVector(
-    funcs.map(x =>
-      unsignedLEB128(x.asmIndex).concat(
-        encodeVector(
-          Object.entries(x.locals).map(([name, local]) =>
-            unsignedLEB128(local.idx).concat(encodeString(name)),
-          ),
-        ),
-      ),
-    ),
+    funcs.map(x => unsignedLEB128(x.asmIndex).concat(encodeVector(
+      Object.entries(x.locals).map(([name, local]) =>
+        unsignedLEB128(local.idx).concat(encodeString(name))
+      )
+    )))
   );
 
   return [
@@ -49,7 +45,7 @@ const encodeNames = funcs => {
     ...encodeSection(1, functionsSection),
     ...encodeSection(2, localsSection),
   ];
-}
+};
 
 export default (funcs, globals, tags, pages, data, flags, noTreeshake = false) => {
   const types = [], typeCache = {};

package/compiler/codegen.js

@@ -5404,7 +5404,7 @@ const generateMember = (scope, decl, _global, _name, _objectWasm = undefined) =>
       const type = TYPES[x.split('_prototype')[0].slice(2).toLowerCase()];
       if (type == null) continue;
 
-      // do not __proto__ primitive hack for objects
+      // do not __proto__ primitive hack for objects or functions
       if (type === TYPES.object || type === TYPES.function) continue;
 
       const ident = {
@@ -5721,27 +5721,34 @@ const generateClass = (scope, decl) => {
 
   if (decl.superClass) {
     out.push(
-      ...generateCall(scope, {
-        type: 'CallExpression',
-        callee: {
-          type: 'Identifier',
-          name: '__Porffor_object_assignAll'
-        },
-        arguments: [
-          proto,
-          {
-            type: 'MemberExpression',
-            object: decl.superClass,
-            property: {
-              type: 'Identifier',
-              name: 'prototype'
-            },
-            computed: false,
-            optional: false
-          }
-        ]
-      }),
-      [ Opcodes.drop ]
+      // ...generateCall(scope, {
+      //   type: 'CallExpression',
+      //   callee: {
+      //     type: 'Identifier',
+      //     name: '__Porffor_object_assignAll'
+      //   },
+      //   arguments: [
+      //     proto,
+      //     {
+      //       type: 'MemberExpression',
+      //       object: decl.superClass,
+      //       property: {
+      //         type: 'Identifier',
+      //         name: 'prototype'
+      //       },
+      //       computed: false,
+      //       optional: false
+      //     }
+      //   ]
+      // }),
+      // [ Opcodes.drop ]
+
+      // class Foo {}
+      // class Bar extends Foo {}
+      // Bar.__proto__ = Foo
+      // Bar.prototype.__proto__ = Foo.prototype
+      ...generate(scope, setObjProp(root, '__proto__', decl.superClass)),
+      ...generate(scope, setObjProp(getObjProp(root, 'prototype'), '__proto__', getObjProp(decl.superClass, 'prototype')))
     );
   }
 
@@ -6024,8 +6031,8 @@ const generateFunc = (scope, decl, outUnused = false) => {
             else func.returns = [];
         }
 
-        // inject promise job runner func at the end of main if job queue is used
-        if (Object.hasOwn(funcIndex, '__ecma262_HostEnqueuePromiseJob')) {
+        // inject promise job runner func at the end of main if promises are made
+        if (Object.hasOwn(funcIndex, 'Promise') || Object.hasOwn(funcIndex, '__Promise_resolve') || Object.hasOwn(funcIndex, '__Promise_reject')) {
           wasm.push(
             [ Opcodes.call, includeBuiltin(scope, '__Porffor_promise_runJobs').index ],
             [ Opcodes.drop ],
@@ -6358,8 +6365,8 @@ export default program => {
 
   delete globals['#ind'];
 
-  // if blank main func and other exports, remove it
-  if (main.wasm.length === 0 && funcs.reduce((acc, x) => acc + (x.export ? 1 : 0), 0) > 1) funcs.splice(main.index - importedFuncs.length, 1);
+  // if wanted and blank main func and other exports, remove it
+  if (Prefs.rmBlankMain && main.wasm.length === 0 && funcs.some(x => x.export)) funcs.splice(main.index - importedFuncs.length, 1);
 
   // make ~empty funcs for never generated funcs
   // todo: these should just be deleted once able

package/compiler/wrap.js

@@ -137,6 +137,9 @@ ${flags & 0b0001 ? `    get func idx: ${get}
       // eg: __String_prototype_toLowerCase -> toLowerCase
       if (name.startsWith('__')) name = name.split('_').pop();
 
+      // anonymous functions
+      if (name.startsWith('#')) name = '';
+
       // make fake empty func for repl/etc
       return {[name]() {}}[name];
     }

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