sicmutils · sritchie · Jan 22, 2023 · Jan 21, 2023 · Jan 21, 2023 · Jan 22, 2023
diff --git a/.clj-kondo/config.edn b/.clj-kondo/config.edn
@@ -7,9 +7,6 @@
 
  :output {:exclude-files ["src/data_readers.clj"]}
 
- :hooks
- {:analyze-call {potemkin/import-def
-                 hooks.sicmutils.util.def/import-def}}
  :linters
  {:unsorted-required-namespaces {:level :warning}
   :redundant-fn-wrapper {:level :warning}

diff --git a/.github/workflows/cljs.yaml b/.github/workflows/cljs.yaml
@@ -36,7 +36,7 @@ jobs:
       - name: Install dependencies
         run: npm install
 
-      - name: Clojurescript tests
-        run: npm run-script test
+      - name: ClojureScript tests
+        run: npm run test
         env:
           NODE_OPTIONS: --max-old-space-size=8192
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,22 @@
 
 ## unreleased
 
+- #532:
+
+  - Removes the `potemkin` dependency by importing only what we need directly
+    into `sicmutils.util.def`. This makes sense since our versions add a `fork`
+    call so that they work for ClojureScript as well.
+
+  - Moves all `examples` into the tests so that we don't ship them with the
+    library. These will eventually be converted to Clerk notebooks.
+
+  - Removes the `hiccup` dependency.
+
+  - Upgrades `test.chuck` and removes all `:include-macros true` calls for that
+    library. Only `same/ish` requires them now!
+
+  - Capitalizes the "Script" in ClojureScript everywhere it appears.
+
 - #531:
 
   - Fixes a typo in one of the rules in
@@ -702,7 +718,7 @@
     `sicmutils.algebra.fold/kbk-n` in the SCI environment (you'll need to turn
     on access to `js/Math` or `java.lang.Math`).
 
-  - Fixed a type inference warning in Clojurescript in `sicmutils.complex`.
+  - Fixed a type inference warning in ClojureScript in `sicmutils.complex`.
 
   - Added support for `sicmutils.util.def` and its `fork` macro to the default
     SCI environment provided by SICMUtils. Helpful for macro-writing!
@@ -873,7 +889,7 @@
     permutation relative to its sorted version.
 
   - `sicmutils.complex/complex` can now take a single string argument in both
-    Clojure and Clojurescript.
+    Clojure and ClojureScript.
 
   - Expands the complex number literal parser to take these forms, in addition
     to the previously-supported string argument:
@@ -914,7 +930,7 @@
   - Converts many of the `sicmutils.fdg` test namespaces to use the new
     `define-coordinates` macro, making for a presentation closer to the book's.
 
-  - Fixes a Clojurescript warning in `sicmutils.util` warning due to
+  - Fixes a ClojureScript warning in `sicmutils.util` warning due to
     redefinition of `clojure.core/uuid`
 
 - #386:
@@ -1029,7 +1045,7 @@ The new `cljsjs` dependency has code compatible with advanced compilation.
 
 ## 0.19.1
 
-This is an incremental bugfix release to get Clojurescript advanced compilation
+This is an incremental bugfix release to get ClojureScript advanced compilation
 into shape.
 
 - #371:
@@ -1158,7 +1174,7 @@ for the detailed notes, and enjoy version 0.19.0!
 
   - `v/kind` now works for `sorted-map` instances.
 
-  - GCD in Clojurescript is now fast and efficient between all combinations of
+  - GCD in ClojureScript is now fast and efficient between all combinations of
     `js/BigInt` and `js/Number`, and in Clojure between all combinations of
     `clojure.lang.BigInt`, `BigInteger`, `Long` and `Integer`.
 
@@ -1328,13 +1344,13 @@ for the detailed notes, and enjoy version 0.19.0!
     `sicmutils.abstract.function`, making the Bianchi identity benchmarks run
     40% faster.
 
-  - In Clojurescript, `Range` instances now implement `sicmutils.value.Value`
+  - In ClojureScript, `Range` instances now implement `sicmutils.value.Value`
     and `sicmutils.differential.IPerturbed`, allowing them to be returned from
     derivative-taking functions
 
   - Major, unexpected performance improvement - it turns out
     `sicmutils.value/number?` was quite slow in Clojure (less so in
-    Clojurescript). Changing this function from an `isa?` check to a series of
+    ClojureScript). Changing this function from an `isa?` check to a series of
     explicit `instance?` checks cut the build time in half. This makes the
     numeric tower less extensible... but it wasn't terribly extensible to start
     with, and needs some attention to make it so. A big win!
@@ -1415,8 +1431,8 @@ for the detailed notes, and enjoy version 0.19.0!
 
 - #358:
 
-  - Converts the Clojurescript test build and REPL command from `lein-cljsbuild`
-    to `shadow-cljs`. This enables more formerly-slow tests for Clojurescript;
+  - Converts the ClojureScript test build and REPL command from `lein-cljsbuild`
+    to `shadow-cljs`. This enables more formerly-slow tests for ClojureScript;
     these are now fast enough to run, thanks to the performance improvements
     described below.
 
@@ -1435,7 +1451,7 @@ for the detailed notes, and enjoy version 0.19.0!
     failure.
 
   - fixed a heisenbug in `sicmutils.expression.analyze/make-analyzer` where, in
-    Clojurescript, using expressions containing a `js/BigInt` as a hashmap key
+    ClojureScript, using expressions containing a `js/BigInt` as a hashmap key
     caused certain simplifications to fail. (This is vague, but the bug was
     _really_ subtle.) The fix was to make sure we freeze keys in the symbol
     cache. This is now noted in the function body.
@@ -1849,12 +1865,12 @@ Enjoy the release!
       this operation
 
 - #309: `sicmutils.util/bigint` is aliased as `sicmutils.env/bigint` in
-  Clojurescript only. This is available natively in Clojure.
+  ClojureScript only. This is available natively in Clojure.
 
 - #308 and #310 add:
 
   - `sicmutils.ratio/{numerator,denominator,ratio?,rationalize}` and are now
-    aliased into `sicmutils.env` in Clojurescript. These are available natively
+    aliased into `sicmutils.env` in ClojureScript. These are available natively
     in Clojure. `sicmutils.complex/complex?` is aliased into `sicmutils.env` for
     both platforms.
 
@@ -2163,7 +2179,7 @@ Detailed release notes:
 - #279: Function aliases in `sicmutils.env` now properly mirror over docstrings
   and other `Var` metadata, thanks to
   [Potemkin](https://github.com/clj-commons/potemkin)'s `import-def`. This
-  doesn't quite work in Clojurescript since we can't use `resolve` inside of a
+  doesn't quite work in ClojureScript since we can't use `resolve` inside of a
   macro (special form!).
 
 - Add a proper namespace to `demo.clj`, to make it easier to use outside of
@@ -2189,7 +2205,7 @@ Detailed release notes:
 ### Behavior changes, bug fixes
 
 - In JVM Clojure (as of #298), `sicmutils.expression.compile` defaults to
-  `clojure.core/eval` to compile functions, while Clojurescript defaults to
+  `clojure.core/eval` to compile functions, while ClojureScript defaults to
   [SCI](https://github.com/borkdude/sci). The performance is much faster for
   numerical routines and worth the slightly different default behavior.
 
@@ -2243,7 +2259,7 @@ like `Operator`, `Series`, `PowerSeries` and `Structure`. The system is now
 fully extensible, so if you want to differentiate functions that return custom
 records or Java collections, it's now no problem.
 
-SICMUtils can now differentiate functions in Clojurescript that use comparison
+SICMUtils can now differentiate functions in ClojureScript that use comparison
 operations like `<`, `=`, `<=` and friends. Clojure can't quite do this yet, but
 you can differentiate through `v/compare` and `v/=` calls.
 
@@ -2408,9 +2424,9 @@ On to the detailed release notes:
 
 - new `sicmutils.value/compare` function exposed in `sicmutils.env` returns a
   valid comparison bit between native numbers and numbers wrapped in
-  `Differential` or `Expression` in both JVM Clojure and Clojurescript (#236).
+  `Differential` or `Expression` in both JVM Clojure and ClojureScript (#236).
   The behavior matches `clojure.core/compare` for all reals on the JVM; it
-  doesn't in Clojurescript because native `compare` can't handle
+  doesn't in ClojureScript because native `compare` can't handle
   `goog.math.{Long,Integer}` or `js/BigInt`.
 
 ### Operator
@@ -2584,7 +2600,7 @@ On to the detailed release notes:
 
 ### Miscellaneous
 
-- expose `bootstrap-repl!` to Clojurescript, so that this is available in
+- expose `bootstrap-repl!` to ClojureScript, so that this is available in
   self-hosted CLJS (https://github.com/sicmutils/sicmutils/pull/157)
 
 - modified `infix.cljc` to wrap forms in `displaystyle` and add proper carriage
@@ -2626,12 +2642,12 @@ On to the detailed release notes:
 - added `sicmutils.value/sqrt-machine-epsilon`
   ([#170](https://github.com/sicmutils/sicmutils/pull/170))
 
-- fixed issues in `function.cljc` and `operator.cljc` where the Clojurescript
+- fixed issues in `function.cljc` and `operator.cljc` where the ClojureScript
   `IFn` `-invoke` arguments shadowed either the `this` operator, or some
   parameter name in the deftype
   ([#169](https://github.com/sicmutils/sicmutils/pull/169))
 
-- `g/sqrt` now maintains precision with Clojurescript's rational numbers.
+- `g/sqrt` now maintains precision with ClojureScript's rational numbers.
   `(g/sqrt #sicm/ratio 9/4)` for example returns `#sicm/ratio 3/2`.
   ([#168](https://github.com/sicmutils/sicmutils/pull/168))
 
@@ -2964,7 +2980,7 @@ I can now make some comments that clear up my former misunderstandings:
 
 
 - If you want to compare literal numbers and an expression like
-  `(an/literal-number 12)`, use `v/=`. In Clojurescript, this will work with
+  `(an/literal-number 12)`, use `v/=`. In ClojureScript, this will work with
   the built in `=` as well, since equality is implemented with a protocol that
   we can extend. For example:
 
@@ -3075,12 +3091,12 @@ the three).
 
 ## 0.13.0
 
-The main announcement for this release is _Clojurescript Support!_. Implementing
+The main announcement for this release is _ClojureScript Support!_. Implementing
 this resulted in a few upgrades along the way:
 
 - more powerful numerics, specifically `definite-integral` and native
   minimization routines
-- a generic numeric tower for Clojurescript
+- a generic numeric tower for ClojureScript
 - Many more tests! The test coverage was great before, and it's stayed high as
   we've added new implementations.
 - added explicit code coverage metrics via Codecov: [![Codecov branch](https://img.shields.io/codecov/c/github/littleredcomputer/sicmutils/master.svg?maxAge=3600)](https://codecov.io/githu
B41A
b/littleredcomputer/sicmutils)
@@ -3100,13 +3116,13 @@ Here are more explicit details on the release.
   but expands each term in order `n`.
 - many, many more tests!
 
-### Clojurescript Support
+### ClojureScript Support
 
-Full conversion of SICMUtils to Clojurescript. All functionality from v0.12.1
-now works in both Clojure and Clojurescript!
+Full conversion of SICMUtils to ClojureScript. All functionality from v0.12.1
+now works in both Clojure and ClojureScript!
 
 Most of the conversion was straightforward. The major missing piece was a
-numeric tower implementation for Clojurescript (complex numbers, ratios) that
+numeric tower implementation for ClojureScript (complex numbers, ratios) that
 bring it up to parity with Clojure:
 
 - Add the `bigfraction` implementation from
@@ -3176,12 +3192,12 @@ provides 3 new data reader literals:
 
 Use this with a ratio literal, like `#sicm/ratio 1/2`, or with a string like
 `#sicm/ratio "1/4"`. If the denominator is `1` this literal will return a
-`js/BigInt` in Clojurescript, or a Long in Clojure.
+`js/BigInt` in ClojureScript, or a Long in Clojure.
 
 - `#sicm/bigint`
 
 Use with a number literal, like, `#sicm/bigint 10`, or a string like
-`#sicm/bigint "10000012"` to generate a `js/BigInt` in Clojurescript, or a
+`#sicm/bigint "10000012"` to generate a `js/BigInt` in ClojureScript, or a
 `clojure.lang.BigInt` in Clojure.
 
 - `#sicm/complex`

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
@@ -3,4 +3,4 @@ following for their help:
 
 @alexgian: early testing, patience, and excellent advice!
 @kloimhardt: SICM chapter 1 example notebook
-@sritchie: Clojurescript port, functional numerical implementations
+@sritchie: ClojureScript port, functional numerical implementations
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 A Clojure(script) implementation of the
 [scmutils](https://groups.csail.mit.edu/mac/users/gjs/6946/refman.txt) system
-for math and physics investigations in the Clojure and Clojurescript languages.
+for math and physics investigations in the Clojure and ClojureScript languages.
 SICMUtils provides facilities for
 
 - [symbolic
@@ -75,7 +75,7 @@ Math works as expected (see
 for the full menu of operations), but notice that the numeric tower includes
 [complex
 numbers](https://cljdoc.org/d/sicmutils/sicmutils/CURRENT/doc/data-types/complex),
-and proper ratios in Clojurescript:
+and proper ratios in ClojureScript:
 
 ```clojure
 (- (* 7 (/ 1 2)) 2)

diff --git a/deps.edn b/deps.edn
@@ -6,10 +6,8 @@
   org.clojure/math.numeric-tower {:mvn/version "0.0.4"}
   com.taoensso/timbre {:mvn/version "6.0.4"}
   dm3/stopwatch {:mvn/version "0.1.1" :exclusions [org.clojure/clojurescript]}
-  hiccup/hiccup {:mvn/version "1.0.5"}
   org.apache.commons/commons-math3 {:mvn/version "3.6.1"}
-  org.babashka/sci {:mvn/version "0.6.37"}
-  potemkin/potemkin {:mvn/version "0.4.5"}}
+  org.babashka/sci {:mvn/version "0.6.37"}}
 
  :aliases
  {:dev {:extra-paths ["dev"]
@@ -35,13 +33,14 @@
   ;; dependencies needed to run the tests.
   {:extra-paths ["test"]
    :extra-deps
-   {io.github.cognitect-labs/test-runner
+   {com.gfredericks/test.chuck {:mvn/version "0.2.14"}
+    io.github.cognitect-labs/test-runner
     {:git/tag "v0.5.0"
      :git/sha "b3fd0d2"}
     io.github.nextjournal/clerk
     {:git/sha "d08c26043efe19a92fe33dd9eb4499e304e4cff7"}
     org.clojure/test.check {:mvn/version "1.1.1"}
-    com.gfredericks/test.chuck {:mvn/version "0.2.13"}
+    hiccup/hiccup {:mvn/version "1.0.5"}
     same/ish {:mvn/version "0.1.4"}}}
 
   :build

diff --git a/doc/basics/clojurescript.adoc b/doc/basics/clojurescript.adoc
@@ -1,3 +1,3 @@
-= Clojurescript
+= ClojureScript
 
 More info soon.
diff --git a/doc/basics/using_sicmutils.adoc b/doc/basics/using_sicmutils.adoc
@@ -50,7 +50,7 @@ and hitting ``<space>`` in any block, and evaluating the following form:
 (nextjournal.env/load! :sicmutils)
 ----
 
-Any subsequent Clojurescript block will have every function in
+Any subsequent ClojureScript block will have every function in
 https://cljdoc.org/d/sicmutils/sicmutils/CURRENT/api/sicmutils.env[``sicmutils.env``]
 available.
 

diff --git a/doc/cljdoc.edn b/doc/cljdoc.edn
@@ -4,7 +4,7 @@
   ["Basics" {}
    ["How to Use SICMUtils" {:file "doc/basics/using_sicmutils.adoc"}]
    ["Generics" {:file "doc/basics/generics.adoc"}]
-   ["Clojurescript" {:file "doc/basics/clojurescript.adoc"}]
+   ["ClojureScript" {:file "doc/basics/clojurescript.adoc"}]
    ["Data Readers" {:file "doc/basics/data_readers.adoc"}]]
   ["Data Types" {}
    ["Number" {:file "doc/types/number.adoc"}]

diff --git a/doc/contributing.adoc b/doc/contributing.adoc
@@ -7,7 +7,7 @@ Here's a short overview. More info coming soon!
 === Developing in SICMUtils
 
 To run all tests in Clojure, you'll need to install the
-https://clojure.org/guides/install_clojure[Clojure CLI tool]. The Clojurescript
+https://clojure.org/guides/install_clojure[Clojure CLI tool]. The ClojureScript
 tests require https://nodejs.org/en/[Node.js]. If you're on a Mac, install
 https://brew.sh[Homebrew]:
 
@@ -47,9 +47,9 @@ To run the full Clojure test suite:
 clojure -P -M:test:runner
 ----
 
-=== Clojurescript Tests
+=== ClojureScript Tests
 
-We run the Clojurescript test suite and check for advanced compilation warnings
+We run the ClojureScript test suite and check for advanced compilation warnings
 using [shadow-cljs].
 
 In the ``sicmutils`` directory, run
@@ -59,12 +59,12 @@ In the ``sicmutils`` directory, run
 npm install
 ----
 
-to run the full Clojurescript test suite, call the following command (and make
+to run the full ClojureScript test suite, call the following command (and make
 sure to note any warnings):
 
 [source, bash]
 ----
-npm run-script test
+npm run test
 ----
 
 The following command will start a process that recompiles the project when any

diff --git a/resources/clj-kondo.exports/sicmutils/sicmutils/config.edn b/resources/clj-kondo.exports/sicmutils/sicmutils/config.edn
@@ -46,6 +46,7 @@
    hooks.sicmutils.abstract.function/with-literal-functions
 
    sicmutils.util.def/import-def hooks.sicmutils.util.def/import-def
+   sicmutils.util.def/import-macro hooks.sicmutils.util.def/import-def
 
    pattern.rule/consequence hooks.pattern.rule/consequence
    pattern.rule/pattern hooks.pattern.rule/pattern

diff --git a/src/pattern/rule.cljc b/src/pattern/rule.cljc
@@ -5,13 +5,11 @@
   matcher combinators declared in [[pattern.match]], along with a series of
   combinators for building advanced term-rewriting systems."
   (:refer-clojure :exclude [replace while])
-  (:require #?(:clj [potemkin :refer [import-def]])
-            [pattern.consequence :as c]
+  (:require [pattern.consequence :as c]
             [pattern.match :as m]
             [pattern.syntax :as ps]
             [sicmutils.util :as u]
-            #?(:cljs
-               [sicmutils.util.def :refer [import-def]]))
+            [sicmutils.util.def :refer [import-def]])
   #?(:cljs
      (:require-macros [pattern.rule])))