Clean up and update Bazel build files

.github/workflows/build_and_test.yml

@@ -48,7 +48,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: '3.9'
+          python-version: "3.9"
       - name: Build
         run: |
           pip install build
@@ -89,3 +89,13 @@ jobs:
       - name: Test
         run: |
           bazelisk test --lockfile_mode=error //...
+
+  bazel_use_module:
+    name: Build Bazel example
+    runs-on: "ubuntu-22.04"
+    steps:
+      - uses: actions/checkout@v4
+      - name: Build
+        run: |
+          cd examples/bazel
+          bazelisk build --lockfile_mode=off //...

MODULE.bazel

@@ -3,13 +3,5 @@ module(
     version = "0.21.0-rc2",
 )
 
-bazel_dep(name = "googletest", version = "1.11.0", repo_name = "com_google_googletest")
-bazel_dep(name = "rules_python", version = "0.40.0")
-
-build_defs = use_extension("//tools/build_defs:extensions.bzl", "build_defs")
-use_repo(
-    build_defs,
-    "default_python3_headers",
-)
-
-register_toolchains("//platform_defs:default_python3_toolchain")
+bazel_dep(name = "googletest", version = "1.16.0")
+bazel_dep(name = "rules_python", version = "1.2.0")

cmd/BUILD

@@ -1,4 +1,4 @@
-package(default_visibility = ["//visibility:public"])
+package(default_visibility = ["//visibility:private"])
 
 cc_library(
     name = "utils",
@@ -10,6 +10,7 @@ cc_library(
 cc_binary(
     name = "jsonnet",
     srcs = ["jsonnet.cpp"],
+    visibility = ["//visibility:public"],
     deps = [
         ":utils",
         "//core:libjsonnet",
@@ -19,6 +20,7 @@ cc_binary(
 cc_binary(
     name = "jsonnetfmt",
     srcs = ["jsonnetfmt.cpp"],
+    visibility = ["//visibility:public"],
     deps = [
         ":utils",
         "//core:libjsonnet",

core/BUILD

@@ -1,45 +1,46 @@
-package(default_visibility = ["//visibility:public"])
+package(default_visibility = ["//visibility:private"])
 
 cc_library(
     name = "libjsonnet",
     srcs = [
-        "desugarer.cpp",
-        "formatter.cpp",
-        "lexer.cpp",
-        "libjsonnet.cpp",
-        "parser.cpp",
-        "pass.cpp",
-        "path_utils.cpp",
-        "static_analysis.cpp",
-        "string_utils.cpp",
-        "vm.cpp",
-    ],
-    hdrs = [
         "ast.h",
+        "desugarer.cpp",
         "desugarer.h",
+        "formatter.cpp",
         "formatter.h",
         "json.h",
+        "lexer.cpp",
         "lexer.h",
+        "libjsonnet.cpp",
+        "parser.cpp",
         "parser.h",
+        "pass.cpp",
         "pass.h",
+        "path_utils.cpp",
         "path_utils.h",
         "state.h",
+        "static_analysis.cpp",
         "static_analysis.h",
         "static_error.h",
+        "string_utils.cpp",
         "string_utils.h",
         "unicode.h",
+        "vm.cpp",
         "vm.h",
     ],
-    includes = ["."],
-    linkopts = ["-lm"],
-    deps = [
-        "//include:libjsonnet",
-        "//include:libjsonnet_fmt",
+    copts = ["-I."],
+    implementation_deps = [
         "//stdlib:std",
         "//third_party/json",
         "//third_party/md5:libmd5",
         "//third_party/rapidyaml:ryml",
     ],
+    linkopts = ["-lm"],
+    visibility = ["//visibility:public"],
+    deps = [
+        "//include:libjsonnet",
+        "//include:libjsonnet_fmt",
+    ],
 )
 
 cc_test(
@@ -48,7 +49,7 @@ cc_test(
     deps = [
         ":libjsonnet",
         # Note: On Ubuntu, apt-get install libgtest-dev google-mock
-        "@com_google_googletest//:gtest_main",
+        "@googletest//:gtest_main",
     ],
 )
 
@@ -57,7 +58,7 @@ cc_test(
     srcs = ["parser_test.cpp"],
     deps = [
         ":libjsonnet",
-        "@com_google_googletest//:gtest_main",
+        "@googletest//:gtest_main",
     ],
 )
 
@@ -66,7 +67,7 @@ cc_test(
     srcs = ["libjsonnet_test.cpp"],
     deps = [
         ":libjsonnet",
-        "@com_google_googletest//:gtest_main",
+        "@googletest//:gtest_main",
     ],
 )
 
@@ -75,6 +76,6 @@ cc_test(
     srcs = ["unicode_test.cpp"],
     deps = [
         ":libjsonnet",
-        "@com_google_googletest//:gtest_main",
+        "@googletest//:gtest_main",
     ],
 )

cpp/BUILD

@@ -1,8 +1,9 @@
-package(default_visibility = ["//visibility:public"])
+package(default_visibility = ["//visibility:private"])
 
 cc_library(
     name = "libjsonnet++",
     srcs = ["libjsonnet++.cpp"],
+    visibility = ["//visibility:public"],
     deps = [
         "//core:libjsonnet",
         "//include:libjsonnet++",
@@ -15,6 +16,6 @@ cc_test(
     data = ["//cpp/testdata"],
     deps = [
         ":libjsonnet++",
-        "@com_google_googletest//:gtest_main",
+        "@googletest//:gtest_main",
     ],
 )

examples/bazel/.bazelrc

@@ -0,0 +1 @@
+common --lockfile_mode=off

examples/bazel/.gitignore

@@ -0,0 +1 @@
+MODULE.bazel.lock

examples/bazel/BUILD

@@ -0,0 +1,27 @@
+load("@rules_python//python:defs.bzl", "py_binary")
+
+cc_binary(
+    name = "use_cpp_lib",
+    srcs = ["use_cpp_lib.cc"],
+    deps = ["@jsonnet//cpp:libjsonnet++"],
+)
+
+cc_binary(
+    name = "use_c_lib",
+    srcs = ["use_c_lib.c"],
+    deps = ["@jsonnet//core:libjsonnet"],
+)
+
+py_binary(
+    name = "use_py_module",
+    srcs = ["use_py_module.py"],
+    deps = ["@jsonnet//python:_jsonnet"],
+)
+
+genrule(
+    name = "use_jsonnet_cmd",
+    srcs = ["example.jsonnet"],
+    outs = ["example.out"],
+    cmd = "$(location @jsonnet//cmd:jsonnet) $< > $@",
+    tools = ["@jsonnet//cmd:jsonnet"],
+)

examples/bazel/MODULE.bazel

@@ -0,0 +1,5 @@
+# Example of using jsonnet by depending on the Bazel module.
+
+bazel_dep(name = "rules_python", version = "1.2.0")
+bazel_dep(name = "jsonnet")
+local_path_override(module_name = "jsonnet", path = "../..")

examples/bazel/example.jsonnet

@@ -0,0 +1,8 @@
+local Person(name='Alice') = {
+  name: name,
+  welcome: 'Hello ' + name + '!',
+};
+{
+  person1: Person(),
+  person2: Person('Bob'),
+}

examples/bazel/expect.out

@@ -0,0 +1,10 @@
+{
+   "person1": {
+      "name": "Alice",
+      "welcome": "Hello Alice!"
+   },
+   "person2": {
+      "name": "Bob",
+      "welcome": "Hello Bob!"
+   }
+}

examples/bazel/use_c_lib.c

@@ -0,0 +1,22 @@
+#include <libjsonnet.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+int main(int argc, char **argv) {
+    int ret = 0;
+    fprintf(stderr, "Jsonnet version: %s\n", jsonnet_version());
+    struct JsonnetVm *vm = jsonnet_make();
+    if (!vm) { return 1; }
+
+    int err = 0;
+    char *result = jsonnet_evaluate_file(vm, "example.jsonnet", &err);
+    if (!err) {
+        fprintf(stdout, "%s\n", result ? result : "-- no output --");
+    } else {
+        fprintf(stderr, "%s\n", result ? result : "-- no output --");
+        ret = 2;
+    }
+
+    jsonnet_destroy(vm);
+    return ret;
+}

examples/bazel/use_cpp_lib.cc

@@ -0,0 +1,22 @@
+#include <libjsonnet++.h>
+#include <iostream>
+
+int main(int argc, char **argv) {
+    int ret = 0;
+    std::cerr << "Jsonnet version: " << jsonnet::Jsonnet::version() << std::endl;
+
+    jsonnet::Jsonnet vm;
+    if (!vm.init()) {
+        return 1;
+    }
+
+    std::string result;
+    bool ok = vm.evaluateFile("example.jsonnet", &result);
+    if (ok) {
+        std::cout << result << std::endl;
+    } else {
+        std::cerr << vm.lastError() << std::endl;
+        ret = 2;
+    }
+    return ret;
+}

examples/bazel/use_py_module.py

@@ -0,0 +1,5 @@
+import sys
+import _jsonnet
+
+result = _jsonnet.evaluate_file("example.jsonnet")
+sys.stdout.write(result)

include/BUILD

@@ -1,19 +1,23 @@
-package(default_visibility = ["//visibility:public"])
+package(default_visibility = ["//visibility:private"])
 
 cc_library(
     name = "libjsonnet",
     hdrs = ["libjsonnet.h"],
     includes = ["."],
+    visibility = ["//core:__pkg__"],
 )
 
 cc_library(
     name = "libjsonnet_fmt",
     hdrs = ["libjsonnet_fmt.h"],
     includes = ["."],
+    visibility = ["//core:__pkg__"],
 )
 
 cc_library(
     name = "libjsonnet++",
     hdrs = ["libjsonnet++.h"],
     includes = ["."],
+    visibility = ["//cpp:__pkg__"],
+    deps = ["//include:libjsonnet"],
 )

platform_defs/BUILD

@@ -1,5 +1,7 @@
 load("@rules_python//python:defs.bzl", "py_runtime", "py_runtime_pair")
 
+package(default_visibility = ["//visibility:private"])
+
 py_runtime(
     name = "python3",
     interpreter_path = "/usr/bin/python3",

python/BUILD

@@ -1,12 +1,14 @@
 load("@rules_python//python:defs.bzl", "py_library", "py_test")
 
+package(default_visibility = ["//visibility:private"])
+
 cc_binary(
     name = "_jsonnet.so",
     srcs = ["_jsonnet.c"],
     linkshared = 1,
     deps = [
         "//core:libjsonnet",
-        "@default_python3_headers//:headers",
+        "@rules_python//python/cc:current_py_cc_headers",
     ],
 )
 
@@ -20,6 +22,7 @@ py_library(
 
 py_test(
     name = "_jsonnet_test",
+    size = "small",
     srcs = ["_jsonnet_test.py"],
     data = [
         "testdata/basic_check.jsonnet",

stdlib/BUILD

@@ -1,4 +1,4 @@
-package(default_visibility = ["//visibility:public"])
+package(default_visibility = ["//visibility:private"])
 
 filegroup(
     name = "stdlib",
@@ -7,10 +7,10 @@ filegroup(
 
 cc_library(
     name = "std",
-    srcs = [":gen-std-jsonnet-h"],
-    hdrs = ["std.jsonnet.h"],
     includes = ["."],
     linkstatic = 1,
+    textual_hdrs = [":gen-std-jsonnet-h"],
+    visibility = ["//core:__pkg__"],
 )
 
 genrule(