Skip to content
Open
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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@ node_modules/**
package/**
target/**
.cpcache/
benchmark/bench.edn
benchmark/bench.transit
30 changes: 30 additions & 0 deletions benchmark/bench_edn.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@

const fs = require('fs')

const str = fs.readFileSync('bench.edn').toString()

const { decode } = require('../package/index').edn

var runs = 100
const times = []

while (runs--) {
const start = Date.now()
const res = decode(str, true)
const end = Date.now()
const ms = end - start
console.log(ms)
times.push(ms)
}

const sum = times.reduce((x, y) => x + y)
const avg = sum / times.length

console.log(avg)







20 changes: 20 additions & 0 deletions benchmark/bench_transit.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
const fs = require('fs')
const str = fs.readFileSync('./bench.transit').toString()
const { decodeTransit } = require('../package/index').edn

var runs = 100
const times = []

while (runs--) {
const start = Date.now()
const res = decodeTransit(str, true)
const end = Date.now()
const ms = end - start
console.log(ms)
times.push(ms)
}

const sum = times.reduce((x, y) => x + y)
const avg = sum / times.length

console.log(avg)
21 changes: 21 additions & 0 deletions benchmark/bench_transit_js.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
const fs = require('fs')

const str = fs.readFileSync('./bench.transit').toString()
const decodeTransit = require('../decode.js')

var runs = 100
const times = []

while (runs--) {
const start = Date.now()
const res = decodeTransit(str, true)
const end = Date.now()
const ms = end - start
console.log(ms)
times.push(ms)
}

const sum = times.reduce((x, y) => x + y)
const avg = sum / times.length

console.log(avg)
49 changes: 49 additions & 0 deletions decode.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
const t = require('transit-js')

const opts = {
mapBuilder: {
init: function() {
return {}
},
add: function(m, k, v) {
m[k] = v
return m
},
finalize: function(m) {
return m
}
},

arrayBuilder: {
init: function() {
return []
},
add: (ret, val, node) => {
// this is how keywords are defined, not sure why
if (val._name) {
ret.push(`:${val._name}`)
} else {
ret.push(val)
}
return ret
},
finalize: (ret, node) => {
return ret
}
},

handlers: {
set: rep => {
return rep
},
list: rep => {
return rep
}
}
}

const r = t.reader('json', opts)

module.exports = transitStr => {
return r.read(transitStr)
}
3 changes: 2 additions & 1 deletion deps.edn
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
{:deps {org.clojure/clojurescript {:mvn/version "1.10.238"}}
{:deps {org.clojure/clojurescript {:mvn/version "1.10.238"}
com.cognitect/transit-cljs {:mvn/version "0.8.256"}}
:paths ["src" "test"]}
7 changes: 4 additions & 3 deletions project.clj
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
(defproject cljs-tools "0.0.1"
:dependencies [[org.clojure/clojure "1.9.0"]
[org.clojure/clojurescript "1.10.238"]]
:plugins [[lein-cljsbuild "1.1.5"]]
:dependencies [[org.clojure/clojure "1.10.0"]
[org.clojure/clojurescript "1.10.597"]
[com.cognitect/transit-cljs "0.8.256"]]
:plugins [[lein-cljsbuild "1.1.7"]]
:cljsbuild {:builds [{:id "release"
:source-paths ["src"]
:compiler {:main yd.module
Expand Down
14 changes: 13 additions & 1 deletion src/yd/edn.cljs
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
(ns yd.edn
(:require [clojure.walk :refer (postwalk)]
[clojure.string :refer (replace includes?)]
[cljs.reader :refer (read-string)]))
[cljs.reader :refer (read-string)]
[yd.transit]))


(defn keylike? [k-str]
Expand All @@ -25,6 +26,11 @@
(read-string data))


(defn read-transit [transit-str]
(let [r (t/reader :json)]
(t/read r transit-str)))


(defn try-read [value]
(try
(read-data value)
Expand Down Expand Up @@ -76,5 +82,11 @@
(cond-> (read-data edn-str)
keywordize? (walk print-kw identity)
true clj->js))


(defn decode-transit [transit-str keywordize?]
(cond-> (yd.transit/decode transit-str)
keywordize? (walk print-kw identity)
true clj->js))


5 changes: 4 additions & 1 deletion src/yd/module.cljs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
(ns yd.module
(:require [yd.edn :refer (encode decode)]))
(:require [yd.edn :refer (encode decode decode-transit)]))


(def edn #js {})
Expand All @@ -11,4 +11,7 @@
(aset edn "decode" decode)


(aset edn "decodeTransit" decode-transit)


(aset js/module.exports "edn" edn)
13 changes: 13 additions & 0 deletions src/yd/transit.cljs
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
(ns yd.transit
(:require [cognitect.transit :as t]))


(defn encode [data]
(let [w (t/writer :json)]
(t/write w data)))


(defn decode [transit-str]
(let [r (t/reader :json)]
(t/read r transit-str)))