From 472397883b9839847e12d0779fa06541b5dc60e9 Mon Sep 17 00:00:00 2001
From: Gordon Smith <GordonJSmith@gmail.com>
Date: Thu, 15 Aug 2024 10:58:47 +0100
Subject: [PATCH] fix: Graphviz not including html table support

fix: UMD files were not backward compatible

Signed-off-by: Gordon Smith <GordonJSmith@gmail.com>
---
 .../wasm/index-worker.js => index-worker.js   |   0
 packages/wasm/index.html => index.html        |   6 +-
 package-lock.json                             |  53 +--
 package.json                                  |   3 +-
 packages/base91/package.json                  |   4 +-
 packages/duckdb/package.json                  |   3 +-
 packages/expat/package.json                   |   4 +-
 packages/graphviz-cli/package.json            |   4 +-
 packages/graphviz/package.json                |   4 +-
 packages/wasm/esbuild.mjs                     |  15 +-
 packages/wasm/package.json                    |   1 -
 packages/zstd/package.json                    |   4 +-
 vcpkg-overlays/graphviz/CMakeLists.txt        | 365 +++++++++++++-----
 vcpkg-overlays/graphviz/portfile.cmake        |  10 +-
 14 files changed, 315 insertions(+), 161 deletions(-)
 rename packages/wasm/index-worker.js => index-worker.js (100%)
 rename packages/wasm/index.html => index.html (95%)

diff --git a/packages/wasm/index-worker.js b/index-worker.js
similarity index 100%
rename from packages/wasm/index-worker.js
rename to index-worker.js
diff --git a/packages/wasm/index.html b/index.html
similarity index 95%
rename from packages/wasm/index.html
rename to index.html
index 2507000f..256eb4dc 100644
--- a/packages/wasm/index.html
+++ b/index.html
@@ -58,7 +58,7 @@ <h3>ESM</h3>
     <div id="ESM"></div>
     <script type="module">
         import { Graphviz } from "https://cdn.jsdelivr.net/npm/@hpcc-js/wasm/dist/index.js";
-        //  import { Graphviz } from "./dist/index.js";
+        // import { Graphviz } from "./packages/wasm/dist/index.js";
         if (Graphviz) {
             const graphviz = await Graphviz.load();
             const svg = graphviz.layout(dot, "svg", "dot");
@@ -69,7 +69,7 @@ <h3>ESM</h3>
     <h3>UMD 1</h3>
     <div id="UMD1"></div>
     <script src="https://cdn.jsdelivr.net/npm/@hpcc-js/wasm/dist/graphviz.umd.js"></script>
-    <!-- <script src="./dist/graphviz.umd.js"></script> -->
+    <!-- <script src="./packages/wasm/dist/graphviz.umd.js"></script> -->
     <script>
         var hpccWasm = window["@hpcc-js/wasm"];
         hpccWasm.Graphviz.load().then(graphviz => {
@@ -81,7 +81,7 @@ <h3>UMD 1</h3>
     <h3>UMD 2</h3>
     <div id="UMD2"></div>
     <script src="https://cdn.jsdelivr.net/npm/@hpcc-js/wasm/dist/index.umd.js"></script>
-    <!-- <script src="./dist/index.umd.js"></script> -->
+    <!-- <script src="./packages/wasm/dist/index.umd.js"></script> -->
     <script>
         var hpccWasm = window["@hpcc-js/wasm"];
         hpccWasm.Graphviz.load().then(graphviz => {
diff --git a/package-lock.json b/package-lock.json
index a6b65167..fd614e54 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,7 +12,8 @@
         "packages/*"
       ],
       "devDependencies": {
-        "@eslint/js": "^9.9.0",
+        "@eslint/js": "9.9.0",
+        "@hpcc-js/esbuild-plugins": "1.0.10",
         "@istanbuljs/nyc-config-typescript": "1.0.2",
         "@types/chai": "4.3.17",
         "@types/emscripten": "1.39.13",
@@ -760,16 +761,6 @@
         }
       }
     },
-    "node_modules/@duckdb/duckdb-wasm": {
-      "version": "1.28.1-dev99.0",
-      "resolved": "https://registry.npmjs.org/@duckdb/duckdb-wasm/-/duckdb-wasm-1.28.1-dev99.0.tgz",
-      "integrity": "sha512-EgIRjUFAos4oT4QeFLK6g7IDPWFWu8dP/mj2/b0pyiN5dDL+xxKW2KyLbeAs26L6Y6yeYy0O4OJSezFOqTbOmg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "apache-arrow": "^14.0.1"
-      }
-    },
     "node_modules/@emnapi/core": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.2.0.tgz",
@@ -1394,9 +1385,9 @@
       "license": "BSD-3-Clause"
     },
     "node_modules/@hpcc-js/esbuild-plugins": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/esbuild-plugins/-/esbuild-plugins-1.0.7.tgz",
-      "integrity": "sha512-kKCTx8YRwI4jnKpa8AfNiXZ8dmYcso+JJ5sBYvC7iYbxrim4deB1oJCOLsM1ZebIHuR6SN2ROCxMN/v/Q5MGow==",
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/esbuild-plugins/-/esbuild-plugins-1.0.10.tgz",
+      "integrity": "sha512-sXJEo5GKDu7uMbuQ72XV8jZBflyKKappUYNSjs6wITxcMzbi3o+WsWyyPeUYOPhj9bgguJ4Biy6AAPd1ma3Mxw==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -18089,34 +18080,37 @@
       "name": "@hpcc-js/wasm-base91",
       "version": "1.1.0",
       "license": "Apache-2.0",
-      "devDependencies": {
-        "@hpcc-js/esbuild-plugins": "1.0.7"
-      }
+      "devDependencies": {}
     },
     "packages/duckdb": {
       "name": "@hpcc-js/wasm-duckdb",
       "version": "1.1.0",
       "license": "Apache-2.0",
       "devDependencies": {
-        "@duckdb/duckdb-wasm": "1.28.1-dev99.0",
-        "@hpcc-js/esbuild-plugins": "1.0.7"
+        "@duckdb/duckdb-wasm": "1.28.1-dev106.0"
+      }
+    },
+    "packages/duckdb/node_modules/@duckdb/duckdb-wasm": {
+      "version": "1.28.1-dev106.0",
+      "resolved": "https://registry.npmjs.org/@duckdb/duckdb-wasm/-/duckdb-wasm-1.28.1-dev106.0.tgz",
+      "integrity": "sha512-HcA9q/Yq1t8nAIg2rl8DmOTjKy1tAHSdBGHlCcWAm5StsfAjcm+f0STBEH3hmWPk0qEtOJF30OR+GfeyUOP+hA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "apache-arrow": "^14.0.1"
       }
     },
     "packages/expat": {
       "name": "@hpcc-js/wasm-expat",
       "version": "1.1.0",
       "license": "Apache-2.0",
-      "devDependencies": {
-        "@hpcc-js/esbuild-plugins": "1.0.7"
-      }
+      "devDependencies": {}
     },
     "packages/graphviz": {
       "name": "@hpcc-js/wasm-graphviz",
       "version": "1.1.0",
       "license": "Apache-2.0",
-      "devDependencies": {
-        "@hpcc-js/esbuild-plugins": "1.0.7"
-      }
+      "devDependencies": {}
     },
     "packages/graphviz-cli": {
       "name": "@hpcc-js/wasm-graphviz-cli",
@@ -18129,9 +18123,7 @@
       "bin": {
         "wasm-graphviz-cli": "bin/index.js"
       },
-      "devDependencies": {
-        "@hpcc-js/esbuild-plugins": "1.0.7"
-      }
+      "devDependencies": {}
     },
     "packages/wasm": {
       "name": "@hpcc-js/wasm",
@@ -18144,7 +18136,6 @@
         "dot-wasm": "node ./node_modules/@hpcc-js/wasm-graphviz-cli/bin/index.js"
       },
       "devDependencies": {
-        "@hpcc-js/esbuild-plugins": "1.0.7",
         "@hpcc-js/wasm-base91": "1.1.0",
         "@hpcc-js/wasm-duckdb": "1.1.0",
         "@hpcc-js/wasm-expat": "1.1.0",
@@ -18157,9 +18148,7 @@
       "name": "@hpcc-js/wasm-zstd",
       "version": "1.1.0",
       "license": "Apache-2.0",
-      "devDependencies": {
-        "@hpcc-js/esbuild-plugins": "1.0.7"
-      }
+      "devDependencies": {}
     }
   }
 }
diff --git a/package.json b/package.json
index 40ac5bd4..3f52f5d6 100644
--- a/package.json
+++ b/package.json
@@ -70,7 +70,7 @@
   },
   "dependencies": {},
   "devDependencies": {
-    "@eslint/js": "^9.9.0",
+    "@eslint/js": "9.9.0",
     "@istanbuljs/nyc-config-typescript": "1.0.2",
     "@types/chai": "4.3.17",
     "@types/emscripten": "1.39.13",
@@ -83,6 +83,7 @@
     "chai": "5.1.1",
     "coveralls": "3.1.1",
     "c8": "10.1.2",
+    "@hpcc-js/esbuild-plugins": "1.0.10",
     "eslint": "9.9.0",
     "globals": "15.9.0",
     "karma": "6.4.4",
diff --git a/packages/base91/package.json b/packages/base91/package.json
index 8c81bfd6..5b09accd 100644
--- a/packages/base91/package.json
+++ b/packages/base91/package.json
@@ -36,9 +36,7 @@
     "update-major": "npx -y npm-check-updates -u"
   },
   "dependencies": {},
-  "devDependencies": {
-    "@hpcc-js/esbuild-plugins": "1.0.7"
-  },
+  "devDependencies": {},
   "keywords": [
     "graphviz",
     "typescript",
diff --git a/packages/duckdb/package.json b/packages/duckdb/package.json
index 9c0fd418..955a32df 100644
--- a/packages/duckdb/package.json
+++ b/packages/duckdb/package.json
@@ -40,8 +40,7 @@
   },
   "dependencies": {},
   "devDependencies": {
-    "@duckdb/duckdb-wasm": "1.28.1-dev99.0",
-    "@hpcc-js/esbuild-plugins": "1.0.7"
+    "@duckdb/duckdb-wasm": "1.28.1-dev106.0"
   },
   "keywords": [
     "graphviz",
diff --git a/packages/expat/package.json b/packages/expat/package.json
index 6c7c0866..7e2c6af3 100644
--- a/packages/expat/package.json
+++ b/packages/expat/package.json
@@ -35,9 +35,7 @@
     "update": "npx -y npm-check-updates -u -t minor",
     "update-major": "npx -y npm-check-updates -u"
   },
-  "devDependencies": {
-    "@hpcc-js/esbuild-plugins": "1.0.7"
-  },
+  "devDependencies": {},
   "keywords": [
     "graphviz",
     "typescript",
diff --git a/packages/graphviz-cli/package.json b/packages/graphviz-cli/package.json
index ec85cf98..c6ee3fcc 100644
--- a/packages/graphviz-cli/package.json
+++ b/packages/graphviz-cli/package.json
@@ -38,9 +38,7 @@
     "@hpcc-js/wasm-graphviz": "1.1.0",
     "yargs": "17.7.2"
   },
-  "devDependencies": {
-    "@hpcc-js/esbuild-plugins": "1.0.7"
-  },
+  "devDependencies": {},
   "keywords": [
     "graphviz",
     "typescript",
diff --git a/packages/graphviz/package.json b/packages/graphviz/package.json
index c74676db..113a406b 100644
--- a/packages/graphviz/package.json
+++ b/packages/graphviz/package.json
@@ -36,9 +36,7 @@
     "update-major": "npx -y npm-check-updates -u"
   },
   "dependencies": {},
-  "devDependencies": {
-    "@hpcc-js/esbuild-plugins": "1.0.7"
-  },
+  "devDependencies": {},
   "keywords": [
     "graphviz",
     "typescript",
diff --git a/packages/wasm/esbuild.mjs b/packages/wasm/esbuild.mjs
index fba6ae6f..bf1140da 100644
--- a/packages/wasm/esbuild.mjs
+++ b/packages/wasm/esbuild.mjs
@@ -2,17 +2,16 @@ import { bothTpl, browserBoth, nodeBoth } from "@hpcc-js/esbuild-plugins";
 
 //  config  ---
 await Promise.all([
-    bothTpl("src/base91.ts", "dist/base91", 'window["@hpcc-js/wasm"]'),
-    bothTpl("src/graphviz.ts", "dist/graphviz", 'window["@hpcc-js/wasm"]'),
-    bothTpl("src/expat.ts", "dist/expat", 'window["@hpcc-js/wasm"]'),
-    bothTpl("src/zstd.ts", "dist/zstd", 'window["@hpcc-js/wasm"]')
+    bothTpl("src/base91.ts", "dist/base91", undefined, "@hpcc-js/wasm"),
+    bothTpl("src/graphviz.ts", "dist/graphviz", undefined, "@hpcc-js/wasm"),
+    bothTpl("src/expat.ts", "dist/expat", undefined, "@hpcc-js/wasm"),
+    bothTpl("src/zstd.ts", "dist/zstd", undefined, "@hpcc-js/wasm")
 ]);
-await bothTpl("src/index.ts", "dist/index", 'window["@hpcc-js/wasm"]', ["./base91.js", "./duckdb.js", "./expat.js", "./graphviz.js", "./zstd.js"]);
+await bothTpl("src/index.ts", "dist/index", undefined, "@hpcc-js/wasm", ["./base91.js", "./duckdb.js", "./expat.js", "./graphviz.js", "./zstd.js"]);
 
-browserBoth("test/index-browser.ts", "dist-test/index.browser", 'window["@hpcc-js/wasm-test"]');
-browserBoth("test/worker-browser.ts", "dist-test/worker.browser", 'window["@hpcc-js/wasm-test"]');
+browserBoth("test/index-browser.ts", "dist-test/index.browser");
+browserBoth("test/worker-browser.ts", "dist-test/worker.browser");
 nodeBoth("test/index-node.ts", "dist-test/index.node");
 nodeBoth("test/worker-node.ts", "dist-test/worker.node");
 
 // nodeTpl("src/__bin__/dot-wasm.ts", "bin/dot-wasm", "esm", ["@hpcc-js/wasm/graphviz"]);
-
diff --git a/packages/wasm/package.json b/packages/wasm/package.json
index 1e408704..bdfa94d5 100644
--- a/packages/wasm/package.json
+++ b/packages/wasm/package.json
@@ -78,7 +78,6 @@
     "yargs": "17.7.2"
   },
   "devDependencies": {
-    "@hpcc-js/esbuild-plugins": "1.0.7",
     "@hpcc-js/wasm-base91": "1.1.0",
     "@hpcc-js/wasm-duckdb": "1.1.0",
     "@hpcc-js/wasm-expat": "1.1.0",
diff --git a/packages/zstd/package.json b/packages/zstd/package.json
index c02d9315..6a5f3fec 100644
--- a/packages/zstd/package.json
+++ b/packages/zstd/package.json
@@ -36,9 +36,7 @@
     "update-major": "npx -y npm-check-updates -u"
   },
   "dependencies": {},
-  "devDependencies": {
-    "@hpcc-js/esbuild-plugins": "1.0.7"
-  },
+  "devDependencies": {},
   "keywords": [
     "graphviz",
     "typescript",
diff --git a/vcpkg-overlays/graphviz/CMakeLists.txt b/vcpkg-overlays/graphviz/CMakeLists.txt
index 7da6cca5..7a6cd014 100644
--- a/vcpkg-overlays/graphviz/CMakeLists.txt
+++ b/vcpkg-overlays/graphviz/CMakeLists.txt
@@ -1,35 +1,50 @@
-cmake_minimum_required(VERSION 3.13.0 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.14.1 FATAL_ERROR)
 project(Graphviz)
 
 include(FeatureSummary)
 
 # =============================== Build options ================================
-set(enable_ltdl AUTO CACHE STRING "Support on-demand plugin loading")
-set_property(CACHE enable_ltdl PROPERTY STRINGS AUTO ON OFF)
-set(with_expat AUTO CACHE STRING "Support HTML-like labels through expat")
-set_property(CACHE with_expat PROPERTY STRINGS AUTO ON OFF)
+set(ENABLE_LTDL AUTO CACHE STRING "Support on-demand plugin loading")
+set_property(CACHE ENABLE_LTDL PROPERTY STRINGS AUTO ON OFF)
+set(WITH_EXPAT AUTO CACHE STRING "Support HTML-like labels through expat")
+set_property(CACHE WITH_EXPAT PROPERTY STRINGS AUTO ON OFF)
 option(with_digcola    "DIGCOLA features in neato layout engine" ON )
-set(with_gvedit AUTO CACHE STRING "GVEdit interactive graph editor")
-set_property(CACHE with_gvedit PROPERTY STRINGS AUTO ON OFF)
+set(WITH_GVEDIT AUTO CACHE STRING "GVEdit interactive graph editor")
+set_property(CACHE WITH_GVEDIT PROPERTY STRINGS AUTO ON OFF)
 option(with_ipsepcola  "IPSEPCOLA features in neato layout engine" ON )
 option(with_ortho      "ORTHO features in neato layout engine." ON )
 option(with_sfdp       "sfdp layout engine." ON )
-set(with_smyrna AUTO CACHE STRING "SMYRNA large graph viewer")
-set_property(CACHE with_smyrna PROPERTY STRINGS AUTO ON OFF)
-set(with_zlib AUTO CACHE STRING "Support raster image compression through zlib")
-set_property(CACHE with_zlib PROPERTY STRINGS AUTO ON OFF)
-option(use_coverage    "enables analyzing code coverage" OFF )
-option(with_cxx_api    "enables building the C++ API" OFF )
-option(with_cxx_tests  "enables building the C++ tests" OFF )
-option(use_win_pre_inst_libs "enables building using pre-installed Windows libraries" ON)
+set(WITH_SMYRNA AUTO CACHE STRING "SMYRNA large graph viewer")
+set_property(CACHE WITH_SMYRNA PROPERTY STRINGS AUTO ON OFF)
+set(WITH_ZLIB AUTO CACHE STRING "Support raster image compression through zlib")
+set_property(CACHE WITH_ZLIB PROPERTY STRINGS AUTO ON OFF)
+option(use_coverage    "enables analyzing code coverage" OFF)
+option(with_cxx_api    "enables building the C++ API" OFF)
+option(with_cxx_tests  "enables building the C++ tests" OFF)
+option(use_win_pre_inst_libs
+       "enables building using pre-installed Windows libraries" ON)
 option(BUILD_SHARED_LIBS "Build in shared lib mode" ON)
+set(ENABLE_TCL AUTO CACHE STRING "Build TCL components")
+set_property(CACHE ENABLE_TCL PROPERTY STRINGS AUTO ON OFF)
+set(ENABLE_SWIG AUTO CACHE STRING "Build language bindings")
+set_property(CACHE ENABLE_SWIG PROPERTY STRINGS AUTO ON OFF)
+set(ENABLE_SHARP AUTO CACHE STRING "Build C# language bindings")
+set_property(CACHE ENABLE_SHARP PROPERTY STRINGS AUTO ON OFF)
+set(ENABLE_D AUTO CACHE STRING "Build D language bindings")
+set_property(CACHE ENABLE_D PROPERTY STRINGS AUTO ON OFF)
+set(ENABLE_GO AUTO CACHE STRING "Build Go language bindings")
+set_property(CACHE ENABLE_GO PROPERTY STRINGS AUTO ON OFF)
+set(INTGOSIZE AUTO CACHE STRING "Integer size for go, 32 or 64")
+set_property(CACHE INTGOSIZE PROPERTY STRINGS AUTO 32 64)
+set(ENABLE_JAVASCRIPT AUTO CACHE STRING "Build Javascript language bindings")
+set_property(CACHE ENABLE_JAVASCRIPT PROPERTY STRINGS AUTO ON OFF)
+option(GRAPHVIZ_CLI "Build command line tools" ON)
 
 if(WIN32)
-  # Build dynamic-link libraries on Windows, including MinGW. The
-  # CMake build system does not currently support building static
-  # libraries, so the GVDLL symbol can be unconditionally set until
-  # such support is introduced.
-  add_definitions(-DGVDLL)
+  if(BUILD_SHARED_LIBS)
+    # build dynamic-link libraries on Windows, including MinGW
+    add_definitions(-DGVDLL)
+  endif()
 
   option(install_win_dependency_dlls "Install 3rd party dependencies" ON)
 endif()
@@ -56,10 +71,6 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 # ============================= Build dependencies =============================
 find_package(BISON 3.0 REQUIRED)
 find_package(FLEX REQUIRED)
-find_program(GIT git)
-if(NOT GIT)
-  message(FATAL_ERROR "git not found")
-endif()
 find_program(GZIP gzip)
 
 # ================== Convenient values for CMake configuration =================
@@ -69,16 +80,20 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
   set(LIBRARY_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}")
   set(HEADER_INSTALL_DIR  "${CMAKE_INSTALL_INCLUDEDIR}/graphviz")
   set(MAN_INSTALL_DIR     "${CMAKE_INSTALL_MANDIR}")
-  set(libdir              "${CMAKE_INSTALL_FULL_LIBDIR}")
-  set(includedir          "${CMAKE_INSTALL_FULL_INCLUDEDIR}")
+  set(libdir # cmake-lint: disable=C0103
+                          "${CMAKE_INSTALL_FULL_LIBDIR}")
+  set(includedir # cmake-lint: disable=C0103
+                          "${CMAKE_INSTALL_FULL_INCLUDEDIR}")
   set(DATA_INSTALL_DIR    "${CMAKE_INSTALL_DATAROOTDIR}")
 else()
   set(BINARY_INSTALL_DIR  bin)
   set(LIBRARY_INSTALL_DIR lib)
   set(HEADER_INSTALL_DIR  include/graphviz)
   set(MAN_INSTALL_DIR     share/man)
-  set(libdir              "${CMAKE_INSTALL_PREFIX}/${LIBRARY_INSTALL_DIR}")
-  set(includedir          "${CMAKE_INSTALL_PREFIX}/include")
+  set(libdir # cmake-lint: disable=C0103
+                          "${CMAKE_INSTALL_PREFIX}/${LIBRARY_INSTALL_DIR}")
+  set(includedir # cmake-lint: disable=C0103
+                          "${CMAKE_INSTALL_PREFIX}/include")
   set(DATA_INSTALL_DIR    share)
 endif()
 
@@ -86,14 +101,17 @@ set(PLUGIN_INSTALL_DIR      ${LIBRARY_INSTALL_DIR}/graphviz)
 set(PKGCONFIG_DIR           ${LIBRARY_INSTALL_DIR}/pkgconfig)
 # TODO: Find a way to check for groff and ps2pdf for manpage pdf generation
 # set(MAN_PDF_INSTALL_DIR share/graphviz/doc/pdf)
-set(WINDOWS_DEPENDENCY_DIR  "${CMAKE_CURRENT_SOURCE_DIR}/windows/dependencies/libraries")
-set(WINDOWS_DEPENDENCY_VCPKG_DIR  "${CMAKE_CURRENT_SOURCE_DIR}/windows/dependencies/libraries/vcpkg/installed")
+set(WINDOWS_DEPENDENCY_DIR
+    "${CMAKE_CURRENT_SOURCE_DIR}/windows/dependencies/libraries")
+set(WINDOWS_DEPENDENCY_VCPKG_DIR "${WINDOWS_DEPENDENCY_DIR}/vcpkg/installed")
 if(CMAKE_CL_64)
   set(WINDOWS_DEPENDENCY_DIR "${WINDOWS_DEPENDENCY_DIR}/x64")
-  set(WINDOWS_DEPENDENCY_VCPKG_DIR "${WINDOWS_DEPENDENCY_VCPKG_DIR}/x64-windows")
+  set(WINDOWS_DEPENDENCY_VCPKG_DIR
+      "${WINDOWS_DEPENDENCY_VCPKG_DIR}/x64-windows")
 else()
   set(WINDOWS_DEPENDENCY_DIR "${WINDOWS_DEPENDENCY_DIR}/x86")
-  set(WINDOWS_DEPENDENCY_VCPKG_DIR "${WINDOWS_DEPENDENCY_VCPKG_DIR}/x86-windows")
+  set(WINDOWS_DEPENDENCY_VCPKG_DIR
+      "${WINDOWS_DEPENDENCY_VCPKG_DIR}/x86-windows")
 endif()
 
 set(GRAPHVIZ_PLUGIN_VERSION 6)
@@ -103,78 +121,84 @@ set(GVPLUGIN_CONFIG_FILE config${GRAPHVIZ_PLUGIN_VERSION})
 # ============================ Library dependencies ============================
 if(WIN32)
   if(use_win_pre_inst_libs)
-    list(APPEND CMAKE_PREFIX_PATH ${WINDOWS_DEPENDENCY_DIR})
     list(APPEND CMAKE_PREFIX_PATH ${WINDOWS_DEPENDENCY_VCPKG_DIR})
+    list(APPEND CMAKE_PREFIX_PATH ${WINDOWS_DEPENDENCY_DIR})
+    set(PKG_CONFIG_EXECUTABLE
+        "${WINDOWS_DEPENDENCY_VCPKG_DIR}/tools/pkgconf/pkgconf.exe"
+        CACHE STRING "The pathname of the pkg-config program")
   endif()
   if(MINGW)
     list(APPEND CMAKE_PREFIX_PATH $ENV{MSYSTEM_PREFIX})
   endif()
 endif()
 
+# FIXME: workaround for uninitialized variable in `freetype-targets.cmake`
+set(_cmake_import_check_xcframework_for_freetype /dev/null)
+
 find_package(ANN)
 find_package(CAIRO)
 
-if(NOT with_expat STREQUAL "OFF")
+if(NOT WITH_EXPAT STREQUAL "OFF")
   find_package(EXPAT)
-  if(with_expat STREQUAL "AUTO")
+  if(WITH_EXPAT STREQUAL "AUTO")
     if(EXPAT_FOUND)
-      message(STATUS "setting -Dwith_expat=ON")
-      set(with_expat ON)
+      message(STATUS "setting -DWITH_EXPAT=ON")
+      set(WITH_EXPAT ON)
     else()
-      message(STATUS "setting -Dwith_expat=OFF")
-      set(with_expat OFF)
+      message(STATUS "setting -DWITH_EXPAT=OFF")
+      set(WITH_EXPAT OFF)
     endif()
   elseif(NOT EXPAT_FOUND)
-    message(FATAL_ERROR "-Dwith_expat=ON and expat not found")
+    message(FATAL_ERROR "-DWITH_EXPAT=ON and expat not found")
   endif()
 endif()
 
-if(NOT with_smyrna STREQUAL "OFF")
+find_package(GTS)
+
+if(NOT WITH_SMYRNA STREQUAL "OFF")
   find_package(Freetype)
   find_package(GLUT)
   find_package(GTK2)
   find_package(PkgConfig)
+  find_package(Fontconfig)
   if(PkgConfig_FOUND)
-    pkg_check_modules(FONTCONFIG fontconfig)
     pkg_check_modules(GTKGLEXT gtkglext-1.0)
-    pkg_check_modules(GTS gts)
     pkg_check_modules(XRENDER xrender)
   endif()
-  if(Freetype_FOUND AND GLUT_FOUND AND GTK2_FOUND AND FONTCONFIG_FOUND AND
+  if(Freetype_FOUND AND GLUT_FOUND AND GTK2_FOUND AND Fontconfig_FOUND AND
      GTKGLEXT_FOUND AND GTS_FOUND AND XRENDER_FOUND)
-    if(with_smyrna STREQUAL "AUTO")
-      message(STATUS "setting -Dwith_smyrna=ON")
-      set(with_smyrna ON)
+    if(WITH_SMYRNA STREQUAL "AUTO")
+      message(STATUS "setting -DWITH_SMYRNA=ON")
+      set(WITH_SMYRNA ON)
     endif()
   else()
-    if(with_smyrna STREQUAL "AUTO")
-      message(STATUS "setting -Dwith_smyrna=OFF")
-      set(with_smyrna OFF)
+    if(WITH_SMYRNA STREQUAL "AUTO")
+      message(STATUS "setting -DWITH_SMYRNA=OFF")
+      set(WITH_SMYRNA OFF)
     else()
-      message(FATAL_ERROR "-Dwith_smyrna=ON and dependencies not found")
+      message(FATAL_ERROR "-DWITH_SMYRNA=ON and dependencies not found")
     endif()
   endif()
 endif()
 
 find_package(GD)
 find_package(GS)
-find_package(GTS)
 
-if(NOT enable_ltdl STREQUAL "OFF")
+if(NOT ENABLE_LTDL STREQUAL "OFF")
   find_package(LTDL)
-  if(enable_ltdl STREQUAL "AUTO")
+  if(ENABLE_LTDL STREQUAL "AUTO")
     if(LTDL_FOUND)
-      message(STATUS "setting -Denable_ltdl=ON")
-      set(enable_ltdl ON)
+      message(STATUS "setting -DENABLE_LTDL=ON")
+      set(ENABLE_LTDL ON)
     else()
-      message(STATUS "setting -Denable_ltdl=OFF")
-      set(enable_ltdl OFF)
+      message(STATUS "setting -DENABLE_LTDL=OFF")
+      set(ENABLE_LTDL OFF)
     endif()
   elseif(NOT LTDL_FOUND)
-    message(FATAL_ERROR "-Denable_ltdl=ON and ltdl not found")
+    message(FATAL_ERROR "-DENABLE_LTDL=ON and ltdl not found")
   endif()
 endif()
-if(enable_ltdl)
+if(ENABLE_LTDL)
   add_definitions(-DENABLE_LTDL)
 endif()
 
@@ -183,7 +207,7 @@ find_package(Freetype)
 find_package(PANGOCAIRO)
 find_package(PkgConfig)
 if(PkgConfig_FOUND)
-  pkg_check_modules(GDK gdk-2.0)
+  pkg_check_modules(GDK gdk-3.0)
   pkg_check_modules(GDK_PIXBUF gdk-pixbuf-2.0)
   pkg_check_modules(LASI lasi)
   pkg_check_modules(POPPLER poppler-glib)
@@ -202,32 +226,142 @@ else()
   set(XRENDER_FOUND 0)
 endif()
 
-if(NOT with_zlib STREQUAL "OFF")
+if(NOT WITH_ZLIB STREQUAL "OFF")
   find_package(ZLIB)
-  if(with_zlib STREQUAL "AUTO")
+  if(WITH_ZLIB STREQUAL "AUTO")
     if(ZLIB_FOUND)
-      message(STATUS "setting -Dwith_zlib=ON")
-      set(with_zlib ON)
+      message(STATUS "setting -DWITH_ZLIB=ON")
+      set(WITH_ZLIB ON)
     else()
-      message(STATUS "setting -Dwith_zlib=OFF")
-      set(with_zlib OFF)
+      message(STATUS "setting -DWITH_ZLIB=OFF")
+      set(WITH_ZLIB OFF)
     endif()
   elseif(NOT ZLIB_FOUND)
-    message(FATAL_ERROR "-Dwith_zlib=ON and zlib not found")
+    message(FATAL_ERROR "-DWITH_ZLIB=ON and zlib not found")
+  endif()
+endif()
+
+if(NOT ENABLE_TCL STREQUAL "OFF")
+  find_package(TCL)
+  if(ENABLE_TCL STREQUAL "AUTO")
+    if(TCL_FOUND)
+      message(STATUS "setting -DENABLE_TCL=ON")
+      set(ENABLE_TCL ON)
+    else()
+      message(STATUS "setting -DENABLE_TCL=OFF")
+      set(ENABLE_TCL OFF)
+    endif()
+  elseif(NOT TCL_FOUND)
+    message(FATAL_ERROR "-DENABLE_TCL=ON and TCL not found")
+  endif()
+endif()
+
+if(NOT ENABLE_SWIG STREQUAL "OFF")
+  # Opt in to new `-module` behavior that we do not care about. This silences
+  # -Wdev warnings. See `cmake --help-policy CMP0086`.
+  if(POLICY CMP0086)
+    cmake_policy(SET CMP0086 NEW)
+  endif()
+
+  find_package(SWIG COMPONENTS csharp d go javascript)
+  if(ENABLE_SWIG STREQUAL "AUTO")
+    if(SWIG_FOUND)
+      message(STATUS "setting -DENABLE_SWIG=ON")
+      set(ENABLE_SWIG ON)
+    else()
+      message(STATUS "setting -DENABLE_SWIG=OFF")
+      set(ENABLE_SWIG OFF)
+    endif()
+  elseif(NOT SWIG_FOUND)
+    message(FATAL_ERROR "-DENABLE_SWIG=ON and SWIG not found")
+  endif()
+endif()
+
+if(NOT ENABLE_SHARP STREQUAL "OFF")
+  # Opt in to new default naming conventions for C#. This silences -Wdev
+  # warnings. See `cmake --help-policy CMP0122`.
+  if(POLICY CMP0122)
+    cmake_policy(SET CMP0122 NEW)
+  endif()
+
+  if(ENABLE_SWIG AND SWIG_csharp_FOUND)
+    if(ENABLE_SHARP STREQUAL "AUTO")
+      message(STATUS "setting -DENABLE_SHARP=ON")
+      set(ENABLE_SHARP ON)
+    endif()
+  elseif(ENABLE_SHARP STREQUAL "ON")
+    message(FATAL_ERROR "-DENABLE_SWIG=ON must be set to use -DENABLE_SHARP=ON")
+  else()
+    message(STATUS "setting -DENABLE_SHARP=OFF")
+    set(ENABLE_SHARP OFF)
+  endif()
+endif()
+
+if(NOT ENABLE_D STREQUAL "OFF")
+  if(ENABLE_SWIG AND SWIG_d_FOUND)
+    if(ENABLE_D STREQUAL "AUTO")
+      message(STATUS "setting -DENABLE_D=ON")
+      set(ENABLE_D ON)
+    endif()
+  elseif(ENABLE_D STREQUAL "ON")
+    message(FATAL_ERROR "-DENABLE_SWIG=ON must be set to use -DENABLE_D=ON")
+  else()
+    message(STATUS "setting -DENABLE_D=OFF")
+    set(ENABLE_D OFF)
+  endif()
+endif()
+
+if(NOT ENABLE_GO STREQUAL "OFF")
+  if(ENABLE_SWIG AND SWIG_go_FOUND)
+    if(ENABLE_GO STREQUAL "AUTO")
+      message(STATUS "setting -DENABLE_GO=ON")
+      set(ENABLE_GO ON)
+    endif()
+  elseif(ENABLE_GO STREQUAL "ON")
+    message(FATAL_ERROR "-DENABLE_SWIG=ON must be set to use -DENABLE_GO=ON")
+  else()
+    message(STATUS "setting -DENABLE_GO=OFF")
+    set(ENABLE_GO OFF)
+  endif()
+endif()
+
+if(ENABLE_GO)
+  if(INTGOSIZE STREQUAL "AUTO")
+    math(EXPR INTGOSIZE "${CMAKE_SIZEOF_VOID_P} * 8")
+    message(STATUS "setting -DINTGOSIZE=${INTGOSIZE}")
+  endif()
+endif()
+
+if(NOT ENABLE_JAVASCRIPT STREQUAL "OFF")
+  find_package(JAVASCRIPTCORE)
+  if(ENABLE_SWIG AND SWIG_javascript_FOUND AND JAVASCRIPTCORE_FOUND)
+    if(ENABLE_JAVASCRIPT STREQUAL "AUTO")
+      message(STATUS "setting -DENABLE_JAVASCRIPT=ON")
+      set(ENABLE_JAVASCRIPT ON)
+    endif()
+  elseif(ENABLE_JAVASCRIPT STREQUAL "ON")
+    message(
+      FATAL_ERROR "-DENABLE_SWIG=ON must be set and JavaScriptCore must be \
+                   available to use -DENABLE_JAVASCRIPT=ON"
+    )
+  else()
+    message(STATUS "setting -DENABLE_JAVASCRIPT=OFF")
+    set(ENABLE_JAVASCRIPT OFF)
   endif()
 endif()
 
 if(UNIX)
-  # find_library(MATH_LIB m)
-  # link_libraries(${MATH_LIB})
+  # hpcc-js-wasm find_library(MATH_LIB m)
+  # hpcc-js-wasm link_libraries(${MATH_LIB})
 endif()
 
 if(WIN32)
   # Find Windows specific dependencies
 
   # Find DLLs on Windows
-  if(with_expat)
-    find_program(EXPAT_RUNTIME_LIBRARIES NAMES libexpat.dll expat.dll msys-expat-1.dll)
+  if(WITH_EXPAT)
+    find_program(EXPAT_RUNTIME_LIBRARIES
+                 NAMES libexpat.dll expat.dll msys-expat-1.dll)
   endif()
   if(CMAKE_CL_64)
     find_program(MSYS_RUNTIME_LIBRARIES NAMES msys-2.0.dll)
@@ -257,7 +391,8 @@ endif()
 
 # Set GRAPHVIZ_VERSION_BUILD to time of last commit, or to 0 if that fails.
 execute_process(
-  COMMAND           ${Python3_EXECUTABLE} gen_version.py --committer-date-graphviz
+  COMMAND           ${Python3_EXECUTABLE}
+                    gen_version.py --committer-date-graphviz
   WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
   RESULT_VARIABLE   gen_date_result
   OUTPUT_VARIABLE   GRAPHVIZ_VERSION_BUILD
@@ -280,10 +415,13 @@ string(REGEX REPLACE "[^.]*\\.[^.]*\\.(.*)$"
   ${GRAPHVIZ_VERSION_STRING})
 
 set(GRAPHVIZ_VERSION_FULL "${GRAPHVIZ_VERSION_STRING}")
-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/builddate.h "#define BUILDDATE \"${GRAPHVIZ_VERSION_BUILD}\"")
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/builddate.h
+     "#define BUILDDATE \"${GRAPHVIZ_VERSION_BUILD}\"")
 
-configure_file(graphviz_version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/graphviz_version.h @ONLY)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/graphviz_version.h DESTINATION ${HEADER_INSTALL_DIR})
+configure_file(graphviz_version.h.cmake
+               ${CMAKE_CURRENT_BINARY_DIR}/graphviz_version.h @ONLY)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/graphviz_version.h
+        DESTINATION ${HEADER_INSTALL_DIR})
 
 message(STATUS "Graphviz version: ${GRAPHVIZ_VERSION_FULL}")
 
@@ -300,14 +438,16 @@ configure_file(
   IMMEDIATE @ONLY)
 
 add_custom_target(uninstall
-  COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
+  COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake
+  COMMENT "Uninstall Graphviz"
+)
 
 # =========================== Compiler configuration ===========================
 
 set(CMAKE_C_STANDARD 99)
 set(CMAKE_C_STANDARD_REQUIRED ON)
 
-set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
@@ -335,10 +475,28 @@ else()
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra")
 endif()
 include(CheckCCompilerFlag)
+check_c_compiler_flag(-Wcast-function-type HAVE_C_WCAST_FUNCTION_TYPE)
+if(HAVE_C_WCAST_FUNCTION_TYPE)
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wcast-function-type")
+endif()
 check_c_compiler_flag(-Wformat-overflow=2 HAVE_C_WFORMAT_OVERFLOW_2)
 if(HAVE_C_WFORMAT_OVERFLOW_2)
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wformat-overflow=2")
 endif()
+check_c_compiler_flag(-Wimplicit-fallthrough HAVE_C_WIMPLICIT_FALLTHROUGH)
+if(HAVE_C_WIMPLICIT_FALLTHROUGH)
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wimplicit-fallthrough")
+endif()
+check_c_compiler_flag(
+  -Wmissing-field-initializers HAVE_C_WMISSING_FIELD_INITIALIZERS
+)
+if(HAVE_C_WMISSING_FIELD_INITIALIZERS)
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wmissing-field-initializers")
+endif()
+check_c_compiler_flag(-Wmissing-prototypes HAVE_C_WMISSING_PROTOTYPES)
+if(HAVE_C_WMISSING_PROTOTYPES)
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wmissing-prototypes")
+endif()
 check_c_compiler_flag(-Wshadow HAVE_C_WSHADOW)
 if(HAVE_C_WSHADOW)
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wshadow")
@@ -347,6 +505,10 @@ check_c_compiler_flag(-Wundef HAVE_C_WUNDEF)
 if(HAVE_C_WUNDEF)
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wundef")
 endif()
+include(CheckCXXCompilerFlag)
+check_cxx_compiler_flag(-Wsign-compare HAVE_CXX_WSIGN_COMPARE)
+check_cxx_compiler_flag(-Wunused-function HAVE_CXX_WUNUSED_FUNCTION)
+check_cxx_compiler_flag(-Wunused-parameter HAVE_CXX_WUNUSED_PARAMETER)
 
 if(use_coverage)
   add_compile_options("-coverage")
@@ -362,15 +524,18 @@ include(CPack)
 include(CTest)
 
 # ======================= Specify subdirectories to build ======================
-# add_subdirectory(contrib/diffimg)
-# add_subdirectory(contrib/prune)
-# add_subdirectory(graphs)
+# hpcc-js-wasm add_subdirectory(contrib/diffimg)
+# hpcc-js-wasm add_subdirectory(contrib/prune)
+# hpcc-js-wasm add_subdirectory(graphs)
 add_subdirectory(lib)
 add_subdirectory(plugin)
-# add_subdirectory(cmd)
-# add_subdirectory(share)
+if(GRAPHVIZ_CLI)
+  # hpcc-js-wasm add_subdirectory(cmd)
+endif()
+# hpcc-js-wasm add_subdirectory(share)
+add_subdirectory(tclpkg)
 if(with_cxx_tests)
-  # add_subdirectory(tests)
+  # hpcc-js-wasm add_subdirectory(tests)
 endif()
 
 #  === hpcc-js-wasm  ===
@@ -389,22 +554,32 @@ install(
   ARCHIVE DESTINATION ${LIBRARY_INSTALL_DIR}
 )
 #  === hpcc-js-wasm  ===
-
 MATH(EXPR GRAPHVIZ_PLUGIN_VERSION "${GRAPHVIZ_PLUGIN_VERSION}+1")
 set(GVPLUGIN_VERSION "${GRAPHVIZ_PLUGIN_VERSION}")
 set(VERSION "${GRAPHVIZ_VERSION_STRING}")
-set(prefix "${CMAKE_INSTALL_PREFIX}")
-set(exec_prefix "${CMAKE_INSTALL_PREFIX}")
+set(prefix "${CMAKE_INSTALL_PREFIX}") # cmake-lint: disable=C0103
+set(exec_prefix "${CMAKE_INSTALL_PREFIX}") # cmake-lint: disable=C0103
 set(PACKAGE "graphviz")
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lib/cdt/libcdt.pc.in ${CMAKE_CURRENT_BINARY_DIR}/libcdt.pc @ONLY)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lib/cgraph/libcgraph.pc.in ${CMAKE_CURRENT_BINARY_DIR}/libcgraph.pc @ONLY)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lib/gvc/libgvc.pc.in ${CMAKE_CURRENT_BINARY_DIR}/libgvc.pc @ONLY)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lib/gvpr/libgvpr.pc.in ${CMAKE_CURRENT_BINARY_DIR}/libgvpr.pc @ONLY)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lib/pathplan/libpathplan.pc.in ${CMAKE_CURRENT_BINARY_DIR}/libpathplan.pc @ONLY)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lib/xdot/libxdot.pc.in ${CMAKE_CURRENT_BINARY_DIR}/libxdot.pc @ONLY)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lib/cdt/libcdt.pc.in
+               ${CMAKE_CURRENT_BINARY_DIR}/libcdt.pc @ONLY)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lib/cgraph/libcgraph.pc.in
+               ${CMAKE_CURRENT_BINARY_DIR}/libcgraph.pc @ONLY)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lib/gvc/libgvc.pc.in
+               ${CMAKE_CURRENT_BINARY_DIR}/libgvc.pc @ONLY)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lib/gvpr/libgvpr.pc.in
+               ${CMAKE_CURRENT_BINARY_DIR}/libgvpr.pc @ONLY)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lib/pathplan/libpathplan.pc.in
+               ${CMAKE_CURRENT_BINARY_DIR}/libpathplan.pc @ONLY)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lib/xdot/libxdot.pc.in
+               ${CMAKE_CURRENT_BINARY_DIR}/libxdot.pc @ONLY)
 file(GLOB pcfiles "${CMAKE_CURRENT_BINARY_DIR}/*.pc")
 foreach(file "${pcfiles}")
-	install(FILES ${file} DESTINATION "${PKGCONFIG_DIR}")
+  install(FILES ${file} DESTINATION "${PKGCONFIG_DIR}")
 endforeach(file)
 
-feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
+feature_summary(
+  WHAT
+  ALL
+  INCLUDE_QUIET_PACKAGES
+  FATAL_ON_MISSING_REQUIRED_PACKAGES
+)
diff --git a/vcpkg-overlays/graphviz/portfile.cmake b/vcpkg-overlays/graphviz/portfile.cmake
index 4d2a1180..7ae6408e 100644
--- a/vcpkg-overlays/graphviz/portfile.cmake
+++ b/vcpkg-overlays/graphviz/portfile.cmake
@@ -13,10 +13,12 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
-        -Denable_ltdl=OFF
-        -Dwith_gvedit=OFF
-        -Dwith_smyrna=OFF
-        -Dwith_zlib=OFF
+        -DENABLE_LTDL=OFF
+        -DWITH_EXPAT=ON
+        -Dwith_expat=ON
+        -DWITH_GVEDIT=OFF
+        -WITH_SMYRNA=OFF
+        -DWITH_ZLIB=OFF
         -Duse_win_pre_inst_libs=OFF
         -DBUILD_SHARED_LIBS=OFF
 )