Cleanup

* Test coverage is around 100%
* JS bundle now 177K size
* More detailed exceptions
* Stable parser

Author: DeLaGuardo

.circleci/config.yml

@@ -29,7 +29,7 @@ jobs:
           name: Test with clojure 1.9
           type: shell
           command: |
-            clojure -A:with-optional-deps:test:coverage
+            clojure -A:test:coverage
             bash <(curl -s https://codecov.io/bash)
 
       - save_cache:
@@ -51,7 +51,7 @@ jobs:
           name: Test with clojure 1.10-master
           type: shell
           command: |
-            clojure -A:with-optional-deps:master:test:clj-runner
+            clojure -A:master:test:clj-runner
 
       - save_cache:
           paths:
@@ -80,7 +80,7 @@ jobs:
           name: Test clojurescript
           type: shell
           command: |
-            clojure -A:cljs:with-optional-deps:test:cljs-runner
+            clojure -A:cljs:test:cljs-runner
 
       - save_cache:
           paths:
@@ -102,7 +102,7 @@ jobs:
           name: Build JavaScript bundle
           type: shell
           command: |
-            clojure -A:with-optional-deps:cljs -m cljs.main -co axel_f.min.js.edn --compile
+            clojure -A:cljs -m cljs.main -co axel_f.min.js.edn --compile
 
       - run:
           name: Prepare workspace for publishing

.dir-locals.el

@@ -2,4 +2,4 @@
 ;;; For more information see (info "(emacs) Directory Variables")
 
 ((clojure-mode
-  (cider-clojure-cli-global-options . "-A:with-optional-deps:bench:test")))
+  (cider-clojure-cli-global-options . "-A:bench:test")))

axel_f.dev.html

@@ -8,6 +8,10 @@
  :elide-asserts true
  :parallel-build true
  :checked-arrays :warn
+ :static-fns true
+ :fn-invoke-direct true
+ :warnings {:fn-deprecated false}
+ :optimize-constants true
  :output-wrapper "/**
  * Axel-f v0.1.0
  *

axel_f.min.html

@@ -1,4 +1,5 @@
-{:deps {org.clojure/clojure {:mvn/version "1.9.0"}}
+{:deps {org.clojure/clojure {:mvn/version "1.9.0"}
+        cheshire {:mvn/version "5.8.1"}}
 
  :paths ["src"]
 
@@ -9,18 +10,12 @@
  :aliases
  {:master {:override-deps {org.clojure/clojure {:mvn/version "1.10.0-master-SNAPSHOT"}}}
 
-  :with-optional-deps {:extra-deps {io.xapix/axel-f.base64 {:local/root "./base64"}
-                                    io.xapix/axel-f.json {:local/root "./json"}
-                                    io.xapix/axel-f.geo {:local/root "./geo"}}}
-
   :cljs {:extra-deps {org.clojure/clojurescript {:mvn/version "1.10.439"}}}
 
   :cljs-compile {:main-opts ["-m" "cljs.main"
-                                "--watch" "src/axel_f/v2"
-                                "-co" "axel_f.dev.js.edn"
-                                "--compile"
-                                ;; "--repl"
-                                ]}
+                             "--watch" "src/axel_f/v2"
+                             "-co" "axel_f.dev.js.edn"
+                             "--compile"]}
 
   :bench {:extra-deps {criterium          {:mvn/version "0.4.4"}
                        com.taoensso/tufte {:mvn/version "2.0.1"}}}
@@ -34,7 +29,7 @@
                           "--test-ns-path" "test"
                           "--codecov"]}
 
-  :cljs-runner {:extra-deps {olical/cljs-test-runner {:mvn/version "2.1.0"}}
+  :cljs-runner {:extra-deps {olical/cljs-test-runner {:mvn/version "3.4.0"}}
                 :main-opts  ["-m" "cljs-test-runner.main"]}
 
   :clj-runner {:extra-deps {com.cognitect/test-runner

axel_f.min.js.edn

@@ -11,6 +11,11 @@
             <artifactId>clojure</artifactId>
             <version>1.9.0</version>
         </dependency>
+        <dependency>
+            <groupId>cheshire</groupId>
+            <artifactId>cheshire</artifactId>
+            <version>5.8.1</version>
+        </dependency>
     </dependencies>
     <build>
         <sourceDirectory>src</sourceDirectory>

base64/deps.edn

@@ -1,9 +1,5 @@
 (ns axel-f.api
-  (:require [axel-f.core :as axel-f]
-            axel-f.functions
-            axel-f.base64
-            axel-f.json
-            axel-f.geo))
+  (:require [axel-f.core :as axel-f]))
 
 (defn- fix-regex-in-exception [exception-data]
   (update exception-data

base64/src/axel_f/base64.cljc

@@ -1,20 +1,24 @@
 (ns axel-f.core
-  (:require [axel-f.v2.parser :as parser]
-            [axel-f.v2.runtime :as runtime])
-  (:refer-clojure :exclude [compile]))
+  (:refer-clojure :exclude [compile])
+  (:require [axel-f.lexer :as lexer]
+            [axel-f.parser :as parser]
+            [axel-f.runtime :as runtime]
+            [axel-f.functions :as core]))
 
 (defn compile [formula & _]
-  (parser/parse formula))
+  (-> formula
+      lexer/read-formula
+      parser/parse
+      runtime/eval))
 
-(defn run [formula & [context]]
-  (let [ast (cond
-              (string? formula)
-              (compile formula)
+(defn ^:deprecated run [formula & [context]]
+  (let [f (cond
+            (string? formula)
+            (compile formula)
 
-              (map? formula)
-              formula
+            (fn? formula)
+            formula
 
-              :otherwise
-              (throw (ex-info (str "`formula` must be a string or precompiled string, got `" (type formula) "` instead.")
-                              {:formula formula})))]
-    ((runtime/eval ast) context)))
+            :otherwise
+            (throw (ex-info "Formula must be a string or precompiled expression." {})))]
+    (f context)))

deps.edn

@@ -1,18 +1,12 @@
 (ns axel-f.functions
-  (:require [clojure.string :as string]
-            [axel-f.functions.core :refer [def-excel-fn *functions-store*]]
+  (:require [axel-f.functions.core :refer [*functions-store*]]
             axel-f.functions.math
             axel-f.functions.text
             axel-f.functions.stat
-            axel-f.functions.logic))
-
-(def clean
-  ^{:desc "Returns the text with the non-printable ASCII characters removed."
-    :args [{:desc "The text whose non-printable characters are to be removed."}]}
-  (fn [text]
-    (string/replace text #"[\x00-\x1F]" "")))
-
-(def-excel-fn "CLEAN" clean)
+            axel-f.functions.logic
+            axel-f.functions.geo
+            axel-f.functions.json
+            axel-f.functions.base64))
 
 (defn find-impl [fname]
   (get @*functions-store* fname))

geo/deps.edn

@@ -0,0 +1,45 @@
+(ns axel-f.functions.base64
+  (:require [axel-f.functions.core :refer [def-excel-fn]])
+  #?(:clj (:import java.util.Base64)))
+
+#?(:cljs
+   (cond
+     (exists? js/atob)
+     (def atob js/atob)
+
+     (exists? js/Buffer)
+     (defn atob [s]
+       (.toString (js/Buffer.from s "base64") "binary"))))
+
+#?(:cljs
+   (cond
+     (exists? js/btoa)
+     (def btoa js/btoa)
+
+     (exists? js/Buffer)
+     (defn btoa [s]
+       (.toString (js/Buffer.from s "binary") "base64"))))
+
+(def base64-encode
+  ^{:args [{:desc "String to encode"}]
+    :desc "Creates a base-64 encoded ASCII string from a String"}
+  (fn [to-encode]
+    #?(:clj
+       (.encodeToString (Base64/getEncoder) (.getBytes to-encode))
+       :cljs
+       (btoa to-encode))))
+
+(def base64-decode
+  ^{:args [{:desc "String to decode"}]
+    :desc "Decodes a string of data which has been encoded using base-64 encoding"}
+  (fn [to-decode]
+    #?(:clj
+       (String. (.decode (Base64/getDecoder) to-decode))
+       :cljs
+       (atob to-decode))))
+
+(def-excel-fn
+  "BASE64ENCODE" base64-encode
+  "BASE64.ENCODE" base64-encode
+  "BASE64DECODE" base64-decode
+  "BASE64.DECODE" base64-decode)