diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md deleted file mode 100644 index f5132c5..0000000 --- a/.github/pull_request_template.md +++ /dev/null @@ -1,9 +0,0 @@ -Please answer the following questions and leave the below in as part of your PR. - -- [ ] I have read the [developer documentation](https://github.com/babashka/scittle/blob/main/doc/dev.md). - -- [ ] This PR corresponds to an [issue with a clear problem statement](https://github.com/babashka/scittle/blob/main/doc/dev.md#start-with-an-issue-before-writing-code). - - - -- [ ] I have updated the [CHANGELOG.md](https://github.com/babashka/scittle/blob/main/CHANGELOG.md) file with a description of the addressed issue. diff --git a/.gitignore b/.gitignore index e26d706..2b15657 100644 --- a/.gitignore +++ b/.gitignore @@ -16,6 +16,3 @@ gh-pages/ /dist /.clj-kondo/.cache /.clj-kondo/rewrite-clj -/plugins/demo/resources/public/js/ -.portal -resources/public/test/scratch.html diff --git a/CHANGELOG.md b/CHANGELOG.md index b2fff67..2b301a2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,114 +1,19 @@ # Changelog -[Scittle](https://github.com/babashka/scittle): execute Clojure(Script) directly from browser script tags via SCI! - - - - - - - - -- [#114](https://github.com/babashka/scittle/issues/114): Enable source maps ([@jeroenvandijk](https://github.com/jeroenvandijk)) -- [#140](https://github.com/babashka/scittle/issues/140): Enable customizing the nrepl websocket port ([@PEZ](https://github.com/PEZ)) - -## v0.7.28 (2025-09-13) - -- [#137](https://github.com/babashka/scittle/issues/137): fix JS interop with reserved JS keyword (incorrectly munged) by bumping SCI - -## v0.7.27 (2025-08-21) - -- [#95](https://github.com/babashka/scittle/issues/121): support string requires - of `globalThis` js deps ([@chr15m](https://github.com/chr15m)). See - [docs](https://github.com/babashka/scittle/blob/main/doc/js-libraries.md). -- Potentially breaking: `(.-foo-bar {})` now behaves as `{}.foo_bar`, i.e. the property or method name is munged. - -## v0.7.26 (2025-08-20) - -- [#121](https://github.com/babashka/scittle/issues/121): add `cjohansen/dataspex` plugin ([@jeroenvandijk](https://github.com/jeroenvandijk)) -- [#118](https://github.com/babashka/scittle/issues/118): add `goog.string/format` ([@jeroenvandijk](https://github.com/jeroenvandijk)) -- Support alternative `(set! #js {} -a 1)` CLJS syntax (by bumping SCI) -- Add source maps to distribution -- Add dev versions of all modules in the `dev` folder of the distribution + a `dev/scitte.cljs-devtools.js` module - -## v0.7.23 (2025-06-18) - -- [#107](https://github.com/babashka/scittle/issues/107): add `replicant` plugin ([@jeroenvandijk](https://github.com/jeroenvandijk)) -- [#102](https://github.com/babashka/scittle/issues/102): add `applied-science/js-interop` plugin ([@chr15m](https://github.com/chr15m)) -- [#105](https://github.com/babashka/scittle/issues/105): add `goog.string/htmlEscape` ([@ikappaki](https://github.com/ikappaki) ) -- [#113](https://github.com/babashka/scittle/issues/113): add `unchecked-set` and `unchecked-get` - -## v0.6.22 (2024-12-19) - -- [#99](https://github.com/babashka/scittle/issues/99): make `js/import` work - -## v0.6.20 (2024-11-24) - -- [#55](https://github.com/babashka/scittle/issues/55): create gh-pages dir before using. -- [#89](https://github.com/babashka/scittle/issues/89): allow `evaluate_script_tags` to specify individual scripts. -- [#87](https://github.com/babashka/scittle/issues/87): prod build on fresh checkout fails - -## v0.6.19 (2024-10-08) - -- Add `cljs.pprint/code-dispatch` and `cljs.pprint/with-pprint-dispatch` - -## v0.6.18 (2024-04-30) - -- [#77](https://github.com/babashka/scittle/issues/77): make dependency on browser (`js/document`) optional so scittle can run in webworkers, Node.js, etc. - -## v0.6.17 (2024-04-22) - -- [#69](https://github.com/babashka/scittle/issues/69): executing script tag with src + whitespace doesn't work -- [#72](https://github.com/babashka/scittle/issues/72): add clojure 1.11 functions like `update-vals` -- [#75](https://github.com/babashka/scittle/issues/75): Support reader conditionals in source code - -## v0.6.16 (2023-05-04) - -- [#58](https://github.com/babashka/scittle/issues/58): build system for creating scittle distribution with custom libraries. See [plugins/demo](plugins/demo). -- Use `window.location.hostname` for WebSocket connection instead of hardcoding `"localhost"` ([@pyrmont](https://github.com/pyrmont)) -- Upgrade `sci.configs` to `"33bd51e53700b224b4cb5bda59eb21b62f962745"` -- Update nREPL implementation: implement `eldoc` (`info`, `lookup`) ([@benjamin-asdf](https://github.com/benjamin-asdf)) - -## v0.6.15 (2023-01-05) - -- Fix destructuring in `defmethod` (by upgrading SCI) - -## v0.5.13 (2022-12-23) - -- Fix `cljs.pprint` plugin - -## v0.5.12 (2022-12-23) - -- Fix `reagent` `with-let` macro with advanced compiled builds -- Upgrade promesa and shadow-cljs -- Fix `#queue` literal -- SCI: performance improvements - -## v0.4.11 (2022-11-23) - -- Add `scittle.re-frame` plugin. This gives access to the - [re-frame](https://github.com/day8/re-frame) library. -- Fix for [44](https://github.com/babashka/scittle/issues/44): Honoring `SCITTLE_NREPL_WEBSOCKET_PORT` in `scittle.nrepl` -- Add all public vars of `cljs-ajax` `ajax.core` -- Upgrade several built-in libraries - -## v0.3.10 - -- Add `scittle.promesa.js` plugin. This gives access to the [promesa](https://cljdoc.org/d/funcool/promesa/8.0.450/doc/user-guide) library. -- Add `scittle.pprint.js` plugin. This gives access to [cljs.pprint](https://cljs.github.io/api/cljs.pprint/). -- Improve error messages - -## v0.2.8 +## v0.1.3 - Upgrade to SCI 0.3.1 -- Upgrade to Reagent 1.1.0 +- Upgrade to Reagent 0.1.1 + +## v0.1.2 + - Add support for Reagent's `create-class` and `with-let` ## v0.1.1 - Upgrade to SCI 0.3.0 -## v0.1.0 +## v0.1.1 - Fixes for `try/catch` diff --git a/README.md b/README.md index 01e1607..8beb12f 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,6 @@ The [Small Clojure Interpreter](https://github.com/babashka/sci) exposed for usage in script tags. -Try it out on [CodePen](https://codepen.io/Prestance/pen/PoOdZQw)! - See [Github pages](https://babashka.org/scittle/) for usage. See @@ -13,26 +11,6 @@ for a minimal full stack web application. See [releases](https://github.com/babashka/scittle/releases) for links to [JSDelivr](https://www.jsdelivr.com) to get versioned artifacts. -## Serving assets - -To serve assets you can use the -[babashka.http-server](https://github.com/babashka/http-server) dependency (with -babashka or Clojure JVM): - -``` clojure -(require '[babashka.http-server :as http]) -(http/serve {:port 1341 :dir "resources/public"}) -@(promise) ;; wait until process is killed -``` - -### nREPL - -See [doc/nrepl](doc/nrepl). - -### Service worker - -See [doc/serviceworker.md](doc/serviceworker.md). - ## Tasks Run `bb tasks` to see all available tasks: @@ -50,10 +28,9 @@ release Updates Github pages with new release build. ## Credits Idea by Arne Brasseur a.k.a [plexus](https://github.com/plexus). -Name by Alessandra Sierra (the name occurs first in [this](https://stuartsierra.com/2019/12/21/clojure-start-time-in-2019/) blog post). ## License -Copyright © 2021 - 2022 Michiel Borkent +Copyright © 2021 Michiel Borkent Distributed under the EPL License. See LICENSE. diff --git a/bb.edn b/bb.edn index f76e437..1eef13f 100644 --- a/bb.edn +++ b/bb.edn @@ -1,76 +1,46 @@ -{:deps {io.github.babashka/sci.nrepl - #_{:local/root "../sci.nrepl"} - {:git/sha "2f8a9ed2d39a1b09d2b4d34d95494b56468f4a23"} - io.github.babashka/http-server - {:git/sha "b38c1f16ad2c618adae2c3b102a5520c261a7dd3"} - io.github.scittle/build - {:local/root "build"}} - - :tasks - {:requires ([scittle.build :as build] - [babashka.fs :as fs] +{:tasks + {:requires ([babashka.fs :as fs] [cheshire.core :as json] [babashka.process :as p :refer [process]]) clean {:doc "Start from clean slate." - :task (do (fs/delete-tree (fs/file "resources" "public" "js")) + :task (do (run! fs/delete (fs/list-dir (fs/file "resources" "public" "js") "**.*")) (fs/delete-tree ".cpcache") (fs/delete-tree ".shadow-cljs"))} - shadow:watch {:doc "Development build. Starts webserver and watches for changes." - :task (build/build {:action "watch" - :args *command-line-args*})} - - http-server {:doc "Starts http server for serving static files" - :requires ([babashka.http-server :as http]) - :task (do (http/serve {:port 1341 :dir "resources/public"}) - (println "Serving static assets at http://localhost:1341"))} - - browser-nrepl {:doc "Start browser nREPL" - :requires ([sci.nrepl.browser-server :as bp]) - :task (bp/start! {})} - - -dev {:depends [shadow:watch browser-nrepl http-server]} - dev {:doc "Development build. Starts webserver and watches for changes." - :task (do (run '-dev {:parallel true}) - (deref (promise)))} + :task (clojure "-M:dev -m shadow.cljs.devtools.cli watch main")} prod {:doc "Builds production artifacts." - :task (build/build {}) - :depends [clean]} + :task (clojure {:extra-env {"SCI_ELIDE_VARS" "true"}} + "-M:dev -m shadow.cljs.devtools.cli release main")} dist {:doc "Prepare dist folder for npm package" :depends [prod] :task (do (fs/delete-tree "dist") - (fs/create-dirs "dist/dev") - (run! (fn [f] (fs/copy f "dist" {:replace-existing true})) - (fs/glob "resources/public/js" "*.{js,js.map}")) - (run! (fn [f] (fs/copy f "dist/dev" {:replace-existing true})) - (fs/glob "resources/public/js/dev" "*.{js,js.map}")))} + (fs/create-dirs "dist") + (run! (fn [f] (fs/copy f "dist")) + (fs/glob "resources/public/js" "*.js")))} bump-version {:doc "Bumps package.json and pushes new git tag" :task (do (shell "npm version patch") (shell "git push --atomic origin main" (str "v" (:version (json/parse-string (slurp "package.json") true)))))} - npm-publish {:doc "Updates NPM ibrary" + npm-publish {:doc "Updates Github pages with new release build." :task (do (run 'dist) (run 'bump-version) (shell "npm publish"))} - replace-version {:doc "Ported from bash one-liners. Expects two versions. - TODO: port to Clojure. - TODO: skip changelog.md - " + gh-pages {:doc "Updates Github pages with new release build." + :task (shell "script/release.clj")} + + replace-version {:doc "Ported from bash one-liners. Expects two versions. TODO: port to Clojure." :task (let [[prev next] *command-line-args*] (-> (process ["bash" "-c" - (format "rg %s --files-with-matches -g '!/CHANGELOG.md' | xargs sed -i '' 's/%s/%s/g'" + (format "rg %s --files-with-matches | xargs sed -i '' 's/%s/%s/g'" prev prev next)] {:inherit true}) - p/check))} - - gh-pages {:doc "Updates Github pages with new release build." - :task (shell "script/release.clj")}}} + p/check))}}} diff --git a/build/deps.edn b/build/deps.edn deleted file mode 100644 index 0967ef4..0000000 --- a/build/deps.edn +++ /dev/null @@ -1 +0,0 @@ -{} diff --git a/build/src/scittle/build.clj b/build/src/scittle/build.clj deleted file mode 100644 index 02382e5..0000000 --- a/build/src/scittle/build.clj +++ /dev/null @@ -1,83 +0,0 @@ -(ns scittle.build - "Provides bb tasks for building and releasing scittle" - (:require - [babashka.classpath :as classpath] - [babashka.fs :as fs] - [babashka.tasks :refer [clojure]] - [clojure.edn :as edn] - [clojure.string :as str])) - -(defn- feature-files - [] - (filter fs/exists? - (map (fn [d] - (fs/file d "scittle_plugin.edn")) - (classpath/split-classpath (classpath/get-classpath))))) - -(defn- read-configs - [files] - (->> files - (mapcat (comp edn/read-string slurp str)))) - -(defn- build-cmd [cmd scittle-dir] - (let [files (feature-files) - feature-configs (read-configs files) - ;; Each ./src/scittle_plugin.edn has a ./deps.edn - feature-dirs (map (comp fs/parent fs/parent) files) - cmd' (if (seq files) - (format "-Sdeps '%s' %s" - {:deps - (merge (into {} - (map (fn [dir] - [(symbol (str (fs/file-name dir) "/deps")) - {:local/root (str dir)}]) - feature-dirs)) - {'scittle/deps {:local/root scittle-dir}})} - cmd) - cmd)] - (when (seq feature-configs) - (println "Building features:" (str/join ", " (map :name feature-configs)) "...")) - (if (seq feature-configs) - (apply str cmd' - (map (fn [m] (format " --config-merge '%s'" (pr-str (:shadow-config m)))) - feature-configs)) - cmd'))) - -(defn- build* - [cmd] - (let [building-outside-scittle? (not (fs/exists? "shadow-cljs.edn")) - scittle-dir (when building-outside-scittle? - (->> (classpath/get-classpath) - classpath/split-classpath - ;; Pull out scittle from local/root or git/url - (some #(when (re-find #"(scittle/[0-9a-f]+|scittle)/src" %) %)) - fs/parent))] - (when building-outside-scittle? - (fs/copy (fs/file scittle-dir "shadow-cljs.edn") "shadow-cljs.edn")) - (let [cmd (build-cmd cmd (str scittle-dir))] - (println "> clojure" cmd) - (clojure {:extra-env {"SCI_ELIDE_VARS" "true"}} cmd)) - (when building-outside-scittle? - (fs/delete "shadow-cljs.edn")))) - -(defn build - "Build scittle shadow builds using clojure cmd and commandline args. Features on - classpath are automatically added. - - Options: - - * :action - compile action, defaults to release, but may also be compile or watch" - [{:keys [action - args] :or {action "release"}}] - (build* (format "-M -m shadow.cljs.devtools.cli --force-spawn %s main %s" action (str/join " " args))) - (when (= "release" action) - (println "Also building dev release build") - (build* (format "-M -m shadow.cljs.devtools.cli --force-spawn %s main %s %s" - action - "--config-merge '{:compiler-options {:optimizations :simple - :pretty-print true - :pseudo-names true} - :output-dir \"resources/public/js/dev\" - :modules {:scittle.cljs-devtools {:entries [scittle.cljs-devtools] - :depends-on #{:scittle}}}}'" - (str/join " " args))))) diff --git a/deps.edn b/deps.edn index f7a5121..fbc1235 100644 --- a/deps.edn +++ b/deps.edn @@ -1,30 +1,15 @@ {:paths ["src" "resources"] + :deps - {org.clojure/clojure {:mvn/version "1.12.2"} - thheller/shadow-cljs {:mvn/version "3.1.8"} - org.babashka/sci {:git/url "https://github.com/babashka/sci" - :git/sha "6758ba028da559c536a06becbbedade7b0ba6448"} - #_{:local/root "../babashka/sci"} - reagent/reagent {:mvn/version "1.1.1"} - no.cjohansen/replicant {:mvn/version "2025.03.27"} - re-frame/re-frame {:mvn/version "1.3.0"} - cljsjs/react {:mvn/version "18.2.0-1"} - cljsjs/react-dom {:mvn/version "18.2.0-1"} - cljsjs/react-dom-server {:mvn/version "18.2.0-1"} - cljs-ajax/cljs-ajax {:mvn/version "0.8.4"} - applied-science/js-interop {:mvn/version "0.4.2"} - funcool/promesa {:mvn/version "11.0.678"} - io.github.babashka/sci.nrepl - #_{:local/root "../sci.nrepl"} - {:git/url "https://github.com/babashka/sci.nrepl" - :git/sha "75f379c685bbd58c3e23f531339eb144e104937d"} - io.github.babashka/sci.configs - #_{:local/root "/Users/borkdude/dev/sci.configs"} - {:git/url "https://github.com/babashka/sci.configs" - :git/sha "aa84a1b4f1fe45735e5b748769309fc842f737c1" - :exclusions [org.babashka/sci]} - binaryage/devtools {:mvn/version "1.0.7"}} + {org.clojure/clojure {:mvn/version "1.10.3"} + org.babashka/sci {:mvn/version "0.3.1"} + reagent/reagent {:mvn/version "1.1.0"} + cljsjs/react {:mvn/version "17.0.2-0"} + cljsjs/react-dom {:mvn/version "17.0.2-0"} + cljsjs/react-dom-server {:mvn/version "17.0.2-0"} + cljs-ajax/cljs-ajax {:mvn/version "0.8.3"}} + :aliases {:dev {:extra-paths ["dev"] - :extra-deps {}}}} + :extra-deps {thheller/shadow-cljs {:mvn/version "2.14.0"}}}}} diff --git a/doc/dev.md b/doc/dev.md index b6bd354..3dc3848 100644 --- a/doc/dev.md +++ b/doc/dev.md @@ -1,48 +1,5 @@ # Dev -## Workflow - -### Start with an issue before writing code - -Before writing any code, please create an issue first that describes the problem -you are trying to solve with alternatives that you have considered. A little bit -of prior communication can save a lot of time on coding. Keep the problem as -small as possible. If there are two problems, make two issues. We discuss the -issue and if we reach an agreement on the approach, it's time to move on to a -PR. - -### Follow up with a pull request - -Post a corresponding PR with the smallest change possible to address the -issue. Then we discuss the PR, make changes as needed and if we reach an -agreement, the PR will be merged. - - - - - - -### Force-push - -Please do not use `git push --force` on your PR branch for the following -reasons: - -- It makes it more difficult for others to contribute to your branch if needed. -- It makes it harder to review incremental commits. -- Links (in e.g. e-mails and notifications) go stale and you're confronted with: - this code isn't here anymore, when clicking on them. -- CircleCI doesn't play well with it: it might try to fetch a commit which - doesn't exist anymore. -- Your PR will be squashed anyway. - -## Developing - -Run `bb dev` to start shadow-cljs compilation in watch mode. - - - - - ## Release Static files including compiled JS are hosted on Github. This is set up like @@ -76,34 +33,27 @@ After cloning this repo to a new dir: ``` git fetch origin gh-pages -git worktree prune git worktree add gh-pages gh-pages ``` To deploy to Github Pages: ``` -script/release.clj +bb release ``` -To create a new NPM release: +To create a new release: -- Prepare version `package.json`, except patch (if anything should change here) -- Run `bb npm-publish`: this will compile, bump patch version, create tag and and push to npm and Github -- `bb replace-version 0.6.16 0.7.28` -- Create Github release with updated links from `doc/links.md` -- `bb gh-pages` +To upgrade examples: - +``` +rg '0.0.1' --files-with-matches | xargs sed -i '' 's/0.0.1.1.1.0/g' +bb release +cd gh-pages +git checkout -b v0.1.1 +git push --set-upstream origin v0.1.1 +git checkout gh-pages +cd .. +``` - - - - - - - - - - - +Then make a new release on Github with the `v0.1.1` tag. diff --git a/doc/js-libraries.md b/doc/js-libraries.md deleted file mode 100644 index 72cafb8..0000000 --- a/doc/js-libraries.md +++ /dev/null @@ -1,49 +0,0 @@ -# Loading JS libraries - -Since `v0.7.28` scittle allows to load libraries from the global enviroment. -This means you can load a library in a ` - - - - - - -``` - -## ES modules - -The async nature of ES modules makes them a litte bit more difficult to work -with in scittle. You need to disable automatic evaluation of script tags first -using `scittle.core.disable_auto_eval()`. In a `module` type ` - - - - - - - -``` diff --git a/doc/links.md b/doc/links.md deleted file mode 100644 index 0b4181a..0000000 --- a/doc/links.md +++ /dev/null @@ -1,20 +0,0 @@ -https://cdn.jsdelivr.net/npm/scittle@0.7.28/dist/scittle.js -https://cdn.jsdelivr.net/npm/scittle@0.7.28/dist/scittle.js-interop.js -https://cdn.jsdelivr.net/npm/scittle@0.7.28/dist/scittle.cljs-ajax.js -https://cdn.jsdelivr.net/npm/scittle@0.7.28/dist/scittle.reagent.js -https://cdn.jsdelivr.net/npm/scittle@0.7.28/dist/scittle.re-frame.js -https://cdn.jsdelivr.net/npm/scittle@0.7.28/dist/scittle.replicant.js -https://cdn.jsdelivr.net/npm/scittle@0.7.28/dist/scittle.promesa.js -https://cdn.jsdelivr.net/npm/scittle@0.7.28/dist/scittle.pprint.js -https://cdn.jsdelivr.net/npm/scittle@0.7.28/dist/scittle.nrepl.js - -https://cdn.jsdelivr.net/npm/scittle@0.7.28/dist/dev/scittle.js -https://cdn.jsdelivr.net/npm/scittle@0.7.28/dist/dev/scittle.js-interop.js -https://cdn.jsdelivr.net/npm/scittle@0.7.28/dist/dev/scittle.cljs-ajax.js -https://cdn.jsdelivr.net/npm/scittle@0.7.28/dist/dev/scittle.reagent.js -https://cdn.jsdelivr.net/npm/scittle@0.7.28/dist/dev/scittle.re-frame.js -https://cdn.jsdelivr.net/npm/scittle@0.7.28/dist/dev/scittle.replicant.js -https://cdn.jsdelivr.net/npm/scittle@0.7.28/dist/dev/scittle.promesa.js -https://cdn.jsdelivr.net/npm/scittle@0.7.28/dist/dev/scittle.pprint.js -https://cdn.jsdelivr.net/npm/scittle@0.7.28/dist/dev/scittle.nrepl.js -https://cdn.jsdelivr.net/npm/scittle@0.7.28/dist/dev/scittle.cljs-devtools.js diff --git a/doc/nrepl/README.md b/doc/nrepl/README.md deleted file mode 100644 index 5541357..0000000 --- a/doc/nrepl/README.md +++ /dev/null @@ -1,59 +0,0 @@ -# nREPL - -To connect to a Scittle nREPL server from your editor, follow these steps. The -setup described here, can be found in this directory. - -In babashka or Clojure JVM, use the -[sci.nrepl](https://github.com/babashka/sci.nrepl) dependency and run: - -``` clojure -(require '[sci.nrepl.browser-server :as nrepl]) -(nrepl/start! {:nrepl-port 1339 :websocket-port 1340}) -``` - -This will run an nREPL server on port 1339 and a websocket server on port 1340. -Your editor's nREPL client will connect to port 1339 and your browser, running -scittle, will connect to port 1340. The nREPL server forwards messages to the -browser via the websocket connection. - -In your scittle website, you will need to include the following, in addition to -the normal routine: - -``` html - - -``` - -Also include the CLJS file that you want to evaluate with nREPL: - -``` html - -``` - -Then visit `playground.cljs` in your editor and connect to the nREPL server, -and start evaluating! - -See the `index.html` file for an example. - -When you run `bb dev` in this directory, and then open `http://localhost:1341` -you should be able evaluate expressions in `playground.cljs`. See a demo -[here](https://twitter.com/borkdude/status/1526285565343281159). - -Note that the nREPL server connection stays alive even after the browser window -refreshes. - -### Custom host address - -By default, the browser will connect to a websocket on the same host as it is loaded -from, using `window.location.hostname`. If you need something else you can specify -that setting the window variable `SCITTLE_NREPL_WEBSOCKET_HOST` like so: - -``` html - -``` - -### CIDER - -Choose `cider-connect-cljs`, select port `1339`, followed by the `nbb` REPL -type. If you use multiple REPLs in your project, choose -`sesman-link-with-buffer` to choose the right REPL for the right buffer. diff --git a/doc/nrepl/bb.edn b/doc/nrepl/bb.edn deleted file mode 100644 index fdd4518..0000000 --- a/doc/nrepl/bb.edn +++ /dev/null @@ -1,18 +0,0 @@ -{:deps {io.github.babashka/sci.nrepl - #_{:local/root "/Users/borkdude/dev/sci.nrepl"} - {:git/sha "4f7f6d652a71b5bdc0c110313a4908d956e7a97d"} - io.github.babashka/http-server - {:git/sha "b38c1f16ad2c618adae2c3b102a5520c261a7dd3"}} - :tasks {http-server {:doc "Starts http server for serving static files" - :requires ([babashka.http-server :as http]) - :task (do (http/serve {:port 1341 :dir "."}) - (println "Serving static assets at http://localhost:1341"))} - - browser-nrepl {:doc "Start browser nREPL" - :requires ([sci.nrepl.browser-server :as bp]) - :task (bp/start! {})} - - -dev {:depends [http-server browser-nrepl]} - - dev {:task (do (run '-dev {:parallel true}) - (deref (promise)))}}} diff --git a/doc/nrepl/index.html b/doc/nrepl/index.html deleted file mode 100644 index 5890a47..0000000 --- a/doc/nrepl/index.html +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - -

Scittle

-

What is this?

- - diff --git a/doc/nrepl/playground.cljs b/doc/nrepl/playground.cljs deleted file mode 100644 index cd18550..0000000 --- a/doc/nrepl/playground.cljs +++ /dev/null @@ -1,15 +0,0 @@ -(ns playground) - -(+ 1 2 3) - -(-> - (js/document.getElementsByTagName "body") - first - (.append - (doto (js/document.createElement "p") - (.append - (js/document.createTextNode "there"))))) - -(defn foo []) - -(js/alert "Isn't this cool? :)") diff --git a/doc/serviceworker.md b/doc/serviceworker.md deleted file mode 100644 index 1048f77..0000000 --- a/doc/serviceworker.md +++ /dev/null @@ -1,26 +0,0 @@ -# Scittle in a service worker - -You can use Scittle to bootstrap a ClojureScript based service worker. - -Put the following code into e.g. `scittle-sw.js` to create a JavaScript based service worker, load Scittle, then fetch your script and eval it. - -```javascript -importScripts("scittle.min.js"); - -const request = await fetch("sw.cljs"); -const text = await request.text(); -const result = scittle.core.eval_string(text); -``` - -Then load `scittle-sw.js` in your HTML: - -```html - -``` - -This will load `sw.cljs` and eval it in the context of the service worker. - -A ready-made example can be found at [chr15m/scittle-template-serviceworker](https://github.com/chr15m/scittle-template-serviceworker). diff --git a/package-lock.json b/package-lock.json index e5bd260..ee92f2c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,7 +8,7 @@ "react": "17.0.1", "react-dom": "17.0.1" }, - "version": "0.7.28" + "version": "0.1.1" }, "node_modules/js-tokens": { "version": "4.0.0", @@ -129,5 +129,5 @@ } } }, - "version": "0.7.28" + "version": "0.1.2" } diff --git a/package.json b/package.json index ab333e8..e85e664 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "scittle", - "version": "0.7.28", + "version": "0.1.2", "files": [ "dist" ], diff --git a/plugins/datascript/deps.edn b/plugins/datascript/deps.edn deleted file mode 100644 index 467f4cd..0000000 --- a/plugins/datascript/deps.edn +++ /dev/null @@ -1,4 +0,0 @@ -{:deps - {datascript/datascript {:mvn/version "1.3.12"} - io.github.babashka/sci.configs {:git/sha "aa84a1b4f1fe45735e5b748769309fc842f737c1" - :exclusions [org.babashka/sci]}}} diff --git a/plugins/datascript/src/scittle/datascript.cljs b/plugins/datascript/src/scittle/datascript.cljs deleted file mode 100644 index f3dac97..0000000 --- a/plugins/datascript/src/scittle/datascript.cljs +++ /dev/null @@ -1,9 +0,0 @@ -(ns scittle.datascript - {:no-doc true} - (:require [sci.configs.tonsky.datascript :refer [config]] - [scittle.core :as scittle])) - -(defn init [] - (scittle/register-plugin! - ::datascript - config)) diff --git a/plugins/datascript/src/scittle_plugin.edn b/plugins/datascript/src/scittle_plugin.edn deleted file mode 100644 index 09eae58..0000000 --- a/plugins/datascript/src/scittle_plugin.edn +++ /dev/null @@ -1,12 +0,0 @@ -[{:name scittle/datascript - :namespaces [datascript.core datascript.db] - :js "./scittle.datascript.js" - :shadow-config - {:compiler-options {:externs ["datascript/externs.js"]} - :modules - {:scittle.datascript - {:init-fn scittle.datascript/init - ;; From https://github.com/tonsky/datascript/issues/298#issuecomment-813790783 - :prepend "globalThis.datascript = {};" - :depends-on #{:scittle} - :entries [datascript.core]}}}}] diff --git a/plugins/dataspex/deps.edn b/plugins/dataspex/deps.edn deleted file mode 100644 index badf11e..0000000 --- a/plugins/dataspex/deps.edn +++ /dev/null @@ -1,8 +0,0 @@ -{:deps - {no.cjohansen/dataspex {:git/url "https://github.com/cjohansen/dataspex" - :git/sha "02112200651c2bd932907bb69fba1ff50b881741" - :exclusions [ring/ring-core - ring/ring-jetty-adapter - com.cognitect/transit-clj]} - io.github.babashka/sci.configs {:git/sha "aa84a1b4f1fe45735e5b748769309fc842f737c1" - :exclusions [org.babashka/sci]}}} diff --git a/plugins/dataspex/src/scittle/dataspex.cljs b/plugins/dataspex/src/scittle/dataspex.cljs deleted file mode 100644 index 66b3908..0000000 --- a/plugins/dataspex/src/scittle/dataspex.cljs +++ /dev/null @@ -1,9 +0,0 @@ -(ns scittle.dataspex - {:no-doc true} - (:require [sci.configs.cjohansen.dataspex :refer [config]] - [scittle.core :as scittle])) - -(defn init [] - (scittle/register-plugin! - ::dataspex - config)) diff --git a/plugins/dataspex/src/scittle_plugin.edn b/plugins/dataspex/src/scittle_plugin.edn deleted file mode 100644 index af629e2..0000000 --- a/plugins/dataspex/src/scittle_plugin.edn +++ /dev/null @@ -1,8 +0,0 @@ -[{:name scittle/dataspex - :namespaces [dataspex.core] - :js "./scittle.dataspex.js" - :shadow-config - {:modules - {:scittle.dataspex {:init-fn scittle.dataspex/init - :depends-on #{:scittle :scittle.datascript} - :entries [dataspex.core]}}}}] diff --git a/plugins/demo/README.md b/plugins/demo/README.md deleted file mode 100644 index 7bd15f8..0000000 --- a/plugins/demo/README.md +++ /dev/null @@ -1,29 +0,0 @@ -# Demo - -A demo project of a custom scittle build. - -This demo project uses the `scittle.javelin` and `scittle.hoplon` plugins which aren't part of the normal scittle distribution. - -To produce release `.js` files, run: `bb release`. - -See: - -- `bb.edn` with - - `:deps` which includes: - - a dependency on the `scittle.build` project to build scittle + custom features - - zero or more plugin dependencies - - helpers like static file server - - development `:tasks`. Run `bb dev` for development and `bb release` to produce release artifacts. -- `deps.edn`: this only contains a dependency on scittle itself - -Available plugins are in the `plugins` directory inside the top level directory of this repo. - -Writing a plugin involves writing - -- SCI configuration (this can be shared via the [sci.configs](https://github.com/babashka/sci.configs) project too) -- Adding a `scittle_plugin.edn` file on the plugin's classpath (e.g. in the `src` directory). This EDN file contains: - - `:name`, name of the plugin - - `:namespaces`: the namespaces exposed to SCI - - `:js`: the name of the produced `.js` module file - - `:shadow-config`: the shadow-cljs configuration specific to this plugin -- A `.cljs` file with an `init` function which calls `scittle/register-plugin!`. diff --git a/plugins/demo/bb.edn b/plugins/demo/bb.edn deleted file mode 100644 index e7486c2..0000000 --- a/plugins/demo/bb.edn +++ /dev/null @@ -1,22 +0,0 @@ -{:deps {io.github.babashka/scittle.build {:local/root "../../build"} - ;; datascript plugin - ; io.github.babashka/scittle.datascript {:local/root "../../plugins/datascript"} - io.github.babashka/scittle.dataspex {:local/root "../../plugins/dataspex"} - io.github.babashka/scittle.javelin {:local/root "../../plugins/javelin"} - io.github.babashka/scittle.hoplon {:local/root "../../plugins/hoplon"} - io.github.babashka/http-server - {:git/sha "b38c1f16ad2c618adae2c3b102a5520c261a7dd3"}} - :tasks - {:requires ([scittle.build :as build]) - watch {:doc "Watch build" - :task (build/build {:action "watch"})} - serve {:doc "Starts http server for serving static files" - :requires ([babashka.http-server :as http]) - :task (do (http/serve {:port 1341 :dir "resources/public"}) - (println "Serving static assets at http://localhost:1341"))} - -dev {:depends [watch serve]} - dev {:doc "Run compilation in watch mode and start http server" - :task (do (run '-dev {:parallel true}) - (deref (promise)))} - release {:doc "Release build (advanced compiled JS)" - :task (build/build {})}}} diff --git a/plugins/demo/deps.edn b/plugins/demo/deps.edn deleted file mode 100644 index 62915a5..0000000 --- a/plugins/demo/deps.edn +++ /dev/null @@ -1 +0,0 @@ -{:deps {io.github.babashka/scittle {:local/root "../.."}}} diff --git a/plugins/demo/resources/public/index.html b/plugins/demo/resources/public/index.html deleted file mode 100644 index 7f328cc..0000000 --- a/plugins/demo/resources/public/index.html +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - -

Hello Hoplon!

- - diff --git a/plugins/demo/shadow-cljs.edn b/plugins/demo/shadow-cljs.edn deleted file mode 100644 index 47e5deb..0000000 --- a/plugins/demo/shadow-cljs.edn +++ /dev/null @@ -1,32 +0,0 @@ -{:deps - {:aliases [:dev]} - - :dev-http - {8000 "classpath:public"} - - :builds - {:main - {:target :browser - :js-options - {:resolve {"react" {:target :global - :global "React"} - "react-dom" {:target :global - :global "ReactDOM"}}} - :modules - {:scittle {:entries [scittle.core]} - :scittle.nrepl {:entries [scittle.nrepl] - :depends-on #{:scittle}} - :scittle.promesa {:entries [scittle.promesa] - :depends-on #{:scittle}} - :scittle.pprint {:entries [scittle.pprint] - :depends-on #{:scittle}} - :scittle.reagent {:entries [scittle.reagent] - :depends-on #{:scittle}} - :scittle.re-frame {:entries [scittle.re-frame] - :depends-on #{:scittle.reagent - :scittle}} - :scittle.cljs-ajax {:entries [scittle.cljs-ajax] - :depends-on #{:scittle}}} - :build-hooks [(shadow.cljs.build-report/hook)] - :output-dir "resources/public/js" - :devtools {:repl-pprint true}}}} diff --git a/plugins/hoplon/deps.edn b/plugins/hoplon/deps.edn deleted file mode 100644 index 0eab577..0000000 --- a/plugins/hoplon/deps.edn +++ /dev/null @@ -1,4 +0,0 @@ -{:deps - {hoplon/hoplon {:mvn/version "7.5.0"} - io.github.babashka/sci.configs {:git/sha "aa84a1b4f1fe45735e5b748769309fc842f737c1" - :exclusions [org.babashka/sci]}}} diff --git a/plugins/hoplon/src/scittle/hoplon.cljs b/plugins/hoplon/src/scittle/hoplon.cljs deleted file mode 100644 index 46e5a3b..0000000 --- a/plugins/hoplon/src/scittle/hoplon.cljs +++ /dev/null @@ -1,9 +0,0 @@ -(ns scittle.hoplon - {:no-doc true} - (:require [sci.configs.hoplon.hoplon :refer [config]] - [scittle.core :as scittle])) - -(defn init [] - (scittle/register-plugin! - ::hoplon - config)) diff --git a/plugins/hoplon/src/scittle/javelin.cljs b/plugins/hoplon/src/scittle/javelin.cljs deleted file mode 100644 index 7334a2d..0000000 --- a/plugins/hoplon/src/scittle/javelin.cljs +++ /dev/null @@ -1,9 +0,0 @@ -(ns scittle.javelin - {:no-doc true} - (:require [sci.configs.hoplon.javelin :refer [config]] - [scittle.core :as scittle])) - -(defn init [] - (scittle/register-plugin! - ::javelin - config)) diff --git a/plugins/hoplon/src/scittle_plugin.edn b/plugins/hoplon/src/scittle_plugin.edn deleted file mode 100644 index 5a9f8f6..0000000 --- a/plugins/hoplon/src/scittle_plugin.edn +++ /dev/null @@ -1,13 +0,0 @@ -[{:name scittle/hoplon - :namespaces [javelin.core - hoplon.core - hoplon.dom] - :js "./scittle.hoplon.js" - :shadow-config - {:modules - {:scittle.hoplon {:init-fn scittle.hoplon/init - :depends-on #{:scittle :scittle.javelin} - :entries [hoplon.core hoplon.dom]} - :scittle.javelin {:init-fn scittle.javelin/init - :depends-on #{:scittle} - :entries [javelin.core]}}}}] diff --git a/plugins/javelin/deps.edn b/plugins/javelin/deps.edn deleted file mode 100644 index f4b4533..0000000 --- a/plugins/javelin/deps.edn +++ /dev/null @@ -1,4 +0,0 @@ -{:deps - {hoplon/javelin {:mvn/version "3.9.3"} - io.github.babashka/sci.configs {:git/sha "aa84a1b4f1fe45735e5b748769309fc842f737c1" - :exclusions [org.babashka/sci]}}} diff --git a/plugins/javelin/src/scittle/javelin.cljs b/plugins/javelin/src/scittle/javelin.cljs deleted file mode 100644 index 7334a2d..0000000 --- a/plugins/javelin/src/scittle/javelin.cljs +++ /dev/null @@ -1,9 +0,0 @@ -(ns scittle.javelin - {:no-doc true} - (:require [sci.configs.hoplon.javelin :refer [config]] - [scittle.core :as scittle])) - -(defn init [] - (scittle/register-plugin! - ::javelin - config)) diff --git a/plugins/javelin/src/scittle_plugin.edn b/plugins/javelin/src/scittle_plugin.edn deleted file mode 100644 index c34873f..0000000 --- a/plugins/javelin/src/scittle_plugin.edn +++ /dev/null @@ -1,8 +0,0 @@ -[{:name scittle/javelin - :namespaces [javelin.core] - :js "./scittle.javelin.js" - :shadow-config - {:modules - {:scittle.javelin {:init-fn scittle.javelin/init - :depends-on #{:scittle} - :entries [javelin.core]}}}}] diff --git a/resources/public/bookmarklet.html b/resources/public/bookmarklet.html index e2cc947..15dce60 100644 --- a/resources/public/bookmarklet.html +++ b/resources/public/bookmarklet.html @@ -4,8 +4,9 @@ - - + + + diff --git a/resources/public/cljs/bookmarklet.cljs b/resources/public/cljs/bookmarklet.cljs index 69d2169..0f9eb15 100644 --- a/resources/public/cljs/bookmarklet.cljs +++ b/resources/public/cljs/bookmarklet.cljs @@ -134,7 +134,6 @@ [:br] [(fn [] [:a {:href (str "?name=" (js/encodeURIComponent @*bookmark-name) - "&code=" (js/encodeURIComponent @*code) - "%20")} "Copy this link to share ⤴️"])]])) + "&code=" (js/encodeURIComponent @*code))} "Copy this link to share ⤴️"])]])) (rdom/render [workspace] (.getElementById js/document "app")) diff --git a/resources/public/cljs/codemirror.cljs b/resources/public/cljs/codemirror.cljs deleted file mode 100644 index db28746..0000000 --- a/resources/public/cljs/codemirror.cljs +++ /dev/null @@ -1,56 +0,0 @@ -(require '[clojure.string :as str]) -(declare cm) - -(defn eval-me [] - (js/scittle.core.eval_string (-> cm .-state .-doc .toString))) - -(def extension - (.of js/cv.keymap - (clj->js [{:key "Mod-Enter" - :run (fn [] - (eval-me))} - #_{:key (str modifier "-Enter") - :shift (partial eval-top-level on-result) - :run (partial eval-at-cursor on-result)}]))) -(def cm - (let [doc (str/trim " -(require '[reagent.core :as r] - '[reagent.dom :as rdom] - '[re-frame.core :as rf]) - -(rf/reg-event-fx ::click (fn [{:keys [db]} _] {:db (update db :clicks (fnil inc 0))})) -(rf/reg-sub ::clicks (fn [db] (:clicks db))) - -(defn my-component [] - (let [clicks (rf/subscribe [::clicks])] - [:div - [:p \"Clicks: \" @clicks] - [:p [:button {:on-click #(rf/dispatch [::click])} - \"Click me!\"]]])) - -(rdom/render [my-component] (.getElementById js/document \"reagent\")) -")] - (js/cm.EditorView. #js {:doc doc - :extensions #js [js/cm.basicSetup, (js/lc.clojure), (.highest js/cs.Prec extension)] - :parent (js/document.querySelector "#app") - #_#_:dispatch (fn [tr] (-> cm (.update #js [tr])) (eval-me)) - }))) -(set! (.-eval_me js/globalThis) eval-me) -(set! (.-cm_instance js/globalThis) cm) - -(defn linux? [] - (some? (re-find #"(Linux)|(X11)" js/navigator.userAgent))) - -(defn mac? [] - (and (not (linux?)) - (some? (re-find #"(Mac)|(iPhone)|(iPad)|(iPod)" js/navigator.platform)))) - -(let [elt (js/document.getElementById "evalMe") - txt (.-innerText elt) - mod-symbol (if (mac?) - "⌘" - "⌃") - txt (str txt " " mod-symbol"-⏎")] - (set! (.-innerHTML elt) txt)) - -(eval-me) diff --git a/resources/public/cljs/nrepl_playground.cljs b/resources/public/cljs/nrepl_playground.cljs deleted file mode 100644 index 2c71307..0000000 --- a/resources/public/cljs/nrepl_playground.cljs +++ /dev/null @@ -1,15 +0,0 @@ -(ns nrepl-playground) - -(+ 1 2 3) - -(-> - (js/document.getElementsByTagName "body") - first - (.append - (doto (js/document.createElement "p") - (.append - (js/document.createTextNode "there"))))) - -(defn foo []) - -(js/alert "Isn't this cool? :)") diff --git a/resources/public/cljs/replicant_tictactoe/core.cljs b/resources/public/cljs/replicant_tictactoe/core.cljs deleted file mode 100644 index b5ad81f..0000000 --- a/resources/public/cljs/replicant_tictactoe/core.cljs +++ /dev/null @@ -1,33 +0,0 @@ -;; COPIED FROM https://github.com/cjohansen/replicant-tic-tac-toe/blob/7a33fb12f0cd6658b2f555ff673dee031d4aa921/src/tic_tac_toe/core.cljs - -(ns replicant-tictactoe.core - (:require [replicant.dom :as r] - [replicant-tictactoe.game :as game] - [replicant-tictactoe.ui :as ui])) - -(defn start-new-game [store] - (reset! store (game/create-game {:size 3}))) - -(defn main [] - ;; Set up the atom - (let [store (atom nil) - el (js/document.getElementById "app")] - - ;; Globally handle DOM events - (r/set-dispatch! - (fn [_ [action & args]] - (case action - :tic (apply swap! store game/tic args) - :reset (start-new-game store)))) - - ;; Render on every change - (add-watch store ::render - (fn [_ _ _ game] - (->> (ui/game->ui-data game) - ui/render-game - (r/render el)))) - - ;; Trigger the first render by initializing the game. - (start-new-game store))) - -(main) diff --git a/resources/public/cljs/replicant_tictactoe/game.cljs b/resources/public/cljs/replicant_tictactoe/game.cljs deleted file mode 100644 index 9296baf..0000000 --- a/resources/public/cljs/replicant_tictactoe/game.cljs +++ /dev/null @@ -1,44 +0,0 @@ -;; COPIED FROM https://github.com/cjohansen/replicant-tic-tac-toe/blob/7a33fb12f0cd6658b2f555ff673dee031d4aa921/src/tic_tac_toe/game.cljs - -(ns replicant-tictactoe.game) - -(defn create-game [{:keys [size]}] - {:next-player :x - :size size}) - -(def next-player {:x :o, :o :x}) - -(defn winner? [tics path] - (when (= 1 (count (set (map tics path)))) - path)) - -(defn get-winning-path [{:keys [size tics]} y x] - (let [flip-y (fn [y] (- size 1 y))] - (or (winner? tics (mapv #(vector y %) (range 0 size))) - (winner? tics (mapv #(vector % x) (range 0 size))) - (when (= y x) - (winner? tics (mapv #(vector % %) (range 0 size)))) - (when (= (flip-y y) x) - (winner? tics (mapv #(vector (flip-y %) %) (range 0 size))))))) - -(defn maybe-conclude [game y x] - (if-let [path (get-winning-path game y x)] - (-> (dissoc game :next-player) - (assoc :over? true - :victory {:player (get-in game [:tics [y x]]) - :path path})) - (let [tie? (= (count (:tics game)) (* (:size game) (:size game)))] - (cond-> game - tie? (dissoc :next-player) - tie? (assoc :over? true))))) - -(defn tic [game y x] - (let [player (:next-player game)] - (if (or (get-in game [:tics [y x]]) - (<= (:size game) x) - (<= (:size game) y)) - game - (-> game - (assoc-in [:tics [y x]] player) - (assoc :next-player (next-player player)) - (maybe-conclude y x))))) \ No newline at end of file diff --git a/resources/public/cljs/replicant_tictactoe/style.css b/resources/public/cljs/replicant_tictactoe/style.css deleted file mode 100644 index 7ec052a..0000000 --- a/resources/public/cljs/replicant_tictactoe/style.css +++ /dev/null @@ -1,50 +0,0 @@ -/* COPIED from https://github.com/cjohansen/replicant-tic-tac-toe/blob/7a33fb12f0cd6658b2f555ff673dee031d4aa921/resources/public/styles.css */ -.cell { - aspect-ratio: 1 / 1; - background: rgba(255, 255, 255, 0.8); - border-radius: 6%; - border: none; - display: block; - flex: 1 1 0%; - outline: none; - position: relative; - width: 100%; -} - -.cell-content { - opacity: 1; - transition: opacity 0.25s; -} - -.transparent { - opacity: 0; -} - -.cell-dim { - background: rgba(249, 249, 240, 0.3); -} - -.cell-highlight { - background: #fcfcf3; -} - -.clickable { - cursor: pointer; -} - -.board { - --gap: 0.75rem; - background: #833ab4; - background: linear-gradient(90deg, #833ab4 0%, #fd1d1d 50%, #fcb045 100%); - display: flex; - flex-direction: column; - gap: var(--gap); - padding: var(--gap); - max-width: 80vh; -} - -.row { - display: flex; - flex-direction: row; - gap: var(--gap); -} \ No newline at end of file diff --git a/resources/public/cljs/replicant_tictactoe/ui.cljs b/resources/public/cljs/replicant_tictactoe/ui.cljs deleted file mode 100644 index c53dc65..0000000 --- a/resources/public/cljs/replicant_tictactoe/ui.cljs +++ /dev/null @@ -1,75 +0,0 @@ -;; COPIED FROM https://github.com/cjohansen/replicant-tic-tac-toe/blob/7a33fb12f0cd6658b2f555ff673dee031d4aa921/src/tic_tac_toe/ui.cljs - -(ns replicant-tictactoe.ui) - -(def mark-x - [:svg {:xmlns "http://www.w3.org/2000/svg" - :viewBox "0 -10 108 100"} - [:path - {:fill "currentColor" - :d "m1.753 69.19.36-1.08q.35-1.09 1.92-2.97 1.58-1.87 3.85-3.84 2.29-1.97 4.6-3.54 2.31-1.57 4.93-3.24 2.62-1.66 4.65-2.9 2.04-1.23 3.91-2.27 1.87-1.05 3.98-2.31 2.11-1.27 4.12-2.5 2.01-1.24 4.33-2.51l4.6-2.52q2.27-1.25 4.84-2.86 2.56-1.62 5.03-3.09 2.47-1.47 4.5-2.88 2.03-1.4 3.82-2.82t3.81-3.47q2.01-2.06 3.7-3.51 1.69-1.46 3.47-3.03 1.77-1.57 4.01-3.69 2.24-2.11 4.13-3.7 1.89-1.58 3.93-2.97 2.04-1.39 4.05-2.49 2.01-1.11 5.26-2.54 3.24-1.44 4.48-1.46 1.24-.01 2.42.37 1.18.37 2.18 1.11 1 .74 1.71 1.75.71 1.02 1.06 2.21.34 1.19.3 2.43-.05 1.24-.5 2.39-.44 1.16-1.23 2.12-.79.95-1.84 1.61-1.05.65-2.26.94-1.21.28-2.44.16-1.23-.11-2.37-.62-1.13-.5-2.04-1.34-.91-.84-1.51-1.93-.6-1.08-.81-2.3-.22-1.22-.04-2.45.18-1.23.75-2.33.56-1.1 1.45-1.97.89-.86 2.01-1.4 1.11-.54 2.35-.69 1.23-.15 2.44.1t2.29.87q1.07.63 1.88 1.56.82.93 1.29 2.08.48 1.14.56 2.38.09 1.24-.23 2.44-.31 1.19-.99 2.23-.68 1.04-1.66 1.8-.98.76-2.15 1.18l-1.16.41-2.28 1.17q-2.28 1.18-4.38 2.7-2.1 1.51-4.2 3.44-2.1 1.92-4.18 3.7-2.08 1.77-3.9 3.44-1.81 1.68-3.41 3.13-1.6 1.46-3.38 3.09-1.79 1.62-3.44 2.97-1.66 1.34-3.53 2.4-1.88 1.06-4.17 2.65-2.3 1.6-4.79 2.74-2.48 1.14-4.98 2.71-2.5 1.57-4.51 2.47-2.01.9-3.99 1.87-1.98.97-3.88 2.02-1.91 1.05-4.38 2.34-2.46 1.28-4.94 2.53-2.47 1.25-4.48 2.38-2 1.12-3.96 2.14-1.95 1.01-3.83 1.99-1.89.98-4.37 2.05-2.48 1.06-2.96 2.01-.48.96-.78 1.49-.3.53-.71.97-.41.44-.92.77-.51.34-1.09.54-.57.2-1.17.25-.6.06-1.2-.03t-1.16-.32q-.56-.23-1.05-.59-.49-.35-.89-.82-.39-.46-.65-1.01-.27-.54-.4-1.14-.13-.59-.12-1.19.02-.6.18-1.19l.16-.59Z"}] - [:path - {:fill "currentColor" - :d "m28.099 4.991 2.69 1.97q2.69 1.96 4.5 3.22 1.8 1.28 4.54 3.46 2.74 2.18 4.57 3.89t3.38 3.72q1.54 2.02 2.88 4.3 1.34 2.28 2.83 4.46 1.48 2.18 2.63 4.14 1.15 1.96 2.74 4.07 1.59 2.1 3.59 4.19 1.99 2.08 4.23 4.48 2.24 2.4 3.7 4.04 1.47 1.64 2.91 3.23 1.44 1.59 3.08 3.58 1.64 1.99 3.51 4.08 1.87 2.09 3.55 3.77 1.69 1.68 4.1 3.51 2.42 1.83 3.9 2.58 1.48.74 2.14 1.34.66.6 1.15 1.33.5.74.8 1.57.31.84.4 1.72.1.88-.02 1.76-.12.88-.44 1.71-.33.82-.84 1.55-.51.72-1.19 1.3-.67.58-1.46.98-.79.41-1.65.61-.87.2-1.76.19-.88-.01-1.74-.24-.86-.22-1.64-.64-.78-.42-2.27-2.72-1.48-2.3-1.52-3.49-.03-1.19.31-2.33.35-1.14 1.04-2.11.69-.97 1.66-1.67.96-.7 2.1-1.05 1.14-.35 2.33-.32 1.19.02 2.31.43t2.05 1.15q.93.75 1.58 1.75.64 1 .93 2.15.29 1.16.2 2.35-.09 1.18-.56 2.28-.47 1.1-1.26 1.99-.79.88-1.83 1.47t-2.2.82q-1.17.23-2.35.07-1.19-.16-2.25-.68-1.07-.53-1.92-1.37-.84-.84-1.37-1.9-.54-1.07-.7-2.25-.17-1.18.06-2.35.22-1.17.8-2.21.58-1.04 1.47-1.84.88-.79 1.98-1.27 1.09-.47 2.28-.57 1.18-.1 2.34.18 1.16.29 2.16.93 1.01.63 1.76 1.56.74.93-.33-.26-1.07-1.18-.41-.58.66.59 1.15 1.33.5.74.8 1.57.31.83.4 1.72.1.88-.02 1.76-.12.88-.44 1.7-.33.83-.84 1.55-.51.73-1.19 1.31-.67.58-1.46.98-.79.41-1.65.61-.87.2-1.75.19-.89-.01-1.75-.24-.86-.22-1.64-.64-.78-.42-2.73-1.57-1.95-1.14-4.26-2.95-2.31-1.8-3.87-3.43-1.57-1.62-3.17-3.29-1.6-1.66-3.55-4.05-1.95-2.39-3.33-4.15-1.39-1.76-2.77-3.4-1.38-1.64-3.07-3.56-1.7-1.91-3.91-4.13-2.2-2.22-3.74-4.1-1.54-1.88-2.79-3.75-1.24-1.87-2.4-4.33t-2.39-4.46q-1.23-2.01-2.4-4.59-1.17-2.59-2.53-5.01-1.36-2.43-3.35-4.44-1.99-2.02-4.52-4.27-2.54-2.25-5.33-4.04-2.81-1.79-3.28-2.21-.47-.41-.83-.92-.35-.51-.58-1.1-.22-.58-.3-1.2-.08-.62-.01-1.23.08-.62.29-1.21.22-.58.58-1.1.35-.51.81-.93.47-.42 1.02-.71t1.16-.45q.61-.15 1.23-.15t1.22.14q.61.15 1.17.44l.55.28Z"}]]) - -(def mark-o - [:svg {:xmlns "http://www.w3.org/2000/svg" - :viewBox "0 0 114 114"} - [:path - {:fill "none" - :stroke "currentColor" - :stroke-linecap "round" - :stroke-width "6" - :d "M74.616 8.935c7.73 2.38 15.96 9.34 21.58 16.04 5.63 6.69 10.57 15.46 12.18 24.11 1.6 8.65.74 19.67-2.53 27.77-3.27 8.11-10.12 15.37-17.09 20.88-6.98 5.51-16.07 10.81-24.76 12.17-8.7 1.35-19.32-.76-27.42-4.06-8.1-3.29-15.73-8.93-21.21-15.73-5.48-6.81-10.32-16.5-11.67-25.09-1.35-8.6.19-18.39 3.57-26.51 3.38-8.11 9.99-16.6 16.71-22.19 6.72-5.59 13.95-10.52 23.63-11.36 9.68-.84 28.04 4.34 34.45 6.32 6.42 1.97 4.37 4.6 4.04 5.55m-48.33-9.69c7.65-3.32 19.78-3.63 28.63-2.01 8.86 1.63 17.85 5.89 24.49 11.76 6.64 5.87 12.7 15.08 15.37 23.48 2.67 8.41 2.5 18.4.65 26.95-1.85 8.54-5.98 17.59-11.77 24.34-5.78 6.74-14.56 13.05-22.93 16.11-8.37 3.06-18.75 4.19-27.29 2.25-8.54-1.93-17.37-7.89-23.96-13.87-6.59-5.97-12.89-13.58-15.57-21.96-2.69-8.39-2.31-19.94-.56-28.34 1.75-8.4 5.21-15.74 11.06-22.09 5.85-6.35 19.92-13.32 24.04-16.01 4.12-2.7.37-1.1.67-.16"}]]) - -(defn render-cell [{:keys [content on-click dim? highlight? clickable?]}] - [:button.cell - {:on {:click on-click} - :class (cond-> [] - dim? (conj "cell-dim") - highlight? (conj "cell-highlight") - clickable? (conj "clickable"))} - (when content - [:div.cell-content - {:replicant/mounting {:class "transparent"} - :replicant/unmounting {:class "transparent"}} - content])]) - -(defn render-board [{:keys [rows]}] - [:div.board - (for [row rows] - [:div.row - (for [cell row] - (render-cell cell))])]) - -(defn render-game [{:keys [board button]}] - [:div - (render-board board) - (when button - [:button {:on {:click (:on-click button)} - :style {:margin-top 20 - :font-size 20}} - (:text button)])]) - -(def player->mark - {:x mark-x - :o mark-o}) - -(defn game->ui-data [{:keys [size tics victory over?]}] - (let [highlight? (set (:path victory))] - {:button (when over? - {:text "Start over" - :on-click [:reset]}) - :board - {:rows - (for [y (range size)] - (for [x (range size)] - (if-let [player (get tics [y x])] - (let [victorious? (highlight? [y x])] - (cond-> {:content (player->mark player)} - victorious? (assoc :highlight? true) - (and over? (not victorious?)) (assoc :dim? true))) - (if over? - {:dim? true} - {:clickable? true - :on-click [:tic y x]}))))}})) \ No newline at end of file diff --git a/resources/public/codemirror.html b/resources/public/codemirror.html deleted file mode 100644 index 800624b..0000000 --- a/resources/public/codemirror.html +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - -

Using @nextjournal/lang-clojure directly from npm in HTML!

-
-
-
-
- - - diff --git a/resources/public/html/cljs-ajax.html b/resources/public/html/cljs-ajax.html index d7a785b..d2e1b00 100644 --- a/resources/public/html/cljs-ajax.html +++ b/resources/public/html/cljs-ajax.html @@ -1,7 +1,7 @@ - - + + + - - + + diff --git a/resources/public/html/reagent.html b/resources/public/html/reagent.html index abb68e3..4e14aa0 100644 --- a/resources/public/html/reagent.html +++ b/resources/public/html/reagent.html @@ -1,9 +1,9 @@ - - - - + + + + - - + + - - - @@ -75,21 +60,27 @@
-
+

Scittle

What is this?

This project exposes the Small Clojure Interpreter in the - browser in such a way that you can use it with the script tag.

+ browser in such a way that you can use it with the script tag.

+

Project status

+

+ This project is still experimental and breaking changes may + happen. Feedback is welcome + on Github.

+

+ To use scittle on your own site, it is recommended to use the links + published to + the releases + page. +

Usage

- To embed scittle in your website, it is recommended to use the links - published to - the releases - page. - Include scittle.js and write a script tag where type is set to application/x-scittle. @@ -105,7 +96,7 @@ When you have a file on your server, say cljs/script.cljs, you can load it using the src attribute: 

-        <script src="cljs/script.cljs" type="application/x-scittle"></script>
+<script src="cljs/script.cljs" type="application/x-scittle"></script>
@@ -121,14 +112,6 @@
- - -

Re-frame plugin

- - To enable re-frame, - in addition to the files needed for reagent, you need to include scittle.re-frame.js. - Also see the codemirror playground. -

Cljs-ajax plugin

@@ -141,41 +124,9 @@ Click me! - -

cljs.pprint plugin

To - enable cljs.pprint, in - addition to scittle.js, you need to - include scittle.pprint.js. - - -

Target :scittle in cljc

- You can target scittle in .cljc files (use a script tag to include the cljc file) with the :scittle reader conditional like this:
- - 

-    #?(:scittle
-       (js/console.log "In scittle")
-       :org.babashka/nbb
-       (js/console.log "In nbb")
-       :cljs
-       (js/console.log "In cljs"))
-
- - -

JS libraries

- - To use JavaScript libraries with Scittle, - see README.md - - -

REPL

- - To connect to a REPL with Scittle, - see README.md -

Examples

diff --git a/resources/public/index_text.html b/resources/public/index_text.html deleted file mode 100644 index c5e58c0..0000000 --- a/resources/public/index_text.html +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - diff --git a/resources/public/nrepl.html b/resources/public/nrepl.html deleted file mode 100644 index f7e903d..0000000 --- a/resources/public/nrepl.html +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - -

Scittle

-

What is this?

- - diff --git a/resources/public/replicant_tictactoe.html b/resources/public/replicant_tictactoe.html deleted file mode 100644 index 1f52895..0000000 --- a/resources/public/replicant_tictactoe.html +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - -

Scittle tic-tac-toe built with Replicant

-

What is Scittle?

-

Read the main page for more details.

-

The game

-
-

The following source was loaded and interpreted - from cljs/replicant_tictactoe/core.cljs using the - script tag: - 


-<script type="application/x-scittle" src="cljs/replicant_tictactoe/ui.cljs"></script>
-<script type="application/x-scittle" src="cljs/replicant_tictactoe/game.cljs"></script>
-<script type="application/x-scittle" src="cljs/replicant_tictactoe/core.cljs"></script>
-
-
-

-
- - - diff --git a/resources/public/test/codemirror.html b/resources/public/test/codemirror.html deleted file mode 100644 index 8bf8299..0000000 --- a/resources/public/test/codemirror.html +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - - - - - - -

Using @nextjournal/lang-clojure directly from npm in HTML!

-
-
-
-
- - - diff --git a/resources/public/tictactoe.html b/resources/public/tictactoe.html index 4462881..5b62e74 100644 --- a/resources/public/tictactoe.html +++ b/resources/public/tictactoe.html @@ -3,8 +3,9 @@ - - + + + diff --git a/script/changelog.clj b/script/changelog.clj deleted file mode 100755 index 1ef014a..0000000 --- a/script/changelog.clj +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env bb - -(ns changelog - (:require [clojure.string :as str])) - -(let [changelog (slurp "CHANGELOG.md") - replaced (str/replace changelog - #" #(\d+)" - (fn [[_ issue after]] - (format " [#%s](https://github.com/babashka/scittle/issues/%s)%s" - issue issue (str after)))) - replaced (str/replace replaced - #"@([a-zA-Z0-9-_]+)([, \.)])" - (fn [[_ name after]] - (format "[@%s](https://github.com/%s)%s" - name name after)))] - (spit "CHANGELOG.md" replaced)) diff --git a/script/release.clj b/script/release.clj index 4835975..00a2396 100755 --- a/script/release.clj +++ b/script/release.clj @@ -3,8 +3,6 @@ (require '[babashka.fs :as fs] '[babashka.tasks :refer [shell]]) -(fs/create-dirs "gh-pages") - (fs/copy "resources/public/index.html" "gh-pages" {:replace-existing true}) @@ -23,12 +21,6 @@ (fs/copy "resources/public/disable_auto_eval.html" "gh-pages" {:replace-existing true}) -(fs/copy "resources/public/codemirror.html" "gh-pages" - {:replace-existing true}) - -(fs/copy "resources/public/replicant_tictactoe.html" "gh-pages" - {:replace-existing true}) - (def html-source-dir (fs/file "resources" "public" "html")) (def html-target-dir (fs/file "gh-pages" "html")) (fs/create-dirs html-target-dir) @@ -65,9 +57,6 @@ {:replace-existing true})) (fs/glob cljs-source-dir "*.cljs")) -(println "Copying dir resources/public/cljs/replicant_tictactoe") -(fs/copy-tree (fs/file cljs-source-dir "replicant_tictactoe") (fs/file cljs-target-dir "replicant_tictactoe") {:replace-existing true}) - (run! (fn [f] (println "Copying" (str f)) (fs/copy f diff --git a/shadow-cljs.edn b/shadow-cljs.edn index 4b0d654..ff3946c 100644 --- a/shadow-cljs.edn +++ b/shadow-cljs.edn @@ -6,14 +6,7 @@ :builds {:main - {;:compiler-options {:source-map true} - ;; for dev build - #_#_ - :compiler-options {:optimizations :simple - :pretty-print true - :pseudo-names true - :source-map true} - :target :browser + {:target :browser :js-options {:resolve {"react" {:target :global :global "React"} @@ -21,24 +14,10 @@ :global "ReactDOM"}}} :modules {:scittle {:entries [scittle.core]} - :scittle.nrepl {:entries [scittle.nrepl] - :depends-on #{:scittle}} - :scittle.promesa {:entries [scittle.promesa] - :depends-on #{:scittle}} - :scittle.js-interop {:entries [scittle.js-interop] - :depends-on #{:scittle}} - :scittle.pprint {:entries [scittle.pprint] - :depends-on #{:scittle}} :scittle.reagent {:entries [scittle.reagent] :depends-on #{:scittle}} - :scittle.replicant {:entries [scittle.replicant] - :depends-on #{:scittle}} - :scittle.re-frame {:entries [scittle.re-frame] - :depends-on #{:scittle.reagent - :scittle}} :scittle.cljs-ajax {:entries [scittle.cljs-ajax] :depends-on #{:scittle}}} :build-hooks [(shadow.cljs.build-report/hook)] - :output-dir "resources/public/js" ;; + "/dev" for dev build - :devtools {:repl-pprint true} - }}} + :output-dir "resources/public/js" + :devtools {:repl-pprint true}}}} diff --git a/src/scittle/cljs_ajax.cljs b/src/scittle/cljs_ajax.cljs index 8d1df17..a129e6e 100644 --- a/src/scittle/cljs_ajax.cljs +++ b/src/scittle/cljs_ajax.cljs @@ -1,12 +1,13 @@ (ns scittle.cljs-ajax - (:require [ajax.core] + (:require [ajax.core :as ajx] [sci.core :as sci] [scittle.core :as scittle])) (def ans (sci/create-ns 'ajax.core nil)) (def ajax-namespace - (sci/copy-ns ajax.core ans)) + {'GET (sci/copy-var ajx/GET ans) + 'POST (sci/copy-var ajx/POST ans)}) (scittle/register-plugin! ::ajax diff --git a/src/scittle/cljs_devtools.cljs b/src/scittle/cljs_devtools.cljs deleted file mode 100644 index cbe2082..0000000 --- a/src/scittle/cljs_devtools.cljs +++ /dev/null @@ -1,6 +0,0 @@ -(ns scittle.cljs-devtools - (:require [devtools.core :as devtools])) - -(devtools/set-pref! :disable-advanced-mode-check true) - -(devtools/install!) diff --git a/src/scittle/core.cljs b/src/scittle/core.cljs index c603d9c..feff374 100644 --- a/src/scittle/core.cljs +++ b/src/scittle/core.cljs @@ -2,19 +2,10 @@ (:refer-clojure :exclude [time]) (:require [cljs.reader :refer [read-string]] [goog.object :as gobject] - [goog.string :as gstring] - [goog.string.format] + [goog.string] [sci.core :as sci] - [sci.ctx-store :as store] - [sci.impl.unrestrict] [scittle.impl.common :refer [cljns]] - [scittle.impl.error :as error] - [clojure.string :as str])) - -(set! sci.impl.unrestrict/*unrestricted* true) - -;; make document conditional -(def ^js doc js/globalThis.document) + [scittle.impl.error :as error])) (clojure.core/defmacro time "Evaluates expr and prints the time it took. Returns the value of expr." @@ -33,97 +24,54 @@ {'clojure.core {'time (sci/copy-var time cljns) 'system-time (sci/copy-var system-time cljns) - 'random-uuid (sci/copy-var random-uuid cljns) - 'read-string (sci/copy-var read-string cljns) - 'update-keys (sci/copy-var update-keys cljns) - 'update-vals (sci/copy-var update-vals cljns) - 'parse-boolean (sci/copy-var parse-boolean cljns) - 'parse-double (sci/copy-var parse-double cljns) - 'parse-long (sci/copy-var parse-long cljns) - 'parse-uuid (sci/copy-var parse-uuid cljns) - 'NaN? (sci/copy-var NaN? cljns) - 'infinite? (sci/copy-var infinite? cljns) - 'iteration (sci/copy-var iteration cljns) - 'abs (sci/copy-var abs cljns) - 'Cons cljs.core/Cons} + 'random-uuid random-uuid + 'read-string (sci/copy-var read-string rns)} 'goog.object {'set gobject/set - 'get gobject/get} - 'goog.string {'format gstring/format - 'htmlEscape gstring/htmlEscape} - 'goog.string.format {} ;; For cljs compatibility - 'sci.core {'stacktrace sci/stacktrace - 'format-stacktrace sci/format-stacktrace}}) + 'get gobject/get}}) -(defn load-fn [{:keys [ctx] :as opts}] - (when-let [lib (and (string? (:namespace opts)) - (gobject/get js/globalThis (:namespace opts)))] - (sci/add-js-lib! ctx (:namespace opts) lib))) - -(store/reset-ctx! - (sci/init {:namespaces namespaces - :classes {'js js/globalThis - :allow :all - 'Math js/Math} - :ns-aliases {'clojure.pprint 'cljs.pprint} - :features #{:scittle :cljs} - :load-fn load-fn})) - -(unchecked-set js/globalThis "import" (js/eval "(x) => import(x)")) - -(def !last-ns (volatile! @sci/ns)) - -(defn- -eval-string [s] - (sci/binding [sci/ns @!last-ns] - (let [rdr (sci/reader s)] - (loop [res nil] - (let [form (sci/parse-next (store/get-ctx) rdr)] - (if (= :sci.core/eof form) - (do - (vreset! !last-ns @sci/ns) - res) - (recur (sci/eval-form (store/get-ctx) form)))))))) +(def ctx (atom (sci/init {:namespaces namespaces + :classes {'js js/window + :allow :all} + :disable-arity-checks true}))) (defn ^:export eval-string [s] - (try (-eval-string s) + (try (sci/eval-string* @ctx s) (catch :default e - (error/error-handler e (:src (store/get-ctx))) - (throw e)))) + (error/error-handler e (:src @ctx)) + (let [sci-error? (isa? (:type (ex-data e)) :sci/error)] + (throw (if sci-error? + (or (ex-cause e) e) + e)))))) -(defn register-plugin! [_plug-in-name sci-opts] - (store/swap-ctx! sci/merge-opts sci-opts)) +(defn register-plugin! [plug-in-name sci-opts] + plug-in-name ;; unused for now + (swap! ctx sci/merge-opts sci-opts)) (defn- eval-script-tags* [script-tags] (when-let [tag (first script-tags)] - (if-let [src (.getAttribute tag "src")] - (let [req (js/XMLHttpRequest.) + (if-let [text (not-empty (gobject/get tag "textContent"))] + (let [scittle-id (str (gensym "scittle-tag-"))] + (gobject/set tag "scittle_id" scittle-id) + (swap! ctx assoc-in [:src scittle-id] text) + (sci/binding [sci/file scittle-id] + (eval-string text)) + (eval-script-tags* (rest script-tags))) + (let [src (.getAttribute tag "src") + req (js/XMLHttpRequest.) _ (.open req "GET" src true) _ (gobject/set req "onload" (fn [] (this-as this (let [response (gobject/get this "response")] (gobject/set tag "scittle_id" src) ;; save source for error messages - (store/swap-ctx! assoc-in [:src src] response) + (swap! ctx assoc-in [:src src] response) (sci/binding [sci/file src] (eval-string response))) (eval-script-tags* (rest script-tags)))))] - (.send req)) - (if-let [text (not-empty (str/trim (gobject/get tag "textContent")))] - (let [scittle-id (str (gensym "scittle-tag-"))] - (gobject/set tag "scittle_id" scittle-id) - (store/swap-ctx! assoc-in [:src scittle-id] text) - (sci/binding [sci/file scittle-id] - (eval-string text)) - (eval-script-tags* (rest script-tags))) - (eval-script-tags* (rest script-tags)))))) + (.send req))))) -(defn ^:export eval-script-tags [& [script-tags]] - (let [script-tags (or script-tags - (.querySelectorAll - doc "script[type='application/x-scittle']")) - script-tags (if (or (coll? script-tags) - (aget script-tags "length")) - script-tags - [script-tags])] +(defn ^:export eval-script-tags [] + (let [script-tags (js/document.querySelectorAll "script[type='application/x-scittle']")] (eval-script-tags* script-tags))) (def auto-load-disabled? (volatile! false)) @@ -135,10 +83,9 @@ [] (vreset! auto-load-disabled? true)) -(when doc - (.addEventListener doc - "DOMContentLoaded" - (fn [] (when-not @auto-load-disabled? (eval-script-tags))), false)) +(js/document.addEventListener + "DOMContentLoaded" + (fn [] (when-not @auto-load-disabled? (eval-script-tags))), false) (enable-console-print!) (sci/alter-var-root sci/print-fn (constantly *print-fn*)) diff --git a/src/scittle/impl/error.cljs b/src/scittle/impl/error.cljs index b5edb4e..f899fc2 100644 --- a/src/scittle/impl/error.cljs +++ b/src/scittle/impl/error.cljs @@ -69,8 +69,8 @@ (when-let [m (.-message e)] (println (str "Message: " m))) (when-let [d (ex-data (ex-cause e) #_(.getCause e))] - (println (str "Data: ") - (pr-str d))) + (print (str "Data: ")) + (prn d)) (let [{:keys [:file :line :column]} d] (when line (println (str "Location: " diff --git a/src/scittle/js_interop.cljs b/src/scittle/js_interop.cljs deleted file mode 100644 index 603b565..0000000 --- a/src/scittle/js_interop.cljs +++ /dev/null @@ -1,8 +0,0 @@ -(ns scittle.js-interop - (:require - [sci.configs.applied-science.js-interop :as j] - [scittle.core :as scittle])) - -(scittle/register-plugin! - ::js-interop - j/config) diff --git a/src/scittle/nrepl.cljs b/src/scittle/nrepl.cljs deleted file mode 100644 index ec4c38c..0000000 --- a/src/scittle/nrepl.cljs +++ /dev/null @@ -1,21 +0,0 @@ -(ns scittle.nrepl - (:require - [clojure.edn :as edn] - [sci.nrepl.server :as nrepl-server])) - -(defn ws-url [host port path] - (str "ws://" host ":" port "/" path)) - -(when-let [ws-port (.-SCITTLE_NREPL_WEBSOCKET_PORT js/window)] - (set! (.-ws_nrepl js/window) - (new js/WebSocket (ws-url (or (.-SCITTLE_NREPL_WEBSOCKET_HOST js/window) - (.-hostname (.-location js/window))) - ws-port "_nrepl")))) - -(when-let [ws (nrepl-server/nrepl-websocket)] - (set! (.-onmessage ws) - (fn [event] - (nrepl-server/handle-nrepl-message (edn/read-string (.-data event))))) - (set! (.-onerror ws) - (fn [event] - (js/console.log event)))) diff --git a/src/scittle/pprint.cljs b/src/scittle/pprint.cljs deleted file mode 100644 index c4d1209..0000000 --- a/src/scittle/pprint.cljs +++ /dev/null @@ -1,8 +0,0 @@ -(ns scittle.pprint - (:require - [sci.configs.cljs.pprint :refer [config]] - [scittle.core :as scittle])) - -(scittle/register-plugin! - ::pprint - config) diff --git a/src/scittle/promesa.cljs b/src/scittle/promesa.cljs deleted file mode 100644 index 73c6325..0000000 --- a/src/scittle/promesa.cljs +++ /dev/null @@ -1,8 +0,0 @@ -(ns scittle.promesa - (:require - [sci.configs.funcool.promesa :as p] - [scittle.core :as scittle])) - -(scittle/register-plugin! - ::promesa - p/config) diff --git a/src/scittle/re_frame.cljs b/src/scittle/re_frame.cljs deleted file mode 100644 index 39e219e..0000000 --- a/src/scittle/re_frame.cljs +++ /dev/null @@ -1,8 +0,0 @@ -(ns scittle.re-frame - (:require - [sci.configs.re-frame.re-frame :as rf] - [scittle.core :as scittle])) - -(scittle/register-plugin! - ::re-frame - rf/config) diff --git a/src/scittle/reagent.cljs b/src/scittle/reagent.cljs index 6354ef7..57448d2 100644 --- a/src/scittle/reagent.cljs +++ b/src/scittle/reagent.cljs @@ -1,10 +1,106 @@ (ns scittle.reagent - (:require - [reagent.dom :as rdom] - [sci.configs.reagent.reagent :refer [reagent-debug-namespace - reagent-namespace reagent-ratom-namespace]] - [sci.core :as sci] - [scittle.core :as scittle])) + (:require [reagent.core :as r] + [reagent.debug :as d :refer-macros [dev?]] + [reagent.dom :as rdom] + [reagent.ratom :as ratom] + [sci.core :as sci] + [scittle.core :as scittle])) + +;; The with-let macro from reagent.core. The only change is that the +;; interop/unchecked-aget+set were replaced by aget and aset. +(defn ^:macro with-let [_ _ bindings & body] + (assert (vector? bindings) + (str "with-let bindings must be a vector, not " + (pr-str bindings))) + (let [v (gensym "with-let") + k (keyword v) + init (gensym "init") + ;; V is a reaction, which holds a JS array. + ;; If the array is empty, initialize values and store to the + ;; array, using binding index % 2 to access the array. + ;; After init, the bindings are just bound to the values in the array. + bs (into [init `(zero? (alength ~v))] + (map-indexed (fn [i x] + (if (even? i) + x + (let [j (quot i 2)] + ;; Issue 525 + ;; If binding value is not yet set, + ;; try setting it again. This should + ;; also throw errors for each render + ;; and prevent the body being called + ;; if bindings throw errors. + `(if (or ~init + (not (.hasOwnProperty ~v ~j))) + (aset ~v ~j ~x) + (aget ~v ~j))))) + bindings)) + [forms destroy] (let [fin (last body)] + (if (and (list? fin) + (= 'finally (first fin))) + [(butlast body) `(fn [] ~@(rest fin))] + [body nil])) + add-destroy (when destroy + (list + `(let [destroy# ~destroy] + (if (reagent.ratom/reactive?) + (when (nil? (.-destroy ~v)) + (set! (.-destroy ~v) destroy#)) + (destroy#))))) + asserting (dev?) #_(if *assert* true false) + res (gensym "res")] + `(let [~v (reagent.ratom/with-let-values ~k)] + ~(when asserting + `(when-some [c# (reagent.ratom/-ratom-context)] + (when (== (.-generation ~v) (.-ratomGeneration c#)) + (d/error "Warning: The same with-let is being used more " + "than once in the same reactive context.")) + (set! (.-generation ~v) (.-ratomGeneration c#)))) + (let ~(into bs [res `(do ~@forms)]) + ~@add-destroy + ~res)))) + +(def rns (sci/create-ns 'reagent.core nil)) + +(def reagent-namespace + {'atom (sci/copy-var r/atom rns) + 'as-element (sci/copy-var r/as-element rns) + 'with-let (sci/copy-var with-let rns) + 'cursor (sci/copy-var r/cursor rns) + 'create-class (sci/copy-var r/create-class rns) + 'create-compiler (sci/copy-var r/create-compiler rns)}) + +(def rtmns (sci/create-ns 'reagent.ratom nil)) + +(defn -ratom-context + "Read-only access to the ratom context." + [] + ratom/*ratom-context*) + +(def reagent-ratom-namespace + {'with-let-values (sci/copy-var ratom/with-let-values rtmns) + 'reactive? (sci/copy-var ratom/reactive? rtmns) + '-ratom-context (sci/copy-var -ratom-context rtmns)}) + +(def rdbgns (sci/create-ns 'reagent.debug nil)) + +(defn -tracking? [] + reagent.debug/tracking) + +(defn ^:macro error + "Print with console.error." + [_ _ & forms] + (when *assert* + `(when (some? js/console) + (.error (if (reagent.debug/-tracking?) + reagent.debug/track-console + js/console) + (str ~@forms))))) + +(def reagent-debug-namespace + {'error (sci/copy-var error rdbgns) + '-tracking? (sci/copy-var -tracking? rdbgns) + 'track-console (sci/copy-var d/track-console rdbgns)}) (def rdns (sci/create-ns 'reagent.dom nil)) diff --git a/src/scittle/replicant.cljs b/src/scittle/replicant.cljs deleted file mode 100644 index b1c9c7a..0000000 --- a/src/scittle/replicant.cljs +++ /dev/null @@ -1,8 +0,0 @@ -(ns scittle.replicant - (:require - [sci.configs.cjohansen.replicant :refer [config]] - [scittle.core :as scittle])) - -(scittle/register-plugin! - ::replicant - config)