porffor 0.49.6 → 0.49.7

package/README.md

@@ -42,7 +42,7 @@ Expect nothing to work! Only very limited JS is currently supported. See files i
 > [!WARNING]
 > Very experimental WIP feature!
 
-**`porf profile path/to/script.js`**
+**`porf hotlines path/to/script.js`**
 
 ### Debugging a JS file
 > [!WARNING]
@@ -54,7 +54,7 @@ Expect nothing to work! Only very limited JS is currently supported. See files i
 > [!WARNING]
 > Very experimental WIP feature!
 
-**`porf debug-wasm path/to/script.js`**
+**`porf dissect path/to/script.js`**
 
 
 ### Options
@@ -80,7 +80,7 @@ Asur is Porffor's own Wasm engine; it is an intentionally simple interpreter wri
 Rhemyn is Porffor's own regex engine; it compiles literal regex to Wasm bytecode AOT (remind you of anything?). It is quite basic and WIP. See [its readme](rhemyn/README.md) for more details.
 
 ### 2c
-2c is Porffor's own Wasm -> C compiler, using generated Wasm bytecode and internal info to generate specific and efficient/fast C code. Little boilerplate/preluded code or required external files, just for CLI binaries (not like wasm2c very much).
+2c is Porffor's own Wasm -> C compiler, using generated Wasm bytecode and internal info to generate specific and efficient C code. Little boilerplate/preluded code or required external files, just for CLI binaries (not like wasm2c very much).
 
 ## Versioning
 Porffor uses a unique versioning system, here's an example: `0.48.7`. Let's break it down:

package/compiler/parse.js

@@ -1,7 +1,7 @@
 import { log } from './log.js';
 import './prefs.js';
 
-const file = process.argv.slice(2).find(x => x[0] !== '-' && !['run', 'wasm', 'native', 'c', 'profile', 'debug', 'debug-wasm'].includes(x));
+const file = process.argv.slice(2).find(x => x[0] !== '-' && !['precompile', 'run', 'wasm', 'native', 'c', 'hotlines', 'debug', 'dissect'].includes(x));
 
 // should we try to support types (while parsing)
 const types = Prefs.parseTypes || Prefs.t || file?.endsWith('.ts');

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.49.6",
+  "version": "0.49.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.49.6';
+globalThis.version = '0.49.7';
 
 // deno compat
 if (typeof process === 'undefined' && typeof Deno !== 'undefined') {
@@ -11,43 +11,38 @@ const start = performance.now();
 
 if (process.argv.includes('--help')) {
   // description + version
-  console.log(`\x1B[1m\x1B[35mPorffor\x1B[0m is a JavaScript engine/runtime/compiler. \x1B[90m(${globalThis.version})\x1B[0m`);
+  console.log(`\x1B[1m\x1B[35mPorffor\x1B[0m is a JavaScript/TypeScript engine/compiler/runtime. \x1B[90m(${globalThis.version})\x1B[0m`);
 
   // basic usage
-  console.log(`Usage: \x1B[1mporf [command] [...prefs] path/to/script.js [...args]\x1B[0m`);
+  console.log(`Usage: \x1B[1mporf <command> [...prefs] path/to/script.js [...args]\x1B[0m`);
 
   // commands
-  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' ],
+  for (let [ cmd, [ color, post, desc ] ] of Object.entries({
+    'Compile': [],
+    '': [ 34, 'foo.js', 'Compile and execute a file' ],
+    wasm: [ 34, 'foo.js foo.wasm', 'Compile to a Wasm binary' ],
+    c: [ 94, 'foo.js foo.c', 'Compile to C source code' ],
+    native: [ 94, 'foo.js foo', 'Compile to a native binary' ],
+
+    'Profile': [],
+    flamegraph: [ 93, 'foo.js', 'View detailed func-by-func performance' ],
+    hotlines: [ 93, 'foo.js', 'View source with line-by-line performance' ],
+
+    'Debug': [],
+    debug: [ 33, 'foo.js', 'Debug the source of a file' ],
+    dissect: [ 33, 'foo.js', 'Debug the compiled Wasm of a file' ],
+  })) {
+    if (color == null) {
+      // header
+      console.log(`\n\x1B[1m\x1B[4m${cmd}\x1B[0m`);
+      continue;
+    }
 
-    c: [ 31, 'Compile a JS file to C source code' ],
-    native: [ 31, 'Compile a JS file to a native binary\n' ],
+    if (cmd.length > 0) post = ' ' + post;
 
-    profile: [ 33, 'Profile a JS file' ],
-    debug: [ 33, 'Debug a JS file' ],
-    'debug-wasm': [ 33, 'Debug the compiled Wasm of a JS file' ],
-  })) {
-    console.log(`  \x1B[1m\x1B[${color}m${cmd}\x1B[0m${' '.repeat(20 - cmd.length - (desc.startsWith('🧪') ? 3 : 0))}${desc}`);
+    console.log(`  \x1B[90mporf\x1B[0m \x1B[1m\x1B[${color}m${cmd}\x1B[0m\x1B[2m${post}\x1B[0m ${' '.repeat(30 - cmd.length - post.length)}${desc}`);
   }
 
-  // console.log();
-
-  // // options
-  // console.log(`\n\u001b[4mCommands\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' ],
-  //   c: [ 31, 'Compile a JS file to C source code' ],
-  //   native: [ 31, 'Compile a JS file to a native binary\n' ],
-  //   profile: [ 33, 'Profile a JS file' ],
-  //   debug: [ 33, 'Debug a JS file' ],
-  //   'debug-wasm': [ 33, 'Debug the compiled Wasm of a JS file' ]
-  // })) {
-  //   console.log(`  \x1B[1m\x1B[${color}m${cmd}\x1B[0m${' '.repeat(20 - cmd.length - (desc.startsWith('🧪') ? 3 : 0))}${desc}`);
-  // }
-
   console.log();
   process.exit(0);
 }
@@ -59,7 +54,7 @@ const done = async () => {
 };
 
 let file = process.argv.slice(2).find(x => x[0] !== '-');
-if (['precompile', 'run', 'wasm', 'native', 'c', 'profile', 'debug', 'debug-wasm'].includes(file)) {
+if (['precompile', 'run', 'wasm', 'native', 'c', 'hotlines', 'debug', 'dissect'].includes(file)) {
   // remove this arg
   process.argv.splice(process.argv.indexOf(file), 1);
 
@@ -68,8 +63,8 @@ if (['precompile', 'run', 'wasm', 'native', 'c', 'profile', 'debug', 'debug-wasm
     await done();
   }
 
-  if (file === 'profile') {
-    await import('./profile.js');
+  if (file === 'hotlines') {
+    await import('./hotlines.js');
     await done();
   }
 
@@ -82,7 +77,7 @@ if (['precompile', 'run', 'wasm', 'native', 'c', 'profile', 'debug', 'debug-wasm
     process.argv.push(`--target=${file}`);
   }
 
-  if (file === 'debug-wasm') {
+  if (file === 'dissect') {
     process.argv.push('--asur', '--wasm-debug');
   }