porffor 0.58.3 → 0.58.4

package/compiler/codegen.js

@@ -662,8 +662,6 @@ const generateReturn = (scope, decl) => {
         ...(scope.subclass ? [
           // if subclass and returning undefined, return this
           [ Opcodes.local_get, localTmp(scope, '#return#type', Valtype.i32) ],
-          number(TYPE_FLAGS.parity, Valtype.i32),
-          [ Opcodes.i32_or ],
           number(TYPES.undefined, Valtype.i32),
           [ Opcodes.i32_eq ],
           [ Opcodes.if, Blocktype.void ],
@@ -989,7 +987,7 @@ const nullish = (scope, wasm, type, intIn = false, intOut = false) => {
     ...(!useTmp ? [] : [ [ Opcodes.local_set, tmp ] ]),
 
     ...typeSwitch(scope, type, [
-      [ [ TYPES.empty, TYPES.undefined ], [
+      [ TYPES.undefined, [
         // empty
         ...(!useTmp ? [ [ Opcodes.drop ] ] : []),
         number(1, intOut ? Valtype.i32 : valtypeBinary)
@@ -3270,7 +3268,7 @@ const generateVarDstr = (scope, kind, pattern, init, defaultValue, global) => {
 
       if (defaultValue) {
         out.push(
-          ...typeIsOneOf(getType(scope, name), [ TYPES.undefined, TYPES.empty ]),
+          ...typeIsOneOf(getType(scope, name), [ TYPES.undefined ]),
           [ Opcodes.if, Blocktype.void ],
             ...generate(scope, defaultValue, global, name),
             [ global ? Opcodes.global_set : Opcodes.local_set, idx ],
@@ -3418,7 +3416,7 @@ const generateVarDstr = (scope, kind, pattern, init, defaultValue, global) => {
     out = out.concat([
       // check tmp is valid object
       // not undefined or empty type
-      ...typeIsOneOf(getType(scope, tmpName), [ TYPES.undefined, TYPES.empty ]),
+      ...typeIsOneOf(getType(scope, tmpName), [ TYPES.undefined ]),
 
       // not null
       ...getType(scope, tmpName),
@@ -4313,7 +4311,7 @@ const generateUnary = (scope, decl) => {
         [ TYPES.number, () => makeString(scope, 'number') ],
         [ TYPES.boolean, () => makeString(scope, 'boolean') ],
         [ [ TYPES.string, TYPES.bytestring ], () => makeString(scope, 'string') ],
-        [ [ TYPES.undefined, TYPES.empty ], () => makeString(scope, 'undefined') ],
+        [ TYPES.undefined, () => makeString(scope, 'undefined') ],
         [ TYPES.function, () => makeString(scope, 'function') ],
         [ TYPES.symbol, () => makeString(scope, 'symbol') ],
 
@@ -6727,8 +6725,6 @@ const generateFunc = (scope, decl, forceNoExpr = false) => {
                 [ Opcodes.i32_ne ],
                 [ Opcodes.if, Blocktype.void ],
                   [ Opcodes.local_get, func.locals[name].idx + 1 ],
-                  number(TYPE_FLAGS.parity, Valtype.i32),
-                  [ Opcodes.i32_or ],
                   number(TYPES.undefined, Valtype.i32),
                   [ Opcodes.i32_eq ],
 
@@ -7161,7 +7157,7 @@ export default program => {
   data = [];
   currentFuncIndex = importedFuncs.length;
   typeswitchDepth = 0;
-  usedTypes = new Set([ TYPES.empty, TYPES.undefined, TYPES.number, TYPES.boolean, TYPES.function ]);
+  usedTypes = new Set([ TYPES.undefined, TYPES.number, TYPES.boolean, TYPES.function ]);
   coctc = new Map();
   globalInfer = new Map();
 

package/compiler/parse.js

@@ -11,21 +11,24 @@ globalThis.typedInput = types && Prefs.optTypes;
 // - meriyah
 // - hermes-parser
 // - @babel/parser
+// - oxc-parser
 
 globalThis.parser = '';
 let parse;
 const loadParser = async (fallbackParser = 'acorn', forceParser) => {
   parser = forceParser ?? Prefs.parser ?? fallbackParser;
-  0, { parse } = (await import((globalThis.document || globalThis.Deno ? 'https://esm.sh/' : '') + parser));
+  const mod = (await import((globalThis.document || globalThis.Deno ? 'https://esm.sh/' : '') + parser));
+  if (mod.parseSync) parse = mod.parseSync;
+    else parse = mod.parse;
 };
 globalThis._porf_loadParser = loadParser;
 await loadParser(types ? '@babel/parser' : undefined);
 
-if (types && !['@babel/parser', 'hermes-parser'].includes(parser)) log.warning('parse', `passed -parse-types with a parser (${parser}) which does not support`);
+if (types && !['@babel/parser', 'hermes-parser', 'oxc-parser'].includes(parser)) log.warning('parse', `passed -parse-types with a parser (${parser}) which does not support`);
 
 export default input => {
   try {
-    const ast = parse(input, {
+    const options = {
       // acorn
       ecmaVersion: 'latest',
 
@@ -43,9 +46,14 @@ export default input => {
       ranges: false,
       tokens: false,
       comments: false,
-    });
 
-    if (ast.type === 'File') return ast.program;
+      // oxc
+      lang: types ? 'ts' : 'js',
+      showSemanticErrors: true // sorry oxc pals but this default is bad
+    };
+
+    let ast = parser === 'oxc-parser' ? parse('js', input, options) : parse(input, options);
+    if (ast.program) ast = ast.program;
 
     return ast;
   } catch (e) {

package/compiler/precompile.js

@@ -277,7 +277,7 @@ ${funcs.map(x => {
   // todo: check for other identifier unsafe characters
   const name = x.name.includes('#') ? `['${x.name}']` : `.${x.name}`;
 
-  const returnTypes = [...(x.returnTypes ?? [])].filter(x => ![ TYPES.empty, TYPES.undefined, TYPES.number, TYPES.boolean, TYPES.function ].includes(x));
+  const returnTypes = [...(x.returnTypes ?? [])].filter(x => ![ TYPES.undefined, TYPES.number, TYPES.boolean, TYPES.function ].includes(x));
   return `this${name} = {
 wasm:${rewriteWasm(x.wasm)},
 params:${JSON.stringify(x.params)},typedParams:1,returns:${JSON.stringify(x.returns)},${x.returnType != null ? `returnType:${JSON.stringify(x.returnType)},` : ''}${returnTypes.length > 0 ? `returnTypes:${JSON.stringify(returnTypes)},` : ''}

package/compiler/types.js

@@ -6,20 +6,17 @@ export const TYPE_FLAGS = {
 };
 
 export const TYPES = {
-  empty: 0x00,
+  undefined: 0x00,
   number: 0x01,
   boolean: 0x02,
   string: 0x03 | TYPE_FLAGS.length,
   bigint: 0x04,
   symbol: 0x05,
   function: 0x06,
-  object: 0x07,
-
-  undefined: 0x00 | TYPE_FLAGS.parity,
+  object: 0x07
 };
 
 export const TYPE_NAMES = {
-  [TYPES.empty]: 'empty',
   [TYPES.number]: 'Number',
   [TYPES.boolean]: 'Boolean',
   [TYPES.string]: 'String',

package/compiler/wrap.js

@@ -33,7 +33,6 @@ const writeByteStr = (memory, ptr, str) => {
 
 const porfToJSValue = ({ memory, funcs, pages }, value, type, override = undefined) => {
   switch (type) {
-    case TYPES.empty:
     case TYPES.undefined:
       return undefined;
 

package/jsr.json

@@ -1,6 +1,6 @@
 {
   "name": "@honk/porffor",
-  "version": "0.58.3",
+  "version": "0.58.4",
   "exports": "./compiler/wrap.js",
   "publish": {
     "exclude": [

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "porffor",
   "description": "An ahead-of-time JavaScript compiler",
-  "version": "0.58.3",
+  "version": "0.58.4",
   "author": "Oliver Medhurst <honk@goose.icu>",
   "license": "MIT",
   "scripts": {},
@@ -12,7 +12,8 @@
   "optionalDependencies": {
     "@babel/parser": "^7.24.4",
     "hermes-parser": "^0.18.2",
-    "meriyah": "^4.3.9"
+    "meriyah": "^4.3.9",
+    "oxc-parser": "^0.72.2"
   },
   "bin": {
     "porf": "./runtime/index.js"

package/runtime/index.js

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