Convert to official Fabrice Bellard's quickjs.

Author: jdmichaud

.gitignore

@@ -1,4 +1,5 @@
 /.zig-cache/
 /zig-cache/
 /zig-out/
+/zig-pkg/
 gen

LICENSE.txt

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 Rob Blanckaert
+Copyright (c) 2026 AllYourCodebase contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,3 +1,7 @@
-# QuickJS-NG
+# QuickJS
 
-This is [QuickJS-NG](https://github.com/quickjs-ng/quickjs) packaged for [Zig](https://ziglang.org).
+This is [QuickJS](https://github.com/bellard/quickjs) packaged for [Zig](https://ziglang.org).
+
+# Credits
+
+Converted from [zig's quickjs-ng](https://github.com/allyourcodebase/quickjs-ng)

build.zig

@@ -1,27 +1,111 @@
 const std = @import("std");
+const Io = std.Io;
 
-fn addDefines(c: *std.Build.Step.Compile, b: *std.Build) void {
+const PortableAddCSourceFilesOptions = if (@hasDecl(std.Build.Module, "AddCSourceFilesOptions"))
+    std.Build.Module.AddCSourceFilesOptions else std.Build.Step.Compile.AddCSourceFilesOptions;
+
+pub fn portableAddCSourceFiles(c: *std.Build.Step.Compile, options: PortableAddCSourceFilesOptions) void {
+    if (@hasDecl(std.Build.Step.Compile, "addCSourceFiles")) {
+        c.addCSourceFiles(options);
+    } else {
+        c.root_module.addCSourceFiles(options);
+    }
+}
+
+pub fn portableLinkSystemLibrary(c: *std.Build.Step.Compile, name: []const u8) void {
+    if (@hasDecl(std.Build.Step.Compile, "linkSystemLibrary")) {
+        c.linkSystemLibrary(name);
+    } else {
+        c.root_module.linkSystemLibrary(name, .{});
+    }
+}
+
+pub fn portableLinkLibC(c: *std.Build.Step.Compile) void {
+    if (@hasDecl(std.Build.Step.Compile, "linkLibC")) {
+        c.linkLibC();
+    } else {
+        c.root_module.link_libc = true;
+    }
+}
+
+pub fn portableLinkLibrary(c: *std.Build.Step.Compile, library: *std.Build.Step.Compile) void {
+    if (@hasDecl(std.Build.Step.Compile, "linkLibrary")) {
+        c.linkLibrary(library);
+    } else {
+        c.root_module.linkLibrary(library);
+    }
+}
+
+fn addDefines(c: *std.Build.Step.Compile, b: *std.Build, version: []const u8) void {
     c.root_module.addCMacro("CONFIG_BIGNUM", "1");
     c.root_module.addCMacro("_GNU_SOURCE", "1");
+    var buf: [256]u8 = undefined;
+    const version_str = std.fmt.bufPrint(&buf, "\"{s}\"", .{ version })
+        catch @panic("could not format version");
+    c.root_module.addCMacro("CONFIG_VERSION", version_str);
     _ = b;
 }
 
 fn addStdLib(c: *std.Build.Step.Compile, cflags: []const []const u8, root: *std.Build.Dependency) void {
     if (c.rootModuleTarget().os.tag == .wasi) {
         c.root_module.addCMacro("_WASI_EMULATED_PROCESS_CLOCKS", "1");
         c.root_module.addCMacro("_WASI_EMULATED_SIGNAL", "1");
-        c.linkSystemLibrary("wasi-emulated-process-clocks");
-        c.linkSystemLibrary("wasi-emulated-signal");
+        portableLinkSystemLibrary(c, "wasi-emulated-process-clocks");
+        portableLinkSystemLibrary(c, "wasi-emulated-signal");
     }
-    c.addCSourceFiles(.{ .files = &.{"quickjs-libc.c"}, .flags = cflags, .root = root.path(".") });
+    portableAddCSourceFiles(c, .{ .files = &.{"quickjs-libc.c"}, .flags = cflags, .root = root.path(".") });
+}
+
+var buffer: [256]u8 = undefined;
+
+pub fn getVersion(b: *std.Build, csrc: *std.Build.Dependency) []const u8 {
+    const version_path = csrc.path("VERSION").getPath(b);
+    var file = std.fs.cwd().openFile(version_path, .{})
+        catch @panic("fail to read VERSION file");
+    defer file.close();
+
+    const reader = file.reader();
+
+    const first_line = reader.readUntilDelimiterOrEofAlloc(
+        b.allocator,
+        '\n',
+        128,
+    ) catch @panic("fail to read VERSION file");
+
+    if (first_line) |_| {} else {
+        @panic("fail to read VERSION file");
+    }
+
+    return first_line.?;
+}
+
+pub fn getVersionIo(b: *std.Build, csrc: *std.Build.Dependency) []const u8 {
+    var threaded: std.Io.Threaded = .init(b.allocator, .{});
+    defer threaded.deinit();
+    const io = threaded.io();
+
+    const version_path = csrc.path("VERSION").getPath(b);
+    var file = std.Io.Dir.cwd().openFile(io, version_path, .{})
+        catch @panic("fail to read VERSION file");
+    defer file.close(io);
+
+    var reader = file.reader(io, &buffer);
+
+    const first_line = reader.interface.takeDelimiterExclusive('\n')
+        catch @panic("fail to read VERSION file");
+
+    return first_line;
 }
 
 pub fn build(b: *std.Build) void {
     const target = b.standardTargetOptions(.{});
     const optimize = b.standardOptimizeOption(.{});
     const include_stdlib = b.option(bool, "stdlib", "include stdlib in library") orelse true;
 
-    const csrc = b.dependency("quickjs-ng", .{});
+    const csrc = b.dependency("quickjs", .{});
+
+    const version = if (@hasDecl(std, "Io")) getVersionIo(b, csrc) else getVersion(b, csrc);
+    defer b.allocator.free(version);
 
     const cflags = &.{
         "-Wno-implicit-fallthrough",
@@ -40,7 +124,7 @@ pub fn build(b: *std.Build) void {
         "libregexp.c",
         "libunicode.c",
         "cutils.c",
-        "xsum.c",
+        "dtoa.c",
     };
 
     const libquickjs = b.addLibrary(.{
@@ -51,16 +135,16 @@ pub fn build(b: *std.Build) void {
             .optimize = optimize,
         }),
     });
-    libquickjs.addCSourceFiles(.{
+    portableAddCSourceFiles(libquickjs, .{
         .files = libquickjs_source,
         .flags = cflags,
         .root = csrc.path("."),
     });
-    addDefines(libquickjs, b);
+    addDefines(libquickjs, b, version);
     if (include_stdlib) {
         addStdLib(libquickjs, cflags, csrc);
     }
-    libquickjs.linkLibC();
+    portableLinkLibC(libquickjs);
     if (target.result.os.tag == .windows) {
         libquickjs.stack_size = 8388608;
     }
@@ -73,13 +157,13 @@ pub fn build(b: *std.Build) void {
             .optimize = optimize,
         }),
     });
-    qjsc.addCSourceFiles(.{
+    portableAddCSourceFiles(qjsc, .{
         .files = &.{"qjsc.c"},
         .flags = cflags,
         .root = csrc.path("."),
     });
-    qjsc.linkLibrary(libquickjs);
-    addDefines(qjsc, b);
+    portableLinkLibrary(qjsc, libquickjs);
+    addDefines(qjsc, b, version);
     if (!include_stdlib) {
         addStdLib(qjsc, cflags, csrc);
     }
@@ -97,71 +181,58 @@ pub fn build(b: *std.Build) void {
         qjsc_host.stack_size = 8388608;
     }
 
-    qjsc_host.addCSourceFiles(.{
+    portableAddCSourceFiles(qjsc_host, .{
         .files = &.{"qjsc.c"},
         .flags = cflags,
         .root = csrc.path("."),
     });
-    qjsc_host.addCSourceFiles(.{
+    portableAddCSourceFiles(qjsc_host, .{
         .files = libquickjs_source,
         .flags = cflags,
         .root = csrc.path("."),
     });
     addStdLib(qjsc_host, cflags, csrc);
-    addDefines(qjsc_host, b);
-    qjsc_host.linkLibC();
+    addDefines(qjsc_host, b, version);
+    portableLinkLibC(qjsc_host);
 
     const header = b.addTranslateC(.{
-        .root_source_file = csrc.path("quickjs.h"),
+        .root_source_file = csrc.path("quickjs-libc.h"),
         .target = target,
         .optimize = optimize,
     });
-    _ = b.addModule("quickjs-ng", .{ .root_source_file = header.getOutput() });
+    _ = b.addModule("quickjs", .{ .root_source_file = header.getOutput() });
 
     const gen_repl = b.addRunArtifact(qjsc_host);
-    gen_repl.addArg("-N");
-    gen_repl.addArg("qjsc_repl");
+    gen_repl.addArg("-s");
+    gen_repl.addArg("-c");
     gen_repl.addArg("-o");
     const gen_repl_out = gen_repl.addOutputFileArg("repl.c");
     gen_repl.addArg("-m");
     gen_repl.addFileArg(csrc.path("repl.js"));
 
-    const gen_standalone = b.addRunArtifact(qjsc_host);
-    gen_standalone.addArg("-N");
-    gen_standalone.addArg("qjsc_standalone");
-    gen_standalone.addArg("-o");
-    const gen_standalone_out = gen_standalone.addOutputFileArg("standalone.c");
-    gen_standalone.addArg("-m");
-    gen_standalone.addFileArg(csrc.path("standalone.js"));
-
     const qjs = b.addExecutable(.{
         .name = "qjs",
         .root_module = b.createModule(.{
             .target = target,
             .optimize = optimize,
         }),
     });
-    qjs.addCSourceFiles(.{
+    qjs.root_module.addCMacro("CONFIG_VERSION", "1.0.0");
+    portableAddCSourceFiles(qjs, .{
         .files = &.{"qjs.c"},
         .flags = cflags,
         .root = csrc.path("."),
     });
-    qjs.addCSourceFiles(.{
+    portableAddCSourceFiles(qjs, .{
         .files = &.{"repl.c"},
         .root = gen_repl_out.dirname(),
         .flags = cflags,
     });
-    qjs.addCSourceFiles(.{
-        .files = &.{"standalone.c"},
-        .root = gen_standalone_out.dirname(),
-        .flags = cflags,
-    });
     if (!include_stdlib) {
         addStdLib(qjs, cflags, csrc);
     }
-    qjs.linkLibrary(libquickjs);
-    addDefines(qjs, b);
+    portableLinkLibrary(qjs, libquickjs);
+    addDefines(qjs, b, version);
     qjs.step.dependOn(&gen_repl.step);
-    qjs.step.dependOn(&gen_standalone.step);
     b.installArtifact(qjs);
 }

build.zig.zon

@@ -1,12 +1,12 @@
 .{
-    .name = .quickjs_ng,
-    .fingerprint = 0xb2bca9faa72a0432,
-    .version = "0.10.1",
+    .name = .quickjs,
+    .fingerprint = 0x23b15228d5af0966,
+    .version = "1.0.0",
     .minimum_zig_version = "0.14.0",
     .dependencies = .{
-        .@"quickjs-ng" = .{
-            .url = "git+https://github.com/quickjs-ng/quickjs/?ref=v0.10.1#5299e09100b97a5dd0ea0e73fa5caa4aa0b2d97c",
-            .hash = "N-V-__8AAJ6ZOwAqRvY64qRhZ9KrT8YuUvtVQxBECJxJwPyd",
+        .@"quickjs" = .{
+            .url = "https://github.com/bellard/quickjs/archive/f1139494d18a2053630c5ed3384a42bb70db3c53.tar.gz",
+            .hash = "N-V-__8AAFP3MACLqx3IPYUe7MVJki-nUn2Jtimo4Tx6u2s_",
         },
     },
     .paths = .{