porffor 0.2.0-fdf0fc5 → 0.14.0-0ad2c8a7c

package/compiler/wrap.js

@@ -1,12 +1,106 @@
+import { encodeVector, encodeLocal } from './encoding.js';
+import { importedFuncs } from './builtins.js';
 import compile from './index.js';
 import decompile from './decompile.js';
-import { encodeVector, encodeLocal } from './encoding.js';
-import Prefs from './prefs.js';
-import { log } from './log.js';
 import { TYPES } from './types.js';
+import { log } from './log.js';
+import Prefs from './prefs.js';
 
 const bold = x => `\u001b[1m${x}\u001b[0m`;
 
+const porfToJSValue = ({ memory, funcs, pages }, value, type) => {
+  switch (type) {
+    case TYPES.boolean: return Boolean(value);
+    case TYPES.undefined: return undefined;
+    case TYPES.object: return value === 0 ? null : {};
+
+    case TYPES.function: {
+      let func;
+      if (value < 0) {
+        func = importedFuncs[value + importedFuncs.length];
+      } else {
+        func = funcs.find(x => ((x.originalIndex ?? x.index) - importedFuncs.length) === value);
+      }
+
+      if (!func) return function () {};
+
+      // make fake empty func for repl/etc
+      return {[func.name]() {}}[func.name];
+    }
+
+    case TYPES.string: {
+      const length = (new Int32Array(memory.buffer, value, 1))[0];
+      return Array.from(new Uint16Array(memory.buffer, value + 4, length)).map(x => String.fromCharCode(x)).join('');
+    }
+
+    case TYPES.bytestring: {
+      const length = (new Int32Array(memory.buffer, value, 1))[0];
+      return Array.from(new Uint8Array(memory.buffer, value + 4, length)).map(x => String.fromCharCode(x)).join('');
+    }
+
+    case TYPES.array: {
+      const length = (new Int32Array(memory.buffer, value, 1))[0];
+
+      const out = [];
+      for (let i = 0; i < length; i++) {
+        const offset = value + 4 + (i * 9);
+
+        // have to slice because of memory alignment (?)
+        const v = (new Float64Array(memory.buffer.slice(offset, offset + 8), 0, 1))[0];
+        const t = (new Uint8Array(memory.buffer, offset + 8, 1))[0];
+
+        // console.log(`reading value at index ${i}...`)
+        // console.log('  memory:', Array.from(new Uint8Array(memory.buffer, offset, 9)).map(x => x.toString(16).padStart(2, '0')).join(' '));
+        // console.log('  read:', { value: v, type: t }, '\n');
+
+        out.push(porfToJSValue({ memory, funcs, pages }, v, t));
+      }
+
+      return out;
+    }
+
+    case TYPES.date: {
+      const t = (new Float64Array(memory.buffer, value, 1))[0];
+      return new Date(t);
+    }
+
+    case TYPES.set: {
+      const size = (new Int32Array(memory.buffer, value, 1))[0];
+
+      const out = new Set();
+      for (let i = 0; i < size; i++) {
+        const offset = value + 4 + (i * 9);
+
+        // have to slice because of memory alignment (?)
+        const v = (new Float64Array(memory.buffer.slice(offset, offset + 8), 0, 1))[0];
+        const t = (new Uint8Array(memory.buffer, offset + 8, 1))[0];
+
+        // console.log(`reading value at index ${i}...`)
+        // console.log('  memory:', Array.from(new Uint8Array(memory.buffer, offset, 9)).map(x => x.toString(16).padStart(2, '0')).join(' '));
+        // console.log('  read:', { value: v, type: t }, '\n');
+
+        out.add(porfToJSValue({ memory, funcs, pages }, v, t));
+      }
+
+      return out;
+    }
+
+    case TYPES.symbol: {
+      const descStore = pages.get('bytestring: __Porffor_symbol_descStore/ptr').ind * pageSize;
+      const offset = descStore + 4 + ((value - 1) * 9);
+
+      const v = (new Float64Array(memory.buffer.slice(offset, offset + 8), 0, 1))[0];
+      const t = (new Uint8Array(memory.buffer, offset + 8, 1))[0];
+
+      const desc = porfToJSValue({ memory, funcs, pages }, v, t);
+
+      return Symbol(desc);
+    }
+
+    default: return value;
+  }
+};
+
 export default async (source, flags = [ 'module' ], customImports = {}, print = str => process.stdout.write(str)) => {
   const times = [];
 
@@ -22,40 +116,12 @@ export default async (source, flags = [ 'module' ], customImports = {}, print =
   times.push(performance.now() - t1);
   if (Prefs.profileCompiler) console.log(bold(`compiled in ${times[0].toFixed(2)}ms`));
 
-  const t2 = performance.now();
-
-  let instance;
-  try {
-    let wasmEngine = WebAssembly;
-    if (Prefs.asur) {
-      log.warning('wrap', 'using our !experimental! asur wasm engine instead of host to run');
-      wasmEngine = await import('../asur/index.js');
-    }
-
-    0, { instance } = await wasmEngine.instantiate(wasm, {
-      '': {
-        p: valtype === 'i64' ? i => print(Number(i).toString()) : i => print(i.toString()),
-        c: valtype === 'i64' ? i => print(String.fromCharCode(Number(i))) : i => print(String.fromCharCode(i)),
-        t: () => performance.now(),
-        u: () => performance.timeOrigin,
-        y: () => {},
-        z: () => {},
-        ...customImports
-      }
-    });
-  } catch (e) {
-    // only backtrace for runner, not test262/etc
-    if (!process.argv[1].includes('/runner')) throw e;
-
-    const funcInd = parseInt(e.message.match(/function #([0-9]+) /)?.[1]);
-    const blobOffset = parseInt(e.message.split('@')?.[1]);
-
-    if (!funcInd) throw e;
+  const backtrace = (funcInd, blobOffset) => {
+    if (funcInd == null || blobOffset == null) return false;
 
     // convert blob offset -> function wasm offset.
     // this is not good code and is somewhat duplicated
     // I just want it to work for debugging, I don't care about perf/yes
-
     const func = funcs.find(x => x.index === funcInd);
     const locals = Object.values(func.locals).sort((a, b) => a.idx - b.idx).slice(func.params.length).sort((a, b) => a.idx - b.idx);
 
@@ -73,7 +139,7 @@ export default async (source, flags = [ 'module' ], customImports = {}, print =
 
     if (typeCount !== 0) localDecl.push(encodeLocal(typeCount, lastType));
 
-    const toFind = encodeVector(localDecl).concat(func.wasm.flat().filter(x => x != null && x <= 0xff).slice(0, 40));
+    const toFind = encodeVector(localDecl).concat(func.wasm.flat().filter(x => x != null && x <= 0xff).slice(0, 60));
 
     let i = 0;
     for (; i < wasm.length; i++) {
@@ -88,7 +154,7 @@ export default async (source, flags = [ 'module' ], customImports = {}, print =
       if (!mismatch) break;
     }
 
-    if (i === wasm.length) throw e;
+    if (i === wasm.length) return false;
 
     const offset = (blobOffset - i) + encodeVector(localDecl).length;
 
@@ -99,7 +165,7 @@ export default async (source, flags = [ 'module' ], customImports = {}, print =
       if (cumLen === offset) break;
     }
 
-    if (cumLen !== offset) throw e;
+    if (cumLen !== offset) return false;
 
     i -= 1;
 
@@ -124,6 +190,38 @@ export default async (source, flags = [ 'module' ], customImports = {}, print =
     console.log(decomp.join('\n'));
     console.log('\x1B[90m...\x1B[0m\n');
 
+    return true;
+  };
+
+  const t2 = performance.now();
+
+  let instance;
+  try {
+    let wasmEngine = WebAssembly;
+    if (Prefs.asur) {
+      log.warning('wrap', 'using our !experimental! asur wasm engine instead of host to run');
+      wasmEngine = await import('../asur/index.js');
+    }
+
+    0, { instance } = await wasmEngine.instantiate(wasm, {
+      '': {
+        p: valtype === 'i64' ? i => print(Number(i).toString()) : i => print(i.toString()),
+        c: valtype === 'i64' ? i => print(String.fromCharCode(Number(i))) : i => print(String.fromCharCode(i)),
+        t: () => performance.now(),
+        u: () => performance.timeOrigin,
+        y: () => {},
+        z: () => {},
+        ...customImports
+      }
+    });
+  } catch (e) {
+    // only backtrace for runner, not test262/etc
+    if (!process.argv[1].includes('/runner')) throw e;
+
+    const funcInd = parseInt(e.message.match(/function #([0-9]+) /)?.[1]);
+    const blobOffset = parseInt(e.message.split('@')?.[1]);
+
+    backtrace(funcInd, blobOffset);
     throw e;
   }
 
@@ -131,6 +229,7 @@ export default async (source, flags = [ 'module' ], customImports = {}, print =
   if (Prefs.profileCompiler) console.log(`instantiated in ${times[1].toFixed(2)}ms`);
 
   const exports = {};
+  const rawValues = process.argv.includes('-i');
 
   const exceptTag = instance.exports['0'], memory = instance.exports['$'];
   for (const x in instance.exports) {
@@ -148,62 +247,12 @@ export default async (source, flags = [ 'module' ], customImports = {}, print =
 
     exports[func.name] = function() {
       try {
-        const _ret = exp.apply(this, arguments);
-
-        if (_ret == null) return undefined;
-
-        const [ ret, type ] = _ret;
-
-        // if (ret >= typeBase && ret <= typeBase + 8) return ret > (typeBase + 7) ? 'object' : TYPES[ret];
-
-        switch (type) {
-          case TYPES.boolean: return Boolean(ret);
-          case TYPES.undefined: return undefined;
-          case TYPES.object: return ret === 0 ? null : {};
-
-          case TYPES.string: {
-            const pointer = ret;
-            const length = (new Int32Array(memory.buffer, pointer, 1))[0];
+        const ret = exp.apply(this, arguments);
+        if (ret == null) return undefined;
 
-            return Array.from(new Uint16Array(memory.buffer, pointer + 4, length)).map(x => String.fromCharCode(x)).join('');
-          }
+        if (rawValues) return { value: ret[0], type: ret[1], js: porfToJSValue({ memory, funcs, pages }, ret[0], ret[1]) };
 
-          case TYPES.function: {
-            // wasm func index, including all imports
-            const func = funcs.find(x => (x.originalIndex ?? x.index) === ret);
-            // if (!func) return ret;
-            if (!func) return function () {};
-
-            // make fake empty func for repl/etc
-            return {[func.name]() {}}[func.name];
-          }
-
-          case TYPES.array: {
-            const pointer = ret;
-            const length = (new Int32Array(memory.buffer, pointer, 1))[0];
-
-            // have to slice because of memory alignment
-            const buf = memory.buffer.slice(pointer + 4, pointer + 4 + 8 * length);
-
-            return Array.from(new Float64Array(buf));
-          }
-
-          case TYPES.bytestring: {
-            const pointer = ret;
-            const length = (new Int32Array(memory.buffer, pointer, 1))[0];
-
-            return Array.from(new Uint8Array(memory.buffer, pointer + 4, length)).map(x => String.fromCharCode(x)).join('');
-          }
-
-          case TYPES.date: {
-            const pointer = ret;
-            const value = (new Float64Array(memory.buffer, pointer, 1))[0];
-
-            return new Date(value);
-          }
-
-          default: return ret;
-        }
+        return porfToJSValue({ memory, funcs, pages }, ret[0], ret[1]);
       } catch (e) {
         if (e.is && e.is(exceptTag)) {
           const exceptId = e.getArg(exceptTag, 0);
@@ -218,6 +267,17 @@ export default async (source, flags = [ 'module' ], customImports = {}, print =
           throw new constructor(exception.message);
         }
 
+        if (e instanceof WebAssembly.RuntimeError) {
+          // only backtrace for runner, not test262/etc
+          if (!process.argv[1].includes('/runner')) throw e;
+
+          const match = e.stack.match(/wasm-function\[([0-9]+)\]:([0-9a-z]+)/) ?? [];
+          const funcInd = parseInt(match[1]);
+          const blobOffset = parseInt(match[2]);
+
+          backtrace(funcInd, blobOffset);
+        }
+
         throw e;
       }
     };

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.2.0-fdf0fc5",
+  "version": "0.14.0-0ad2c8a7c",
   "author": "CanadaHonk",
   "license": "MIT",
   "scripts": {

package/runner/compare.js

@@ -1,5 +1,4 @@
 import { execSync } from 'node:child_process';
-import { pathToFileURL } from 'node:url';
 import fs from 'node:fs';
 
 const [ commitsAgo, file ] = process.argv.slice(2);

package/runner/debug.js

@@ -1,9 +1,8 @@
 #!/usr/bin/env node
 
 import compile from '../compiler/wrap.js';
-import fs from 'node:fs';
-
 import Byg from '../byg/index.js';
+import fs from 'node:fs';
 
 const file = process.argv.slice(2).find(x => x[0] !== '-');
 let source = fs.readFileSync(file, 'utf8');
@@ -19,7 +18,6 @@ source = source.replace(/^\s*(function|const)\s*([a-zA-Z0-9]+)(\s*=\s*)?\([^)]*\
 
 const lines = source.split('\n');
 for (let i = 0; i < lines.length; i++) {
-  // lines[line] = lines[line].replace(/^[^\n}]*;$/, _ => `profile(${line});${_}`);
   if (lines[i].trim().replace('}', '') !== '') lines[i] = `profile1(Porffor.wasm.i32.const(${i}));` + lines[i];
 }
 source = lines.join('\n');
@@ -35,8 +33,6 @@ const byg = Byg({
   }
 });
 
-// console.log(source);
-
 let stepIn = false, stepOut = false;
 const callStack = [];
 
@@ -72,7 +68,6 @@ try {
           [
             {
               x: termWidth - 1 - 40 - 6,
-              // y: () => termHeight - 20 - 1 - 4,
               y: () => 4,
               width: 40,
               height: 20,

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,8 +60,10 @@ 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 new Promise(() => {}); // do nothing for the rest of this file
   }
@@ -75,12 +77,11 @@ if (['run', 'wasm', 'native', 'c', 'profile', 'debug', 'debug-wasm'].includes(fi
   }
 
   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) {

package/runner/profiler.js

@@ -3,22 +3,12 @@
 import compile from '../compiler/wrap.js';
 import fs from 'node:fs';
 
-import Prefs from '../compiler/prefs.js';
-
-// const fast = Prefs.profiler === 'fast';
-const fast = !Prefs.experimentalProfiler;
-
 const file = process.argv.slice(2).find(x => x[0] !== '-');
 let source = fs.readFileSync(file, 'utf8');
 
 let profileId = 0;
-// source = fast ? source.replace(/^[^\n}]*;$/mg, _ => `profile(${profileId++});${_}profile(${profileId++});`) : source.replace(/^[^\n}]*;$/mg, _ => `profile(${profileId++});profile(${profileId++});${_}profile(${profileId++});`);
-// source = fast ? source.replace(/^[^\n}]*;$/mg, _ => `profile(Porffor.wasm.i32.const(${profileId++}));${_}profile(Porffor.wasm.i32.const(${profileId++}));`) : source.replace(/^[^\n}]*;$/mg, _ => `profile(${profileId++});profile(${profileId++});${_}profile(${profileId++});`);
-source = fast ? source.replace(/^[^\n}]*;$/mg, _ => `profile1(Porffor.wasm.i32.const(${profileId}));${_}profile2(Porffor.wasm.i32.const(${profileId++}));`) : source.replace(/^[^\n}]*;$/mg, _ => `profile(${profileId++});profile(${profileId++});${_}profile(${profileId++});`);
+source = source.replace(/^[^\n}]*;$/mg, _ => `profile1(Porffor.wasm.i32.const(${profileId}));${_}profile2(Porffor.wasm.i32.const(${profileId++}));`)
 
-// console.log(source);
-
-// let tmp = new Array(profileId).fill(0);
 let tmp = new Array(profileId).fill(0);
 let times = new Array(profileId).fill(0);
 let samples = 0;
@@ -31,31 +21,19 @@ let last = 0;
 
 try {
   const { exports } = await compile(source, process.argv.includes('--module') ? [ 'module' ] : [], {
-    y: fast ? n => {
+    y: n => {
       tmp[n] = performance.now();
-    } : n => { /* todo */ },
-    z: fast ? n => {
-      times[n] += performance.now() - tmp[n];
-    } : n => { /* todo */ }
-    // z: fast ? n => {
-    //   if (n % 2) {
-    //     tmp[n] += performance.now() - tmp[n - 1];
-    //   } else {
-    //     tmp[n] = performance.now();
-    //   }
-    // } : n => {
-    //   if (n % 3 === 2) {
-    //     tmp[n] += (performance.now() - tmp[n - 1]) - (tmp[n - 1] - tmp[n - 2]);
-    //     samples++;
-
-    //     if (performance.now() > last) {
-    //       process.stdout.write(`\r${spinner[spin++ % 4]} running: collected ${samples} samples...`);
-    //       last = performance.now() + 100;
-    //     }
-    //   } else {
-    //     tmp[n] = performance.now();
-    //   }
-    // }
+    },
+    z: n => {
+      const t = performance.now();
+      times[n] += t - tmp[n];
+
+      samples++;
+      if (t > last) {
+        process.stdout.write(`\r${spinner[spin++ % 4]} running: collected ${samples} samples...`);
+        last = t + 100;
+      }
+    }
   });
 
   const start = performance.now();
@@ -64,14 +42,11 @@ try {
 
   const total = performance.now() - start;
 
-  console.log(`\n${fast ? '' : `samples: ${samples}\n`}total: ${total}ms\n\n` + source.split('\n').map(x => {
+  console.log(`\ntotal: ${total}ms\nsamples: ${samples}\n\n\n` + source.split('\n').map(x => {
     let time = 0;
     if (x.startsWith('profile')) {
-      // const id = parseInt(x.slice(8, x.indexOf(')')));
-      // const id = parseInt(x.slice(31, x.indexOf(')') + 1));
       const id = parseInt(x.slice(32, x.indexOf(')')));
-      // time = fast ? tmp[id + 1] : tmp[id + 2];
-      time = fast ? times[id] : tmp[id + 2];
+      time = times[id]
     }
 
     let color = [ 0, 0, 0 ];
@@ -85,8 +60,6 @@ try {
 
     const ansiColor = `2;${color[0]};${color[1]};${color[2]}m`;
 
-    // const line = x.replace(/profile\([0-9]+\);/g, '');
-    // const line = x.replace(/profile\(Porffor.wasm.i32.const\([0-9]+\)\);/g, '');
     const line = x.replace(/profile[0-9]\(Porffor.wasm.i32.const\([0-9]+\)\);/g, '');
 
     if (percents) return `\x1b[48;${ansiColor}\x1b[97m${time ? ((time * 100).toFixed(0).padStart(4, ' ') + '%') : '     '}\x1b[0m\x1b[38;${ansiColor}▌\x1b[0m ${line}`;

package/runner/repl.js

@@ -1,8 +1,10 @@
+import { TYPE_NAMES } from '../compiler/types.js';
 import compile from '../compiler/wrap.js';
-import rev from './version.js';
+import version from './version.js';
 
-// import repl from 'node:repl';
-// import repl from '../../node-repl-polyfill/index.js';
+import util from 'node:util';
+
+process.argv.push('--no-opt-unused');
 
 let repl;
 try {
@@ -17,8 +19,6 @@ try {
   repl = (await import('node-repl-polyfill')).default;
 }
 
-// process.argv.push('-O0'); // disable opts
-
 globalThis.valtype = 'f64';
 
 const valtypeOpt = process.argv.find(x => x.startsWith('--valtype='));
@@ -32,7 +32,7 @@ if (host.startsWith('Node')) host = '\x1B[92m' + host;
 if (host.startsWith('Deno')) host = '\x1B[97m' + host;
 if (host.startsWith('Bun')) host = '\x1B[93m' + host;
 
-console.log(`Welcome to \x1B[1m\x1B[35mPorffor\x1B[0m \x1B[90m(${rev.slice(0, 7)})\x1B[0m running on \x1B[1m${host.replace('/', ' \x1B[0m\x1B[90m(')})\x1B[0m`);
+console.log(`Welcome to \x1B[1m\x1B[35mPorffor\x1B[0m \x1B[90m(${version})\x1B[0m running on \x1B[1m${host.replace('/', ' \x1B[0m\x1B[90m(')})\x1B[0m`);
 console.log(`\x1B[90musing opt ${process.argv.find(x => x.startsWith('-O')) ?? '-O1'}, parser ${parser}, valtype ${valtype}\x1B[0m`);
 console.log();
 
@@ -81,21 +81,31 @@ const run = async (source, _context, _filename, callback, run = true) => {
   let toRun = (prev ? (prev + `;\nprint(-0x1337);\n`) : '') + source.trim();
 
   let shouldPrint = !prev;
-  const { exports, wasm, pages } = await compile(toRun, [], {}, str => {
+  const { exports, pages } = await compile(toRun, [], {}, str => {
     if (shouldPrint) process.stdout.write(str);
     if (str === '-4919') shouldPrint = true;
   });
-  // fs.writeFileSync('out.wasm', Buffer.from(wasm));
 
   if (run && exports.$) {
     lastMemory = exports.$;
     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 });

package/runner/sizes.js

@@ -1,5 +1,5 @@
-import fs from 'node:fs';
 import compile from '../compiler/index.js';
+import fs from 'node:fs';
 
 // deno compat
 const textEncoder = new TextEncoder();
@@ -18,7 +18,7 @@ const perform = async (file, args) => {
   console.log(label, ' '.repeat(40 - label.length), `${size}b`);
 };
 
-const argsValtypes = [ '--valtype=i32', '--valtype=i64', '--valtype=f64' ];
+const argsValtypes = [ '--valtype=i32', '--valtype=f64' ];
 const argsOptlevels = [ '-O0', '-O1', '-O2', '-O3' ];
 
 for (const file of [ 'bench/prime_basic.js', 'bench/fib_iter.js', 'test/math_1.js', 'test/math_3.js', 'test/while_1.js', 'test/for_2.js', 'test/unary_3.js', 'test/updateexp_1.js', 'test/eq_3.js', 'test/empty.js' ]) {

package/runner/version.js

@@ -1,10 +1,12 @@
-import fs from 'node:fs';
+import { readFileSync } from 'node:fs';
 
-let rev = 'unknown';
-try {
-  rev = JSON.parse(fs.readFileSync(new URL('../package.json', import.meta.url), 'utf8')).version.split('-')[1].slice(0, 7);
-} catch {
-  rev = fs.readFileSync(new URL('../.git/refs/heads/main', import.meta.url), 'utf8').trim().slice(0, 7);
-}
+export let version = 'unknown';
+export let rev = 'unknown';
 
-export default rev;
+const packageJson = JSON.parse(readFileSync(new URL('../package.json', import.meta.url), 'utf8'));
+version = packageJson.version.split('-')[0];
+rev = packageJson.version.split('-')[1];
+
+if (!rev) rev = readFileSync(new URL('../.git/refs/heads/main', import.meta.url), 'utf8').trim().slice(0, 9);
+
+export default `${version}-${rev}`;