Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dev/cursive_repl_commands.clj
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
[clay-fn-name & args]
;; The tool needs to be required, and invoked with appropriate arguments.
;; `require` is fully qualified so it will work from uninitialized namespaces.
(str "(do (clojure.core/require '[scicloj.clay.v2.snippets])" \newline
" (scicloj.clay.v2.snippets/" clay-fn-name (when args " ") (str/join " " args) "))" \newline))
(str "(do (clojure.core/require '[scicloj.clay.v2.old.snippets])" \newline
" (scicloj.clay.v2.old.snippets/" clay-fn-name (when args " ") (str/join " " args) "))" \newline))

(def file "\"~file-path\"")
(def form-before-caret "(quote ~form-before-caret)")
Expand Down
2 changes: 1 addition & 1 deletion dev/profile.clj
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@

(defn -main []
(println "Profiling...")
(prof/profile (require '[scicloj.clay.v2.api]))
(prof/profile (require '[scicloj.clay.v2.old.api]))
(println "Done. See /tmp/clj-async-profiler/results/"))
2 changes: 1 addition & 1 deletion examples/example-project/notebooks/example1.clj
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
;; Instead of using your editor setup and keybindings,
;; you can also use the Clay API directly:

(require '[scicloj.clay.v2.api :as clay])
(require '[scicloj.clay.v2.old.api :as clay])

;; Show the whole namespace
(clay/make! {:source-path "notebooks/example1.clj"})
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion notebooks/chapter.clj → notebooks/old/chapter.clj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(ns chapter)
(ns old.chapter)

;; # A Chapter

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
(ns clay-book.test-generation
(:require [scicloj.kindly.v4.api :as kindly]
[scicloj.kindly.v4.kind :as kind]
[scicloj.clay.v2.api :as clay]
[scicloj.clay.v2.old.api :as clay]
[clojure.string :as str]))

^:kindly/hide-code
Expand Down Expand Up @@ -116,7 +116,7 @@
;; If all tests are simple, it makes the whole test namespace much simpler.

;; The testing mode can be specified in the `:kind/options` of the project-level
;; configuration or the namespace level configuration.
;; configuration or the namespace level configuration.
;; It can also be specified for a specific test. We'll see that in the examples
;; below.

Expand Down Expand Up @@ -153,4 +153,3 @@
;; For a detailed example using this mechanism,
;; see [the source](https://github.com/scicloj/clojisr/blob/master/notebooks/clojisr/v1/tutorials/main.clj)
;; of the [ClojisR tutorial](https://scicloj.github.io/clojisr/clojisr.v1.tutorials.main.html).

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
;; DRAFT

(ns compute-examples
(ns old.compute-examples
(:require [scicloj.kindly.v4.kind :as kind]
[clojure.java.io :as io]))

Expand Down Expand Up @@ -48,7 +48,7 @@
{:type "button" :value "Click me!"
:on-click (fn []
(kindly-compute
{:func 'compute-examples/add
{:func 'old.compute-examples/add
:args [@*a1 20]}
(fn [response]
(reset! *a1 response))))}]])))])
Expand Down Expand Up @@ -95,7 +95,7 @@
[:input {:type "button" :value "Click to calculate click and open rate"
:on-click (fn []
(kindly-compute
{:func 'compute-examples/calc-click-and-open-rate
{:func 'old.compute-examples/calc-click-and-open-rate
:args [email-data]}
(fn [response]
(reset! *rates response))))}]])))]])
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion notebooks/demo.clj → notebooks/old/demo.clj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(ns demo)
(ns old.demo)

;; This file merely shows how to use a Clojure file to write docs in Clay,
;; with no additional dependencies required.
Expand Down
4 changes: 2 additions & 2 deletions notebooks/dev.clj → notebooks/old/dev.clj
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
(ns dev
(:require [scicloj.clay.v2.api :as clay]))
(ns old.dev
(:require [scicloj.clay.v2.old.api :as clay]))

(clay/make! {:format [:quarto :html]
:base-source-path "notebooks"
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
(ns gfm-and-cljdoc
(:require [scicloj.kindly.v4.kind :as kind]
[scicloj.clay.v2.config :as config]))
[scicloj.clay.v2.old.config :as config]))

;; This namespace demonstrates the creation of an article intended for [cljdoc](https://cljdoc.org/)

Expand Down Expand Up @@ -121,7 +121,7 @@
;; To illustrate this,
;; let's look at a little known feature of clay, checking the default configuration:

(require '[scicloj.clay.v2.config :as config])
(require '[scicloj.clay.v2.old.config :as config])
(config/default-config)

;; Clay draws on config from several places, including a project level clay.edn file if present.
Expand All @@ -134,7 +134,7 @@
;; How do you build GFM with Clay?

(comment
(require '[scicloj.clay.v2.api :as clay])
(require '[scicloj.clay.v2.old.api :as clay])
(clay/make! {:base-source-path "notebooks"
:source-path "gfm_and_cljdoc.clj"
:base-target-path "docs"
Expand Down
File renamed without changes
22 changes: 11 additions & 11 deletions notebooks/index.clj → notebooks/old/index.clj
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
;; # Clay

^:kindly/hide-code
(ns index
(ns old.index
(:require [clojure.java.io :as io]
[clojure.edn :as edn]
[scicloj.kindly.v4.kind :as kind]
[tablecloth.api :as tc]
[scicloj.kindly.v4.api :as kindly]
[scicloj.clay.v2.api :as clay]))
[scicloj.clay.v2.old.api :as clay]))

^{:kindly/hide-code true
:kindly/kind :kind/hiccup}
Expand Down Expand Up @@ -295,15 +295,15 @@
;; This notebook is created by [a Clojure namespace](https://github.com/scicloj/clay/blob/main/notebooks/index.clj).
;; Here is the namespace definition and a few examples of what such a namespace may contain.

(ns index
(ns old.index
(:require
[scicloj.kindly.v4.api :as kindly]
[scicloj.kindly.v4.kind :as kind]
[scicloj.clay.v2.quarto.highlight-styles :as quarto.highlight-styles]
[scicloj.clay.v2.quarto.themes :as quarto.themes]
[scicloj.clay.v2.old.quarto.highlight-styles :as quarto.highlight-styles]
[scicloj.clay.v2.old.quarto.themes :as quarto.themes]
[scicloj.metamorph.ml.toydata :as toydata]
[scicloj.tableplot.v1.hanami :as hanami]
[scicloj.clay.v2.main]
[scicloj.clay.v2.old.main]
[tablecloth.api :as tc]
[clojure.string :as str]))

Expand Down Expand Up @@ -336,7 +336,7 @@

;; ## API

(require '[scicloj.clay.v2.api :as clay])
(require '[scicloj.clay.v2.old.api :as clay])

;; The entry point of the Clay API is the `scicloj.clay.v2.api/make!` function.
;; Here are some usage examples.
Expand Down Expand Up @@ -542,8 +542,8 @@
;; then, using Quarto, render that file as HTML
;; and show it at the browser:
(comment
(require '[scicloj.clay.v2.quarto.highlight-styles :as quarto.highlight-styles]
'[scicloj.clay.v2.quarto.themes :as quarto.themes])
(require '[scicloj.clay.v2.old.quarto.highlight-styles :as quarto.highlight-styles]
'[scicloj.clay.v2.old.quarto.themes :as quarto.themes])
(clay/make! {:format [:quarto :html]
:source-path "notebooks/index.clj"
:quarto {:highlight-style quarto.highlight-styles/nord
Expand Down Expand Up @@ -834,7 +834,7 @@
;; Configuration is discovered as metadata under the `:clay` key on the namespace form:

^{:clay {:quarto {:myfrontmatterkey "myfrontmattervalue"}}}
(ns index)
(ns old.index)

;; * the clay metadata is on the form rather than the var itself.
;; * the `:quarto` configuration will be placed in the front matter for markdown output.
Expand Down Expand Up @@ -1159,7 +1159,7 @@ L.tileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png', {
;; Clay offers quite a few such predefined builtin dependencies:

^:kindly/hide-code
(sort (keys scicloj.clay.v2.page/special-lib-resources))
(sort (keys scicloj.clay.v2.old.page/special-lib-resources))

;; However, it is possible to also specify CDN links for JS & CSS dependencies explicitly. For example:

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
(:require [scicloj.kindly.v4.kind :as kind]))

(comment
(require '[scicloj.clay.v2.api :as clay])
(require '[scicloj.clay.v2.old.api :as clay])
(clay/make! {:source-path "notebooks/try_live_reload.clj"
:live-reload true}))

Expand Down
36 changes: 18 additions & 18 deletions resources/calva.exports/config.edn
Original file line number Diff line number Diff line change
@@ -1,42 +1,42 @@
{:customREPLCommandSnippets
[{:name "Clay make file"
:key "n"
:snippet (do (clojure.core/require '[scicloj.clay.v2.snippets])
(scicloj.clay.v2.snippets/make-ns-html!
:snippet (do (clojure.core/require '[scicloj.clay.v2.old.snippets])
(scicloj.clay.v2.old.snippets/make-ns-html!
"$file" {:ide :calva}))}
{:name "Clay make file Quarto"
:key "q"
:snippet (do (clojure.core/require '[scicloj.clay.v2.snippets])
(scicloj.clay.v2.snippets/make-ns-quarto-html!
:snippet (do (clojure.core/require '[scicloj.clay.v2.old.snippets])
(scicloj.clay.v2.old.snippets/make-ns-quarto-html!
"$file" {:ide :calva}))}
{:name "Clay make file reveal.js"
:key "r"
:snippet (do (clojure.core/require '[scicloj.clay.v2.snippets])
(scicloj.clay.v2.snippets/make-ns-quarto-revealjs!
:snippet (do (clojure.core/require '[scicloj.clay.v2.old.snippets])
(scicloj.clay.v2.old.snippets/make-ns-quarto-revealjs!
"$file" {:ide :calva}))}
{:name "Clay make current form"
:key ","
:snippet (do (clojure.core/require '[scicloj.clay.v2.snippets])
(scicloj.clay.v2.snippets/make-form-html!
:snippet (do (clojure.core/require '[scicloj.clay.v2.old.snippets])
(scicloj.clay.v2.old.snippets/make-form-html!
(quote $current-form) "$file" {:ide :calva}))}
{:name "Clay make top level form"
:key "."
:snippet (do (clojure.core/require '[scicloj.clay.v2.snippets])
(scicloj.clay.v2.snippets/make-form-html!
:snippet (do (clojure.core/require '[scicloj.clay.v2.old.snippets])
(scicloj.clay.v2.old.snippets/make-form-html!
(quote $top-level-form) "$file" {:ide :calva}))}
{:name "Clay make current form Quarto"
:snippet (do (clojure.core/require '[scicloj.clay.v2.snippets])
(scicloj.clay.v2.snippets/make-form-quarto-html!
:snippet (do (clojure.core/require '[scicloj.clay.v2.old.snippets])
(scicloj.clay.v2.old.snippets/make-form-quarto-html!
(quote $current-form) "$file" {:ide :calva}))}
{:name "Clay make top level form Quarto"
:snippet (do (clojure.core/require '[scicloj.clay.v2.snippets])
(scicloj.clay.v2.snippets/make-form-quarto-html!
:snippet (do (clojure.core/require '[scicloj.clay.v2.old.snippets])
(scicloj.clay.v2.old.snippets/make-form-quarto-html!
(quote $top-level-form) "$file" {:ide :calva}))}
{:name "Clay browse"
:key "b"
:snippet (do (clojure.core/require '[scicloj.clay.v2.snippets])
(scicloj.clay.v2.snippets/browse!))}
:snippet (do (clojure.core/require '[scicloj.clay.v2.old.snippets])
(scicloj.clay.v2.old.snippets/browse!))}
{:name "Clay watch"
:key "w"
:snippet (do (clojure.core/require '[scicloj.clay.v2.snippets])
(scicloj.clay.v2.snippets/watch! {:ide :calva}))}]}
:snippet (do (clojure.core/require '[scicloj.clay.v2.old.snippets])
(scicloj.clay.v2.old.snippets/watch! {:ide :calva}))}]}
12 changes: 6 additions & 6 deletions src/scicloj/clay/v2/api.clj → src/scicloj/clay/v2/old/api.clj
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
(ns scicloj.clay.v2.api)
(ns scicloj.clay.v2.old.api)
;; It can take some time to require dependencies,
;; we give the user some immediate feedback to let them know something is happening.
(println "Clay loading...")
(ns scicloj.clay.v2.api
(:require [scicloj.clay.v2.make :as make]
[scicloj.clay.v2.config :as config]
[scicloj.clay.v2.server :as server]
[scicloj.clay.v2.live-reload :as live-reload]
(ns scicloj.clay.v2.old.api
(:require [scicloj.clay.v2.old.make :as make]
[scicloj.clay.v2.old.config :as config]
[scicloj.clay.v2.old.server :as server]
[scicloj.clay.v2.old.live-reload :as live-reload]
[scicloj.kindly.v4.kind :as kind]))

(defn stop! []
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(ns scicloj.clay.v2.config
(ns scicloj.clay.v2.old.config
(:require [clojure.java.io :as io]
[clojure.edn :as edn]
[scicloj.clay.v2.util.fs :as util.fs]
[scicloj.clay.v2.old.util.fs :as util.fs]
[scicloj.kindly.v4.api :as kindly]))

(defn slurp-when-exists [path]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(ns scicloj.clay.v2.files
(ns scicloj.clay.v2.old.files
(:require [clojure.java.io :as io]
[babashka.fs :as fs]))

Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
(ns scicloj.clay.v2.item
(ns scicloj.clay.v2.old.item
(:require [clojure.pprint :as pp]
[clojure.string :as str]
[scicloj.kind-portal.v1.prepare :as kind-portal]
[scicloj.kindly-render.shared.jso :as jso]
[scicloj.clay.v2.files :as files]
[scicloj.clay.v2.plotly-export :as plotly-export]
[scicloj.clay.v2.util.image :as util.image]
[scicloj.clay.v2.util.meta :as meta]
[scicloj.clay.v2.old.files :as files]
[scicloj.clay.v2.old.plotly-export :as plotly-export]
[scicloj.clay.v2.old.util.image :as util.image]
[scicloj.clay.v2.old.util.meta :as meta]
[clj-commons.format.exceptions :as fe])
(:import (javax.sound.sampled AudioFileFormat$Type
AudioFormat
Expand Down Expand Up @@ -100,7 +100,7 @@
(binding [fe/*fonts* nil
fe/*default-frame-rules*
(conj fe/*default-frame-rules*
[:name #"scicloj.clay.v2\..*" :terminate])]
[:name #"scicloj.clay.v2.old\..*" :terminate])]
(fe/format-exception ex)))

(defn print-throwable [ex collapsed]
Expand Down Expand Up @@ -429,8 +429,8 @@
_ (doseq [f samples]
(.put sbuf ^short (shortify f)))
byte-input-stream (ByteArrayInputStream. (.array buf))
audio-input-stream (AudioInputStream. byte-input-stream
audio-format
audio-input-stream (AudioInputStream. byte-input-stream
audio-format
(count samples))]
(javax.sound.sampled.AudioSystem/write audio-input-stream
AudioFileFormat$Type/WAVE
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
(ns scicloj.clay.v2.live-reload
(ns scicloj.clay.v2.old.live-reload
(:require [clojure.set :as set]
[babashka.fs :as fs]
[clojure.string :as str]
[nextjournal.beholder :as beholder]
[scicloj.clay.v2.server :as server]))
[scicloj.clay.v2.old.server :as server]))

(def empty-state {:watchers {}
:file-specs {}})
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
(ns scicloj.clay.v2.main
(ns scicloj.clay.v2.old.main
"command line interface"
(:gen-class)
(:require [babashka.fs :as fs]
[clojure.edn :as edn]
[clojure.string :as str]
[clojure.tools.cli :as cli]
[scicloj.clay.v2.api :as api]
[scicloj.clay.v2.config :as config]
[scicloj.clay.v2.old.api :as api]
[scicloj.clay.v2.old.config :as config]
[nrepl.cmdline]
[scicloj.kindly.v4.api :as kindly]))

Expand Down
Loading