Merge pull request #2454 from sinistersnare/davis-assorted-cleanups

Fix Blocks build script execution

Author: texodus

examples/blocks/index.mjs

@@ -14,6 +14,7 @@ import * as fs from "fs";
 import { get_examples, LOCAL_EXAMPLES } from "./examples.js";
 import sh from "@finos/perspective-scripts/sh.mjs";
 import * as url from "url";
+import * as path from "node:path";
 
 const version = JSON.parse(fs.readFileSync("./package.json")).version;
 const __dirname = url.fileURLToPath(new URL(".", import.meta.url)).slice(0, -1);
@@ -69,16 +70,17 @@ export async function dist_examples(
                         `${outpath}/${name}/${filename}`,
                         filecontents
                     );
-
-                    if (filename.endsWith("build.mjs")) {
-                        console.log("Building " + name);
-                        const script = `${outpath}/${name}/build.mjs`;
-                        sh`node ${script}`.runSync();
-                    }
                 } else if (filename !== ".git") {
                     sh`cp ${__dirname}/src/${name}/${filename} ${outpath}/${name}/${filename}`.runSync();
                 }
             }
+
+            // build
+            if (fs.existsSync(path.join(outpath, name, "build.mjs"))) {
+                console.log("Building " + name);
+                const script = `${outpath}/${name}/build.mjs`;
+                sh`node ${script}`.runSync();
+            }
         }
     }
 }

examples/blocks/package.json

@@ -17,5 +17,8 @@
         "@finos/perspective-viewer-openlayers": "^2.7.0",
         "@finos/perspective-workspace": "^2.7.0",
         "superstore-arrow": "3.0.0"
+    },
+    "devDependencies": {
+        "esbuild": "^0.14.54"
     }
 }

examples/blocks/src/superstore/README.md

@@ -1,8 +1,9 @@
 Demo of [Perspective](https://github.com/finos/perspective).
 
 This example of a `<perspective-workspace>` dashboard is generated from one
-[Apache Arrow]() source dataset, converted originally from this [XLS from a
-Tableau presentation](https://community.tableau.com/docs/DOC-1236).
+[Apache Arrow](https://arrow.apache.org/) source dataset,
+converted originally from this
+[XLS from a Tableau presentation](https://community.tableau.com/docs/DOC-1236).
 This layout is just an example; you can explore your own visualizations in the Perspective
 configuration menu, accessed by clicking the dropdown arrow in each pane's upper
 left, or advanced options in the pane's right-click context menu.

packages/perspective-viewer-datagrid/test/js/superstore.spec.js

@@ -13,7 +13,6 @@
 import { test } from "@playwright/test";
 import {
     compareContentsToSnapshot,
-    compareLightDOMContents,
     run_standard_tests,
 } from "@finos/perspective-test";
 

rust/perspective-viewer/src/rust/custom_elements/copy_dropdown.rs

@@ -58,6 +58,9 @@ impl CopyDropDownMenuElement {
         borrowed.as_apierror()?.hide()
     }
 
+    /// Internal Only.
+    ///
+    /// Set this custom element model's raw pointer.
     #[allow(clippy::not_unsafe_ptr_arg_deref)]
     pub fn unsafe_set_model(&self, ptr: *const PerspectiveViewerElement) {
         let model = unsafe { ptr.as_ref().unwrap() };

rust/perspective-viewer/src/rust/custom_elements/export_dropdown.rs

@@ -58,6 +58,9 @@ impl ExportDropDownMenuElement {
         borrowed.as_apierror()?.hide()
     }
 
+    /// Internal Only.
+    ///
+    /// Set this custom element model's raw pointer.
     #[allow(clippy::not_unsafe_ptr_arg_deref)]
     pub fn unsafe_set_model(&self, ptr: *const PerspectiveViewerElement) {
         let model = unsafe { ptr.as_ref().unwrap() };

rust/perspective-viewer/src/rust/session.rs

@@ -212,7 +212,7 @@ impl Session {
             .create_replace_expression_update(&old_expr, new_expr)
     }
 
-    /// Validate an expression strin and marshall the results.
+    /// Validate an expression string and marshall the results.
     pub async fn validate_expr(
         &self,
         expr: &str,

tools/perspective-scripts/sh.mjs

@@ -254,9 +254,9 @@ class Command extends Function {
  * @returns {string} A command with the missing argument's flags removed.
  * @example
  * console.assert(
- *     bash`run -t${1} -u"${undefined}" task`,
- *    `run -t1 task`
- * );s
+ *     sh`run -t${1} -u"${undefined}" task`,
+ *     sh`run -t1 task`
+ * );
  */
 const sh = new Proxy(Command, {
     apply(...args) {