Refactor tools/

Signed-off-by: Andrew Stein <steinlink@gmail.com>

Author: texodus

rust/perspective/Cargo.toml

@@ -24,6 +24,7 @@ include = ["src/**/*", "tests/**/*", "Cargo.toml"]
 
 [lib]
 crate-type = ["cdylib", "rlib"]
+doctest = false
 path = "src/lib.rs"
 
 

rust/perspective/src/lib.rs

@@ -20,12 +20,13 @@
 //! computes a "Group By" operation, returning a new Arrow.
 //!
 //! ```rust
-//! use perspective::LocalClient;
 //! use perspective::client::config::ViewConfigUpdate;
 //! use perspective::client::{TableInitOptions, UpdateData, ViewWindow};
 //! use perspective::server::Server;
 //!
-//! # let arow_vec_data: Vec<u8> = vec![];
+//! # let arrow_vec_data: Vec<u8> = vec![];
+//! let server = Server::default();
+//! let client = server.new_local_client();
 //! let data = UpdateData::Arrow(arrow_vec_data);
 //! let options = TableInitOptions::default();
 //! let table = client.table(data.into(), options).await?;

tools/scripts/bench.mjs

@@ -11,13 +11,14 @@
 // ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
 
 import * as dotenv from "dotenv";
-import sh from "./sh.mjs";
 import { get_scope } from "./sh_perspective.mjs";
 
+import "zx/globals";
+
 dotenv.config({ path: "./.perspectiverc", quiet: true });
 const scope = get_scope();
 if (scope.includes("client")) {
-    sh`pnpm run --recursive --filter bench bench_js`.runSync();
+    $.sync`pnpm run --recursive --filter bench bench_js`;
 } else if (scope.includes("python")) {
-    sh`pnpm run --recursive --filter bench bench_python`.runSync();
+    $.sync`pnpm run --recursive --filter bench bench_python`;
 }

tools/scripts/emsdk.patch

@@ -14,7 +14,6 @@ import path from "path";
 import os from "os";
 import fs from "fs";
 import * as dotenv from "dotenv";
-import sh from "./sh.mjs";
 import { getWorkspaceRoot, getWorkspacePackageJson } from "./workspace.mjs";
 
 import "zx/globals";
@@ -26,27 +25,23 @@ const emscripten = pkg.emscripten;
 dotenv.config({ path: "./.perspectiverc", quiet: true });
 
 function base() {
-    return sh.path`${getWorkspaceRoot()}/.emsdk`;
+    return path.resolve(getWorkspaceRoot(), ".emsdk");
 }
 
 function emsdk_checkout() {
-    function git(args) {
-        sh`git ${args}`.runSync();
-    }
-
-    git(["clone", "https://github.com/emscripten-core/emsdk.git", base()]);
+    $.sync`git clone https://github.com/emscripten-core/emsdk.git ${base()}`;
 }
 
 function emsdk(...args) {
     const basedir = base();
     const suffix = os.type() == "Windows_NT" ? ".bat" : "";
-    const emsdk = path.join(basedir, "emsdk" + suffix);
-    sh`${emsdk} ${args}`.runSync();
+    const emsdkBin = path.join(basedir, "emsdk" + suffix);
+    $.sync`${emsdkBin} ${args}`;
 }
 
 function toolchain_install() {
     console.log(`-- Installing Emscripten ${emscripten}`);
-    sh`git pull`.cwd(".emsdk").runSync();
+    $.sync({ cwd: ".emsdk" })`git pull`;
     emsdk("install", emscripten);
     emsdk("activate", emscripten);
     console.log(`-- Emscripten ${emscripten} installed`);
@@ -68,5 +63,4 @@ if (!process.env.PSP_SKIP_EMSDK_INSTALL) {
     }
 
     toolchain_install();
-    $.sync`cd .emsdk && git apply ../tools/scripts/emsdk.patch`;
 }

tools/scripts/fix_cpp.mjs

@@ -28,7 +28,6 @@ const FIX_PATHS = [
     ["**/*.mjs", ["//", "/*", " *", " */"]],
     // ["**/*.css", ["//", "/*", " *", " */"]],
     ["**/*.scss", ["//", "/*", " *", " */"]],
-    ["**/*.less", ["//", "/*", " *", " */"]],
     ["**/*.toml", ["# ", "#"]],
     ["**/*.yaml", ["# ", "#"]],
     ["**/*.py", ["# ", "#"]],

tools/scripts/install_emsdk.mjs

@@ -11,7 +11,6 @@
 // ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
 
 import { Octokit } from "octokit";
-import sh from "./sh.mjs";
 import fs from "node:fs/promises";
 
 import "zx/globals";
@@ -21,11 +20,11 @@ const OCTOKIT = new Octokit({
     auth: process.env.GITHUB_TOKEN,
 });
 
-const CURRENT_TAG = sh`git describe --exact-match --tags`.execSync();
+const CURRENT_TAG = $.sync`git describe --exact-match --tags`.toString().trim();
 
-const IS_DIRTY = await sh`git status --untracked-files=no --porcelain`
-    .exec()
-    .then((x) => x.length > 0);
+const IS_DIRTY =
+    (await $`git status --untracked-files=no --porcelain`).stdout.trim()
+        .length > 0;
 
 async function get_release_assets() {
     const resp = await OCTOKIT.request("GET /repos/{owner}/{repo}/releases", {
@@ -71,9 +70,9 @@ async function publish_release_assets(releases) {
                     release.name.endsWith("tar.gz")) &&
                 release.name.indexOf("wasm") === -1
             ) {
-                sh`twine upload ${release.name}`.runSync();
+                $.sync`twine upload ${release.name}`;
             } else if (release.name.endsWith(".tgz")) {
-                sh`npm publish ${release.name}`.runSync();
+                $.sync`npm publish ${release.name}`;
             } else {
                 console.log(`Skipping  "${release.name}"`);
             }

tools/scripts/lint_headers.mjs

@@ -10,10 +10,10 @@
 // ┃ of the [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0). ┃
 // ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
 
-import sh from "./sh.mjs";
 import inquirer from "inquirer";
 import fs from "fs";
 import * as dotenv from "dotenv";
+import { execSync } from "child_process";
 
 const original = dotenv.config({
     path: "./.perspectiverc",
@@ -50,7 +50,7 @@ const CONFIG = new Proxy(
         write() {
             fs.writeFileSync("./.perspectiverc", this.config.join("\n"));
             if (process.env.PSP_BUILD_IMMEDIATELY || process.env.PSP_ONCE) {
-                sh`node tools/scripts/build.mjs`.runSync();
+                execSync("node tools/scripts/build.mjs", { stdio: "inherit" });
                 if (process.env.PSP_ONCE) {
                     while (this.config.length > 0) {
                         this.config.pop();