diff --git a/package.json b/package.json index 7f68eb5..a95100c 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ }, "license": "MIT", "dependencies": { - "@tsuyoshiwada/htmltojsx": "^0.0.4", + "@tsuyoshiwada/htmltojsx": "^0.0.5", "babel-plugin-json-to-proptypes": "^0.1.0", "babel-standalone": "^6.26.0", "classnames": "^2.2.5", @@ -44,9 +44,10 @@ "gofmt.js": "^0.0.2", "is-in-browser": "^1.1.3", "is-svg": "^2.1.0", - "json-schema-to-typescript": "^4.6.0", + "json-schema-faker": "^0.5.0-rc11", + "json-schema-to-typescript": "^4.6.2", "lodash": "^4.17.4", - "next": "^3.2.1", + "next": "^3.2.2", "nprogress": "^0.2.0", "promise-worker": "^1.1.1", "prop-types": "^15.5.10", @@ -62,7 +63,7 @@ "transform-json-types": "^0.2.6", "transform-svg-to-native": "^0.1.3", "unfetch": "^3.0.0", - "xml-js": "^1.4.1" + "xml-js": "^1.4.2" }, "devDependencies": { "all-contributors-cli": "^4.4.0", @@ -70,7 +71,7 @@ "css-loader": "^0.28.7", "glob": "^7.1.2", "husky": "^0.14.3", - "lint-staged": "^4.1.3", + "lint-staged": "^4.2.1", "prettier-standard": "^6.0.0", "style-loader": "^0.18.2", "sw-precache-webpack-plugin": "^0.11.4", diff --git a/pages/json-schema-to-rust-serde.js b/pages/json-schema-to-rust-serde.js new file mode 100644 index 0000000..49a410f --- /dev/null +++ b/pages/json-schema-to-rust-serde.js @@ -0,0 +1,32 @@ +import React, { PureComponent } from 'react' +import Layout from '../components/Layout' +import ConversionPanel from '../components/ConversionPanel' +import json from '../utils/dummy-json-schema' +import loadWorker from '../utils/loadWorker' + +export default class Json2Ts extends PureComponent { + getTransformedValue = code => { + this.promiseWorker = loadWorker( + 'json-schema-to-rust-serde.js', + this + ).promiseWorker + return this.promiseWorker.postMessage(code) + } + + render () { + return ( + + + + ) + } +} diff --git a/pages/json-schema-to-ts.js b/pages/json-schema-to-ts.js index 196b9fc..06d8bf7 100644 --- a/pages/json-schema-to-ts.js +++ b/pages/json-schema-to-ts.js @@ -2,34 +2,7 @@ import React, { PureComponent } from 'react' import Layout from '../components/Layout' import ConversionPanel from '../components/ConversionPanel' import { compile } from 'json-schema-to-typescript' - -const json = `{ - title: 'Example Schema', - type: 'object', - properties: { - firstName: { - type: 'string' - }, - lastName: { - type: 'string' - }, - age: { - description: 'Age in years', - type: 'integer', - minimum: 0 - }, - height: { - type: 'number' - }, - favoriteFoods: { - type: 'array' - }, - likesDogs: { - type: 'boolean' - } - }, - required: ['firstName', 'lastName'] -}` +import json from '../utils/dummy-json-schema' export default class Json2Ts extends PureComponent { getTransformedValue = code => compile(eval('(' + code + ')')) diff --git a/utils/dummy-json-schema.js b/utils/dummy-json-schema.js new file mode 100644 index 0000000..7c1b051 --- /dev/null +++ b/utils/dummy-json-schema.js @@ -0,0 +1,34 @@ +const json = `{ + "title": "Example Schema", + "type": "object", + "properties": { + "firstName": { + "type": "string" + }, + "lastName": { + "type": "string" + }, + "age": { + "description": "Age in years", + "type": "integer", + "minimum": 0 + }, + "height": { + "type": "number" + }, + "favoriteFoods": { + "type": "array", + "minItems": 0, + "maxItems": 2, + "items": { + "type": "string" + } + }, + "likesDogs": { + "type": "boolean" + } + }, + "required": ["firstName", "lastName"] +}` + +export default json diff --git a/utils/routes.js b/utils/routes.js index 018a2b7..f7dc12f 100644 --- a/utils/routes.js +++ b/utils/routes.js @@ -100,6 +100,11 @@ export const categorizedRoutes = [ label: 'JSON to Rust Serde', path: '/json-to-rust-serde', desc: 'An online REPL for converting JSON to Rust Serde Structs.' + }, + { + label: 'JSON Schema to Rust Serde', + path: '/json-schema-to-rust-serde', + desc: 'An online REPL for converting JSON Schema to Rust Serde Structs.' } ] }, diff --git a/workers/json-schema-to-rust-serde.js b/workers/json-schema-to-rust-serde.js new file mode 100644 index 0000000..ac92b1b --- /dev/null +++ b/workers/json-schema-to-rust-serde.js @@ -0,0 +1,20 @@ +import registerPromiseWorker from 'promise-worker/register' +import transform from 'transform-json-types' +import jsf from 'json-schema-faker' + +jsf.option({ + alwaysFakeOptionals: true +}) + +registerPromiseWorker( + code => + new Promise(resolve => { + jsf.resolve(JSON.parse(code)).then(_json => { + resolve( + transform(_json, { + lang: 'rust-serde' + }) + ) + }) + }) +) diff --git a/yarn.lock b/yarn.lock index 06b25b4..0157d6d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10,6 +10,16 @@ react "~15.4.1" react-dom "~15.4.1" +"@tsuyoshiwada/htmltojsx@^0.0.5": + version "0.0.5" + resolved "https://registry.yarnpkg.com/@tsuyoshiwada/htmltojsx/-/htmltojsx-0.0.5.tgz#2a4bb566820f8a69a1dba9954a47a69d4a766f5c" + dependencies: + htmltojsx "^0.3.0" + jsdom-no-contextify "~3.1.0" + react "~15.4.1" + react-dom "~15.4.1" + warning "^3.0.0" + abbrev@1: version "1.1.0" resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.0.tgz#d0554c2256636e2f56e7c2e5ad183f859428d81f" @@ -1408,7 +1418,7 @@ camelcase@^1.0.2: version "1.2.1" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39" -camelcase@^2.0.0, camelcase@^2.1.0: +camelcase@^2.0.0, camelcase@^2.0.1, camelcase@^2.1.0: version "2.1.1" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f" @@ -2031,7 +2041,7 @@ decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2: version "1.2.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" -deep-extend@~0.4.0: +deep-extend@^0.4.0, deep-extend@~0.4.0: version "0.4.2" resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.2.tgz#48b699c27e334bf89f10892be432f6e4c7d34a7f" @@ -2085,6 +2095,12 @@ depd@1.1.1, depd@~1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.1.tgz#5783b4e1c459f06fa5ca27f991f3d06e7a310359" +deref@^0.7.0: + version "0.7.0" + resolved "https://registry.yarnpkg.com/deref/-/deref-0.7.0.tgz#f862485b971f51e9aad590d149b9eb46dcc074c1" + dependencies: + deep-extend "^0.4.0" + des.js@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.0.tgz#c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc" @@ -2110,6 +2126,10 @@ diffie-hellman@^5.0.0: miller-rabin "^4.0.0" randombytes "^2.0.0" +discontinuous-range@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/discontinuous-range/-/discontinuous-range-1.0.0.tgz#e38331f0844bba49b9a9cb71c771585aab1bc65a" + dlv@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/dlv/-/dlv-1.1.0.tgz#fee1a7c43f63be75f3f679e85262da5f102764a7" @@ -3168,6 +3188,15 @@ htmlescape@1.1.1: inherits "^2.0.1" readable-stream "^2.0.2" +htmltojsx@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/htmltojsx/-/htmltojsx-0.3.0.tgz#6487c4504d660051e49f73a127b455d763df8266" + dependencies: + jsdom-no-contextify "~3.1.0" + react "~15.4.1" + react-dom "~15.4.1" + yargs "~4.6.0" + http-errors@~1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.4.0.tgz#6c0242dea6b3df7afda153c71089b31c6e82aabf" @@ -3649,7 +3678,16 @@ json-loader@0.5.4, json-loader@^0.5.4: version "0.5.4" resolved "https://registry.yarnpkg.com/json-loader/-/json-loader-0.5.4.tgz#8baa1365a632f58a3c46d20175fc6002c96e37de" -json-schema-ref-parser@^3.1.2: +json-schema-faker@^0.5.0-rc11: + version "0.5.0-rc11" + resolved "https://registry.yarnpkg.com/json-schema-faker/-/json-schema-faker-0.5.0-rc11.tgz#1868bed0791b66bea0186f3cc380653474ef2315" + dependencies: + deref "^0.7.0" + json-schema-ref-parser "^3.1.2" + randexp "^0.4.5" + tslib "^1.7.1" + +json-schema-ref-parser@^3.1.2, json-schema-ref-parser@^3.3.1: version "3.3.1" resolved "https://registry.yarnpkg.com/json-schema-ref-parser/-/json-schema-ref-parser-3.3.1.tgz#86e751b8099357bf601a7cfe42d10123ee906a32" dependencies: @@ -3660,16 +3698,16 @@ json-schema-ref-parser@^3.1.2: ono "^4.0.2" z-schema "^3.18.2" -json-schema-to-typescript@^4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/json-schema-to-typescript/-/json-schema-to-typescript-4.6.0.tgz#a2455325253e0d17bb4a31d10a51fcb188e48f79" +json-schema-to-typescript@^4.6.2: + version "4.6.2" + resolved "https://registry.yarnpkg.com/json-schema-to-typescript/-/json-schema-to-typescript-4.6.2.tgz#231a74f3c5408c8f535a0332fbc24481c1d5669b" dependencies: cli-color "^1.2.0" - json-schema-ref-parser "^3.1.2" + json-schema-ref-parser "^3.3.1" json-stringify-safe "^5.0.1" lodash "^4.17.4" minimist "^1.2.0" - mz "^2.6.0" + mz "^2.7.0" stdin "0.0.1" json-schema-traverse@^0.3.0: @@ -3770,9 +3808,9 @@ lie@^3.0.2: dependencies: immediate "~3.0.5" -lint-staged@^4.1.3: - version "4.1.3" - resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-4.1.3.tgz#07c592e4b8dee914450a183c761187dc53d079e2" +lint-staged@^4.2.1: + version "4.2.1" + resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-4.2.1.tgz#5c79818c500d9b24248dccad4ac9609c01951522" dependencies: app-root-path "^2.0.0" chalk "^2.1.0" @@ -3836,7 +3874,7 @@ listr@^0.12.0: stream-to-observable "^0.1.0" strip-ansi "^3.0.1" -load-json-file@^1.0.0: +load-json-file@^1.0.0, load-json-file@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0" dependencies: @@ -4234,7 +4272,7 @@ mv@2.1.1: ncp "~2.0.0" rimraf "~2.4.0" -mz@2.6.0, mz@^2.6.0: +mz@2.6.0: version "2.6.0" resolved "https://registry.yarnpkg.com/mz/-/mz-2.6.0.tgz#c8b8521d958df0a4f2768025db69c719ee4ef1ce" dependencies: @@ -4242,6 +4280,14 @@ mz@2.6.0, mz@^2.6.0: object-assign "^4.0.1" thenify-all "^1.0.0" +mz@^2.7.0: + version "2.7.0" + resolved "https://registry.yarnpkg.com/mz/-/mz-2.7.0.tgz#95008057a56cafadc2bc63dde7f9ff6955948e32" + dependencies: + any-promise "^1.0.0" + object-assign "^4.0.1" + thenify-all "^1.0.0" + nan@^2.3.0: version "2.7.0" resolved "https://registry.yarnpkg.com/nan/-/nan-2.7.0.tgz#d95bf721ec877e08db276ed3fc6eb78f9083ad46" @@ -4262,9 +4308,9 @@ next-tick@1: version "1.0.0" resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c" -next@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/next/-/next-3.2.1.tgz#6d694823ac6e74e9be4553117144a6402220490f" +next@^3.2.2: + version "3.2.2" + resolved "https://registry.yarnpkg.com/next/-/next-3.2.2.tgz#f89473a15595a06d5ab25fae3351e440d305159a" dependencies: ansi-html "0.0.7" babel-core "6.25.0" @@ -4765,6 +4811,15 @@ pinkie@^2.0.0: version "2.0.4" resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" +pkg-conf@^1.1.2: + version "1.1.3" + resolved "https://registry.yarnpkg.com/pkg-conf/-/pkg-conf-1.1.3.tgz#378e56d6fd13e88bfb6f4a25df7a83faabddba5b" + dependencies: + find-up "^1.0.0" + load-json-file "^1.1.0" + object-assign "^4.0.1" + symbol "^0.2.1" + pkg-dir@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b" @@ -5082,10 +5137,6 @@ prettier@^1.4.4, prettier@^1.6.0, prettier@^1.6.1: version "1.6.1" resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.6.1.tgz#850f411a3116226193e32ea5acfc21c0f9a76d7d" -prettier@^1.7.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.7.0.tgz#47481588f41f7c90f63938feb202ac82554e7150" - pretty-bytes@^4.0.2: version "4.0.2" resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-4.0.2.tgz#b2bf82e7350d65c6c33aa95aaa5a4f6327f61cd9" @@ -5216,6 +5267,13 @@ querystring@0.2.0, querystring@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" +randexp@^0.4.5: + version "0.4.6" + resolved "https://registry.yarnpkg.com/randexp/-/randexp-0.4.6.tgz#e986ad5e5e31dae13ddd6f7b3019aa7c87f60ca3" + dependencies: + discontinuous-range "1.0.0" + ret "~0.1.10" + randomatic@^1.1.3: version "1.1.7" resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.7.tgz#c7abe9cc8b87c0baa876b19fde83fd464797e38c" @@ -5610,6 +5668,10 @@ restore-cursor@^2.0.0: onetime "^2.0.0" signal-exit "^3.0.2" +ret@~0.1.10: + version "0.1.15" + resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" + right-align@^0.1.1: version "0.1.3" resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef" @@ -5675,7 +5737,7 @@ safe-buffer@~5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.0.1.tgz#d263ca54696cd8a306b5ca6551e92de57918fbe7" -sax@^1.2.1, sax@~1.2.1: +sax@^1.2.4, sax@~1.2.1: version "1.2.4" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" @@ -6107,6 +6169,10 @@ symbol-observable@^1.0.1: version "1.0.4" resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.4.tgz#29bf615d4aa7121bdd898b22d4b3f9bc4e2aa03d" +symbol@^0.2.1: + version "0.2.3" + resolved "https://registry.yarnpkg.com/symbol/-/symbol-0.2.3.tgz#3b9873b8a901e47c6efe21526a3ac372ef28bbc7" + table@^3.7.8: version "3.8.3" resolved "https://registry.yarnpkg.com/table/-/table-3.8.3.tgz#2bbc542f0fda9861a755d3947fefd8b3f513855f" @@ -6281,6 +6347,10 @@ tryit@^1.0.1: version "1.0.3" resolved "https://registry.yarnpkg.com/tryit/-/tryit-1.0.3.tgz#393be730a9446fd1ead6da59a014308f36c289cb" +tslib@^1.7.1: + version "1.7.1" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.7.1.tgz#bc8004164691923a79fe8378bbeb3da2017538ec" + tty-browserify@0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6" @@ -6493,6 +6563,12 @@ walk@^2.3.9: dependencies: foreachasync "^3.0.0" +warning@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/warning/-/warning-3.0.0.tgz#32e5377cb572de4ab04753bdf8821c01ed605b7c" + dependencies: + loose-envify "^1.0.0" + watchpack@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.4.0.tgz#4a1472bcbb952bd0a9bb4036801f954dfb39faac" @@ -6675,11 +6751,11 @@ xdg-basedir@^2.0.0: dependencies: os-homedir "^1.0.0" -xml-js@^1.4.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/xml-js/-/xml-js-1.4.1.tgz#b34fface0c6d89804aaf0a182821ac1ed08a01e9" +xml-js@^1.4.2: + version "1.4.2" + resolved "https://registry.yarnpkg.com/xml-js/-/xml-js-1.4.2.tgz#c270b0507b7e22f75f0a7b70a9e32097713a5ec3" dependencies: - sax "^1.2.1" + sax "^1.2.4" xml-name-validator@^1.0.0: version "1.0.0" @@ -6705,7 +6781,7 @@ yallist@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" -yargs-parser@^2.4.1: +yargs-parser@^2.4.0, yargs-parser@^2.4.1: version "2.4.1" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-2.4.1.tgz#85568de3cf150ff49fa51825f03a8c880ddcc5c4" dependencies: @@ -6788,6 +6864,23 @@ yargs@~3.10.0: decamelize "^1.0.0" window-size "0.1.0" +yargs@~4.6.0: + version "4.6.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-4.6.0.tgz#cb4050c0159bfb6bb649c0f4af550526a84619dc" + dependencies: + camelcase "^2.0.1" + cliui "^3.2.0" + decamelize "^1.1.1" + lodash.assign "^4.0.3" + os-locale "^1.4.0" + pkg-conf "^1.1.2" + read-pkg-up "^1.0.1" + require-main-filename "^1.0.1" + string-width "^1.0.1" + window-size "^0.2.0" + y18n "^3.2.1" + yargs-parser "^2.4.0" + z-schema@^3.18.2: version "3.18.3" resolved "https://registry.yarnpkg.com/z-schema/-/z-schema-3.18.3.tgz#45592990891d0342fe20a36823fc44d89ab4d8a2"