porffor 0.14.0-f67c123a1 → 0.16.0-053a03e10

package/runner/index.js

@@ -25,7 +25,7 @@ if (process.argv.includes('--help')) {
   console.log(`Usage: \x1B[1mporf [command] path/to/script.js [...prefs] [...args]\x1B[0m`);
 
   // commands
-  console.log(`\n\u001b[4mCommands\x1B[0m`);
+  console.log(`\n\x1B[1mCommands:\x1B[0m`);
   for (const [ cmd, [ color, desc ] ] of Object.entries({
     run: [ 34, 'Run a JS file' ],
     wasm: [ 34, 'Compile a JS file to a Wasm binary\n' ],
@@ -60,9 +60,16 @@ if (process.argv.includes('--help')) {
 
 let file = process.argv.slice(2).find(x => x[0] !== '-');
 if (['run', 'wasm', 'native', 'c', 'profile', 'debug', 'debug-wasm'].includes(file)) {
+  // remove this arg
+  process.argv.splice(process.argv.indexOf(file), 1);
+
   if (file === 'profile') {
-    process.argv.splice(process.argv.indexOf(file), 1);
-    await import('./profiler.js');
+    await import('./profile.js');
+    await new Promise(() => {}); // do nothing for the rest of this file
+  }
+
+  if (file === 'debug') {
+    await import('./debug.js');
     await new Promise(() => {}); // do nothing for the rest of this file
   }
 
@@ -74,13 +81,7 @@ if (['run', 'wasm', 'native', 'c', 'profile', 'debug', 'debug-wasm'].includes(fi
     process.argv.push('--asur', '--wasm-debug');
   }
 
-  if (file === 'debug') {
-    process.argv.splice(process.argv.indexOf(file), 1);
-    await import('./debug.js');
-    await new Promise(() => {}); // do nothing for the rest of this file
-  }
-
-  file = process.argv.slice(process.argv.indexOf(file) + 1).find(x => x[0] !== '-');
+  file = process.argv.slice(2).find(x => x[0] !== '-');
 
   const nonOptOutFile = process.argv.slice(process.argv.indexOf(file) + 1).find(x => x[0] !== '-');
   if (nonOptOutFile) {
@@ -88,6 +89,8 @@ if (['run', 'wasm', 'native', 'c', 'profile', 'debug', 'debug-wasm'].includes(fi
   }
 }
 
+globalThis.file = file;
+
 if (!file) {
   if (process.argv.includes('-v') || process.argv.includes('--version')) {
     // just print version
@@ -114,17 +117,20 @@ const print = str => {
   process.stdout.write(str);
 };
 
+let runStart;
 try {
   if (process.argv.includes('-b')) {
     const { wasm, exports } = await compile(source, process.argv.includes('--module') ? [ 'module' ] : [], {}, print);
 
+    runStart = performance.now();
     if (!process.argv.includes('--no-run')) exports.main();
 
     console.log(`\n\nwasm size: ${wasm.byteLength} bytes`);
   } else {
     const { exports } = await compile(source, process.argv.includes('--module') ? [ 'module' ] : [], {}, print);
 
-    if (!process.argv.includes('-no-run')) exports.main();
+    runStart = performance.now();
+    if (!process.argv.includes('--no-run')) exports.main();
   }
   // if (cache) process.stdout.write(cache);
 } catch (e) {
@@ -132,4 +138,4 @@ try {
   console.error(process.argv.includes('-i') ? e : `${e.constructor.name}: ${e.message}`);
 }
 
-if (process.argv.includes('-t')) console.log(`${process.argv.includes('-b') ? '' : '\n\n'}total time: ${(performance.now() - start).toFixed(2)}ms`);
+if (process.argv.includes('-t')) console.log(`${process.argv.includes('-b') ? '' : '\n\n'}total time: ${(performance.now() - start).toFixed(2)}ms\nexecution time: ${(performance.now() - runStart).toFixed(2)}ms`);

package/runner/repl.js

@@ -1,6 +1,11 @@
+import { TYPE_NAMES } from '../compiler/types.js';
 import compile from '../compiler/wrap.js';
 import version from './version.js';
 
+import util from 'node:util';
+
+process.argv.push('--no-opt-unused');
+
 let repl;
 try {
   // try importing node:repl
@@ -86,10 +91,21 @@ const run = async (source, _context, _filename, callback, run = true) => {
     lastPages = [...pages.keys()];
   }
 
-  const ret = run ? exports.main() : undefined;
-  callback(null, ret);
+  let ret = run ? exports.main() : undefined;
+  let value, type;
+  if (ret?.type != null) {
+    value = ret.value;
+    type = ret.type;
+    ret = ret.js;
+  }
+
+  console.log(util.inspect(ret, false, 2, true), (value != null ? `\x1B[34m\x1B[3m(value: ${value}, type: ${TYPE_NAMES[type]})\x1B[0m` : ''));
+
+  // callback(null, ret);
 
   prev = prev + ';\n' + source.trim();
+
+  callback();
 };
 
 const replServer = repl.start({ prompt: '> ', eval: run });