porffor 0.2.0-fdf0fc5 → 0.14.0-4057a18e9

package/compiler/index.js

@@ -89,8 +89,6 @@ export default (code, flags) => {
       else compiler = [ compiler ];
 
     const tmpfile = 'porffor_tmp.c';
-    // const args = [ compiler, tmpfile, '-o', outFile ?? (process.platform === 'win32' ? 'out.exe' : 'out'), '-' + cO, '-march=native', '-s', '-fno-unwind-tables', '-fno-asynchronous-unwind-tables', '-ffunction-sections', '-fdata-sections', '-Wl', '-fno-ident', '-fno-exceptions', '-ffast-math' ];
-    // const args = [ ...compiler, tmpfile, '-o', outFile ?? (process.platform === 'win32' ? 'out.exe' : 'out'), '-' + cO, '-march=native', '-s', '-ffast-math', '-fno-exceptions', '-target', 'x86_64-linux' ];
     const args = [ ...compiler, tmpfile, '-o', outFile ?? (process.platform === 'win32' ? 'out.exe' : 'out'), '-' + cO, '-march=native', '-s', '-ffast-math', '-fno-exceptions' ];
 
     const c = toc(out);

package/compiler/opt.js

@@ -1,7 +1,7 @@
-import { Opcodes, Valtype } from "./wasmSpec.js";
-import { number } from "./embedding.js";
-import { read_signedLEB128, read_ieee754_binary64 } from "./encoding.js";
-import { log } from "./log.js";
+import { Opcodes, Valtype } from './wasmSpec.js';
+import { number } from './embedding.js';
+import { read_signedLEB128, read_ieee754_binary64 } from './encoding.js';
+import { log } from './log.js';
 import Prefs from './prefs.js';
 
 const performWasmOp = (op, a, b) => {
@@ -172,14 +172,14 @@ export default (funcs, globals, pages, tags, exceptions) => {
           }
         }
 
-        if (inst[inst.length - 1] === 'string_only' && !pages.hasAnyString) {
+        if (inst[inst.length - 1] === 'string_only' && !pages.hasAnyString && !Prefs.noRmUnusedTypes) {
           // remove this inst
           wasm.splice(i, 1);
           if (i > 0) i--;
           inst = wasm[i];
         }
 
-        if (inst[inst.length - 1] === 'string_only|start' && !pages.hasAnyString) {
+        if (inst[inst.length - 1] === 'string_only|start' && !pages.hasAnyString&& !Prefs.noRmUnusedTypes) {
           let j = i;
           for (; j < wasm.length; j++) {
             const op = wasm[j];
@@ -193,7 +193,7 @@ export default (funcs, globals, pages, tags, exceptions) => {
           inst = wasm[i];
         }
 
-        if (inst[0] === Opcodes.if && typeof inst[2] === 'string') {
+        if (inst[0] === Opcodes.if && typeof inst[2] === 'string' && !Prefs.noRmUnusedTypes) {
           // remove unneeded typeswitch checks
 
           const type = inst[2].split('|')[1];

package/compiler/parse.js

@@ -1,8 +1,6 @@
-import { log } from "./log.js";
+import { log } from './log.js';
 import Prefs from './prefs.js';
 
-// import { parse } from 'acorn';
-
 // deno compat
 if (typeof process === 'undefined' && typeof Deno !== 'undefined') {
   const textEncoder = new TextEncoder();

package/compiler/precompile.js

@@ -7,9 +7,6 @@ import { join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 const __dirname = fileURLToPath(new URL('.', import.meta.url));
 
-// import porfParse from './parse.js';
-// import porfCodegen from './codeGen.js';
-
 const argv = process.argv.slice();
 
 const compile = async (file, [ _funcs, _globals ]) => {
@@ -21,17 +18,12 @@ const compile = async (file, [ _funcs, _globals ]) => {
     first = source.slice(0, source.indexOf('\n'));
   }
 
-  let args = ['--bytestring', '--todo-time=compile', '--no-aot-pointer-opt', '--no-treeshake-wasm-imports', '--scoped-page-names', '--parse-types', '--opt-types'];
+  let args = ['--bytestring', '--todo-time=compile', '--no-aot-pointer-opt', '--no-treeshake-wasm-imports', '--no-rm-unused-types', '--scoped-page-names', '--funsafe-no-unlikely-proto-checks', '--parse-types', '--opt-types'];
   if (first.startsWith('// @porf')) {
     args = args.concat(first.slice('// @porf '.length).split(' '));
   }
   process.argv = argv.concat(args);
 
-  // const porfParse = (await import(`./parse.js?_=${Date.now()}`)).default;
-  // const porfCodegen = (await import(`./codeGen.js?_=${Date.now()}`)).default;
-
-  // let { funcs, globals, data } = porfCodegen(porfParse(source, ['module']));
-
   const porfCompile = (await import(`./index.js?_=${Date.now()}`)).default;
 
   let { funcs, globals, data, exceptions } = porfCompile(source, ['module']);
@@ -78,7 +70,14 @@ const compile = async (file, [ _funcs, _globals ]) => {
         allocated.add(pageName);
 
         y.splice(0, 10, 'alloc', pageName, x.pages.get(pageName).type, valtypeBinary);
-        // y.push(x.pages.get(pageName));
+      }
+
+      if (y[0] === Opcodes.i32_const && n[0] === Opcodes.throw) {
+        const id = y[1];
+        y.splice(0, 10, 'throw', exceptions[id].constructor, exceptions[id].message);
+
+        // remove throw inst
+        x.wasm.splice(i + 1, 1);
       }
     }
   }
@@ -98,31 +97,24 @@ const precompile = async () => {
     await compile(join(dir, file), [ funcs, globals ]);
   }
 
-  // const a = funcs.find(x => x.name === '__ecma262_ToUTCDTSF');
-  // console.log(Object.values(a.locals).slice(a.params.length));
-
-  // ${x.pages && x.pages.size > 0 ? `    pages: ${JSON.stringify(Object.fromEntries(x.pages.entries()))},` : ''}
-  // ${x.used && x.used.length > 0 ? `    used: ${JSON.stringify(x.used)},` : ''}
-
   return `// autogenerated by compiler/precompile.js
 import { number } from './embedding.js';
 
 export const BuiltinFuncs = function() {
-${funcs.map(x => `  this.${x.name} = {
-    wasm: (scope, { allocPage, builtin }) => ${JSON.stringify(x.wasm.filter(x => x.length && x[0] != null)).replace(/\["alloc","(.*?)","(.*?)",(.*?)\]/g, (_, reason, type, valtype) => `...number(allocPage(scope, '${reason}', '${type}') * pageSize, ${valtype})`).replace(/\[16,"(.*?)"]/g, (_, name) => `[16, builtin('${name}')]`)},
+${funcs.map(x => {
+  const wasm = JSON.stringify(x.wasm.filter(x => x.length && x[0] != null)).replace(/\["alloc","(.*?)","(.*?)",(.*?)\]/g, (_, reason, type, valtype) => `...number(allocPage(scope, '${reason}', '${type}') * pageSize, ${valtype})`).replace(/\[16,"(.*?)"]/g, (_, name) => `[16, builtin('${name}')]`).replace(/\["throw","(.*?)","(.*?)"\]/g, (_, constructor, message) => `...internalThrow(scope, '${constructor}', \`${message}\`)`);
+  return `  this.${x.name} = {
+    wasm: (scope, {${wasm.includes('allocPage(') ? 'allocPage,' : ''}${wasm.includes('builtin(') ? 'builtin,' : ''}${wasm.includes('internalThrow(') ? 'internalThrow,' : ''}}) => ${wasm},
     params: ${JSON.stringify(x.params)},
     typedParams: true,
     returns: ${JSON.stringify(x.returns)},
     ${x.returnType != null ? `returnType: ${JSON.stringify(x.returnType)}` : 'typedReturns: true'},
     locals: ${JSON.stringify(Object.values(x.locals).slice(x.params.length).map(x => x.type))},
     localNames: ${JSON.stringify(Object.keys(x.locals))},
-${x.data && x.data.length > 0 ? `    data: ${JSON.stringify(x.data)},` : ''}
-${x.exceptions && x.exceptions.length > 0 ? `    exceptions: ${JSON.stringify(x.exceptions)},` : ''}
-  };`.replaceAll('\n\n', '\n').replaceAll('\n\n', '\n')).join('\n')}
+${x.data && x.data.length > 0 ? `    data: ${JSON.stringify(x.data)}` : ''}
+  };`.replaceAll('\n\n', '\n').replaceAll('\n\n', '\n')
+}).join('\n')}
 };`;
 };
 
-const code = await precompile();
-// console.log(code);
-
-fs.writeFileSync(join(__dirname, 'generated_builtins.js'), code);
+fs.writeFileSync(join(__dirname, 'generated_builtins.js'), await precompile());

package/compiler/prototype.js

@@ -1,9 +1,9 @@
-import { Opcodes, Blocktype, Valtype, ValtypeSize, PageSize } from "./wasmSpec.js";
-import { number } from "./embedding.js";
-import { unsignedLEB128 } from "./encoding.js";
-import { UNDEFINED } from "./builtins.js";
-import Prefs from './prefs.js';
+import { Opcodes, Blocktype, Valtype, ValtypeSize } from './wasmSpec.js';
+import { number } from './embedding.js';
+import { unsignedLEB128 } from './encoding.js';
+import { UNDEFINED } from './builtins.js';
 import { TYPES } from './types.js';
+import Prefs from './prefs.js';
 
 // todo: turn these into built-ins once arrays and these become less hacky
 

package/compiler/wasmSpec.js

@@ -21,6 +21,11 @@ export const Valtype = {
   v128: 0x7b
 };
 
+export const Reftype = {
+  funcref: 0x70,
+  externref: 0x6f
+};
+
 export const Blocktype = {
   void: 0x40,
 };

package/compiler/wrap.js

@@ -1,12 +1,76 @@
 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, 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: {
+      // wasm func index, including all imports
+      const func = funcs.find(x => (x.originalIndex ?? x.index) === value);
+      // if (!func) return 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];
+
+      // have to slice because of memory alignment (?)
+      const buf = memory.buffer.slice(value + 4, value + 4 + 8 * length);
+      return Array.from(new Float64Array(buf, 0, length));
+    }
+
+    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, v, t));
+      }
+
+      return out;
+    }
+
+    default: return value;
+  }
+};
+
 export default async (source, flags = [ 'module' ], customImports = {}, print = str => process.stdout.write(str)) => {
   const times = [];
 
@@ -148,62 +212,11 @@ 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);
 
-            return Array.from(new Uint16Array(memory.buffer, pointer + 4, length)).map(x => String.fromCharCode(x)).join('');
-          }
+        if (ret == null) return undefined;
 
-          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, ret[0], ret[1])
       } catch (e) {
         if (e.is && e.is(exceptTag)) {
           const exceptId = e.getArg(exceptTag, 0);

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-4057a18e9",
   "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/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,5 @@
 import compile from '../compiler/wrap.js';
-import rev from './version.js';
-
-// import repl from 'node:repl';
-// import repl from '../../node-repl-polyfill/index.js';
+import version from './version.js';
 
 let repl;
 try {
@@ -17,8 +14,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 +27,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,11 +76,10 @@ 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.$;

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}`;