Fix clean script

Signed-off-by: Andrew Stein <steinlink@gmail.com>
finos · Oct 17, 2024 · 3f6e19c · 3f6e19c
1 parent 28a3101
commit 3f6e19c
Show file tree

Hide file tree

Showing 13 changed files with 49 additions and 32 deletions.
diff --git a/.github/actions/install-deps/action.yaml b/.github/actions/install-deps/action.yaml
@@ -48,7 +48,7 @@ runs:
     using: "composite"
     steps:
         - name: Clean System
-          uses: AdityaGarg8/remove-unwanted-software@v3
+          uses: AdityaGarg8/remove-unwanted-software@v4.1
           if: ${{ inputs.clean == 'true' && runner.os != 'Windows' }}
           with:
               remove-android: "true"

diff --git a/examples/python-aiohttp/package.json b/examples/python-aiohttp/package.json
@@ -19,6 +19,6 @@
     "devDependencies": {
         "@finos/perspective-webpack-plugin": "workspace:^",
         "npm-run-all": "^4.1.3",
-        "rimraf": "^2.5.2"
+        "rimraf": "^6"
     }
 }
diff --git a/examples/python-starlette/package.json b/examples/python-starlette/package.json
@@ -19,6 +19,6 @@
     "devDependencies": {
         "@finos/perspective-webpack-plugin": "workspace:^",
         "npm-run-all": "^4.1.3",
-        "rimraf": "^2.5.2"
+        "rimraf": "^6"
     }
 }
diff --git a/examples/python-tornado-streaming/package.json b/examples/python-tornado-streaming/package.json
@@ -19,6 +19,6 @@
     "devDependencies": {
         "@finos/perspective-webpack-plugin": "workspace:^",
         "npm-run-all": "^4.1.3",
-        "rimraf": "^2.5.2"
+        "rimraf": "^6"
     }
 }
diff --git a/examples/python-tornado/package.json b/examples/python-tornado/package.json
@@ -19,6 +19,6 @@
     "devDependencies": {
         "@finos/perspective-webpack-plugin": "workspace:^",
         "npm-run-all": "^4.1.3",
-        "rimraf": "^2.5.2"
+        "rimraf": "^6"
     }
 }
diff --git a/examples/workspace/package.json b/examples/workspace/package.json
@@ -20,6 +20,6 @@
         "@finos/perspective-webpack-plugin": "workspace:^",
         "http-server": "^14.1.1",
         "npm-run-all": "^4.1.3",
-        "rimraf": "^2.5.2"
+        "rimraf": "^6"
     }
 }
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
@@ -3,6 +3,7 @@ packages:
     - "tools/perspective-scripts"
     - "tools/perspective-bench"
     - "cpp/perspective"
+    - "packages/perspective-client"
     - "packages/perspective-esbuild-plugin"
     - "packages/perspective-viewer-datagrid"
     - "packages/perspective-viewer-d3fc"

diff --git a/rust/perspective-client/package.json b/rust/perspective-client/package.json
@@ -0,0 +1,18 @@
+{
+    "name": "@finos/perspective-client",
+    "version": "3.1.0",
+    "description": "",
+    "private": true,
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/finos/perspective"
+    },
+    "type": "module",
+    "license": "Apache-2.0",
+    "scripts": {
+        "clean": "rimraf src/rust/proto.rs"
+    },
+    "devDependencies": {
+        "rimraf": "^6"
+    }
+}
diff --git a/rust/perspective-js/package.json b/rust/perspective-js/package.json
@@ -37,7 +37,7 @@
     "types": "./dist/esm/perspective.d.ts",
     "scripts": {
         "build": "node ./build.js",
-        "clean": "rimraf dist && rimraf build",
+        "clean": "rimraf dist && rimraf build && rimraf src/ts/ts-rs",
         "docs": "cargo doc"
     },
     "publishConfig": {

diff --git a/rust/perspective-python/package.json b/rust/perspective-python/package.json
@@ -11,7 +11,7 @@
     "license": "Apache-2.0",
     "scripts": {
         "build": "node build.mjs",
-        "clean": "rimraf perspective.data && rimraf dist && rimraf build",
+        "clean": "rimraf *.data && rimraf dist && rimraf build",
         "test": "node test.mjs"
     },
     "devDependencies": {

diff --git a/tools/perspective-scripts/clean.mjs b/tools/perspective-scripts/clean.mjs
@@ -12,45 +12,42 @@
 
 import { clean, get_scope } from "./sh_perspective.mjs";
 import { execSync } from "child_process";
+import * as fs from "node:fs";
 
 const PACKAGES = get_scope();
 const JS_PKGS = [];
 const RUST_PKGS = [];
+
+const CRATE_NAMES = fs.readdirSync("rust");
+
 for (const pkg of PACKAGES) {
     if (pkg === "perspective-cpp") {
         console.log("-- Cleaning perspective-cpp");
         clean("cpp/perspective/dist", "cpp/perspective/build");
-    } else if (
-        [
-            "perspective-cli",
-            "perspective-esbuild-plugin",
-            "perspective-jupyterlab",
-            "perspective-viewer-d3fc",
-            "perspective-viewer-datagrid",
-            "perspective-viewer-openlayers",
-            "perspective-webpack-plugin",
-            "perspective-workspace",
-        ].indexOf(pkg) > -1
-    ) {
-        JS_PKGS.push(pkg);
-    } else {
+    } else if (CRATE_NAMES.indexOf(pkg) > -1) {
         RUST_PKGS.push(pkg);
+    } else {
+        JS_PKGS.push(pkg);
     }
 }
 
-if (JS_PKGS.length > 0) {
+if (JS_PKGS.length > 0 || RUST_PKGS.length > 0) {
     console.log(`-- Cleaning ${JS_PKGS.join(", ")} via pnpm`);
-    execSync(
-        `pnpm run ${JS_PKGS.map((x) => `--filter ${x} --if-present`).join(
-            " "
-        )} clean`,
-        { stdio: "inherit" }
-    );
+    const flags = JS_PKGS.concat(RUST_PKGS)
+        .map((x) => `--filter @finos/${x} --if-present`)
+        .join(" ");
+
+    execSync(`pnpm run ${flags} clean`, { stdio: "inherit" });
 }
 
 if (RUST_PKGS.length > 0) {
-    console.log(`-- Cleaning ${RUST_PKGS.join(", ")} via cargo`);
-    execSync(`cargo clean ${RUST_PKGS.map((x) => `-p ${x}`).join(" ")}`);
+    if (process.env.PACKAGE?.length > 1) {
+        console.log(`-- Cleaning ${RUST_PKGS.join(", ")} via cargo`);
+        execSync(`cargo clean ${RUST_PKGS.map((x) => `-p ${x}`).join(" ")}`);
+    } else {
+        console.log(`-- Cleaning all crates via cargo`);
+        execSync(`cargo clean`);
+    }
 }
 
 clean("docs/build", "docs/python", "docs/obj");
diff --git a/tools/perspective-scripts/sh_perspective.mjs b/tools/perspective-scripts/sh_perspective.mjs
@@ -94,7 +94,7 @@ export function get_scope() {
         (acc, x) => {
             if (x.startsWith("!")) {
                 acc.exclude.push(x);
-            } else {
+            } else if (x != "") {
                 acc.include.push(x);
             }
 

diff --git a/tools/perspective-scripts/test_js.mjs b/tools/perspective-scripts/test_js.mjs
@@ -36,6 +36,7 @@ const IS_PLAYWRIGHT = process.env.PACKAGE.split(",").reduce(
             "perspective-viewer-d3fc",
             "perspective-viewer-openlayers",
             "perspective-viewer-workspace",
+            "perspective-workspace",
             "perspective-jupyter",
         ].includes(pkg),
     false