use prettier

This commit is contained in:
Ritesh Kumar committed 2017-09-06 03:49:57 +05:30
1 parent 7d5bed0f87
commit a337fefee3
12 files changed
+48 -77

No files matched your search

+31 -12
View File
@@ -3,7 +3,6 @@ import cn from "classnames";
import Router from "next/router";
import isBrowser from "is-in-browser";
import copy from "copy-text-to-clipboard";
import { html_beautify, css_beautify, js_beautify } from "js-beautify";
import unfetch from "unfetch";
const theme = "tomorrow";
@@ -23,12 +22,15 @@ if (isBrowser) {
require("codemirror/mode/go/go");
}
const prettifyMap = {
css: css_beautify,
json: js_beautify,
html: html_beautify,
typescript: js_beautify
};
const prettierParsers = {
css: 'postcss',
javascript: 'babylon',
jsx: 'babylon',
graphql: 'graphql',
json: 'json',
typescript: 'typescript',
flow: 'flow'
}
const modeMapping = {
javascript: {
@@ -46,6 +48,10 @@ const modeMapping = {
name: "xml",
htmlMode: true
},
flow: {
name: 'javascript',
typescript: true
},
mysql: "text/x-mysql",
scala: "text/x-scala"
};
@@ -155,13 +161,22 @@ export default class ConversionPanel extends PureComponent {
});
};
setSplitValue = splitValue => this.setState({splitValue})
prettifyCode = () => {
const { leftMode } = this.props;
const { value } = this.state;
this.setResult(prettifyMap[leftMode](value, { indent_size: 2 }));
this.setResult(prettier.format(value, {parser: prettierParsers[leftMode]}));
};
prettifySplitCode = () => {
const { splitMode } = this.props;
const { splitValue } = this.state;
this.setSplitValue(prettier.format(splitValue, {parser: prettierParsers[splitMode]}));
}
copyCode = () => {
const { rightMode } = this.props;
const { resultValue } = this.state;
@@ -207,6 +222,7 @@ export default class ConversionPanel extends PureComponent {
return (
<div className="wrapper">
<script src="https://bundle.run/prettier@1.6.1" />
<style jsx>{`
.wrapper {
display: flex;
@@ -368,9 +384,9 @@ export default class ConversionPanel extends PureComponent {
<div className="header">
<h4 className="title">{leftTitle}</h4>
{leftMode === 'json' && showFetchButton && <button className="btn" onClick={this.fetchJSON}>{fetchButtonText}</button>}
<button className="btn" onClick={this.prettifyCode}>
{prettierParsers[leftMode] && <button className="btn" onClick={this.prettifyCode}>
Prettify
</button>
</button>}
</div>
{isBrowser && (
<CodeMirror
@@ -388,6 +404,9 @@ export default class ConversionPanel extends PureComponent {
<div style={{ display: "contents" }}>
<div className="header">
<h4 className="title">{splitTitle}</h4>
{prettierParsers[splitMode] && <button className="btn" onClick={this.prettifySplitCode}>
Prettify
</button>}
</div>
<CodeMirror
onChange={(editor, metadata, value) =>
@@ -422,8 +441,8 @@ export default class ConversionPanel extends PureComponent {
{isBrowser && (
<CodeMirror
value={
prettifyRightPanel ? (
js_beautify(resultValue, { e4x: true })
prettifyRightPanel && prettierParsers[rightMode] && resultValue ? (
prettier.format(resultValue, {parser:prettierParsers[rightMode], printWidth: 70})
) : (
resultValue
)
-1
View File
@@ -37,7 +37,6 @@
"copy-text-to-clipboard": "^1.0.3",
"generate-schema": "^2.5.1",
"is-in-browser": "^1.1.3",
"js-beautify": "^1.6.14",
"lodash": "^4.17.4",
"next": "^3.2.1",
"nprogress": "^0.2.0",
+2 -1
View File
@@ -31,7 +31,7 @@ export default class Css2Js extends PureComponent {
};
getTransformedValue = (newValue) => {
return cssToJS(newValue, this.state.isRn)
return `const styles = ${cssToJS(newValue, this.state.isRn)}`
};
render() {
@@ -41,6 +41,7 @@ export default class Css2Js extends PureComponent {
leftTitle="CSS"
rightTitle="JavaScript"
leftMode="css"
rightMode="javascript"
getTransformedValue={this.getTransformedValue}
name={"css_to_js"}
defaultText={defaultText}
+2 -3
View File
@@ -18,10 +18,9 @@ export default class Json2Ts extends PureComponent {
getTransformedValue={this.getTransformedValue}
name={"graphql_to_typescript"}
defaultText={dummySchema}
leftMode="javascript"
rightMode="typescript"
leftMode="json"
rightMode="flow"
url={this.props.url}
prettifyRightPanel={false}
splitLeft={true}
splitMode={"graphql"}
splitTitle={"Query"}
+1 -2
View File
@@ -18,10 +18,9 @@ export default class Json2Ts extends PureComponent {
getTransformedValue={this.getTransformedValue}
name={"graphql_to_typescript"}
defaultText={dummySchema}
leftMode="typescript"
leftMode="json"
rightMode="typescript"
url={this.props.url}
prettifyRightPanel={false}
splitLeft={true}
splitMode={"graphql"}
splitTitle={"Query"}
+2 -1
View File
@@ -6,7 +6,7 @@ import text from "../utils/dummy-object-json"
const defaultText = stringify(eval(`(${text})`))
export default class Main extends PureComponent {
export default class extends PureComponent {
getTransformedValue = newValue => {
return JSON.stringify(eval('(' + newValue + ')'), null ,2)
@@ -24,6 +24,7 @@ export default class Main extends PureComponent {
getTransformedValue={this.getTransformedValue}
name={"js_to_json"}
defaultText={defaultText}
prettifyRightPanel={false}
/>
</Layout>
);
+1 -1
View File
@@ -18,7 +18,7 @@ export default class Json2Ts extends PureComponent {
name={"ts_interface"}
defaultText={defaultText}
leftMode="json"
rightMode="typescript"
rightMode="flow"
url={this.props.url}
prettifyRightPanel={false}
/>
+1
View File
@@ -23,6 +23,7 @@ export default class Json2Ts extends PureComponent {
leftMode="json"
rightMode="javascript"
url={this.props.url}
prettifyRightPanel={false}
/>
</Layout>
);
+1
View File
@@ -23,6 +23,7 @@ export default class Json2Ts extends PureComponent {
leftMode="json"
rightMode="mysql"
url={this.props.url}
prettifyRightPanel={false}
/>
</Layout>
);
+2 -1
View File
@@ -3,7 +3,7 @@ import Layout from "../components/Layout";
import ConversionPanel from "../components/ConversionPanel";
import defaultText from "../utils/dummy-json";
import transform from "transform-json-types"
export default class Json2Ts extends PureComponent {
export default class extends PureComponent {
getTransformedValue = code => transform(code, {
lang: "scala"
})
@@ -20,6 +20,7 @@ export default class Json2Ts extends PureComponent {
leftMode="json"
rightMode="scala"
url={this.props.url}
prettifyRightPanel={false}
/>
</Layout>
);
+3 -3
View File
@@ -11,15 +11,15 @@ const text = `<note>
</note>
`;
export default class Json2Ts extends PureComponent {
export default class extends PureComponent {
state = {
isCompactMode: true
};
getTransformedValue = newValue => {
return xml2json(newValue, {
return JSON.stringify(JSON.parse(xml2json(newValue, {
compact: this.state.isCompactMode
});
})));
};
render() {
+2 -52
View File
@@ -1103,10 +1103,6 @@ block-stream@*:
dependencies:
inherits "~2.0.0"
bluebird@^3.0.5:
version "3.5.0"
resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.0.tgz#791420d7f551eea2897453a8a77653f96606d67c"
bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
version "4.11.7"
resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.7.tgz#ddb048e50d9482790094c13eb3fcfc833ce7ab46"
@@ -1511,13 +1507,6 @@ concat-map@0.0.1:
version "0.0.1"
resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
config-chain@~1.1.5:
version "1.1.11"
resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.11.tgz#aba09747dfbe4c3e70e766a6e41586e1859fc6f2"
dependencies:
ini "^1.3.4"
proto-list "~1.2.1"
configstore@^2.0.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/configstore/-/configstore-2.1.0.tgz#737a3a7036e9886102aa6099e47bb33ab1aba1a1"
@@ -1968,16 +1957,6 @@ ecc-jsbn@~0.1.1:
dependencies:
jsbn "~0.1.0"
editorconfig@^0.13.2:
version "0.13.3"
resolved "https://registry.yarnpkg.com/editorconfig/-/editorconfig-0.13.3.tgz#e5219e587951d60958fd94ea9a9a008cdeff1b34"
dependencies:
bluebird "^3.0.5"
commander "^2.9.0"
lru-cache "^3.2.0"
semver "^5.1.0"
sigmund "^1.0.1"
ee-first@1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
@@ -2826,7 +2805,7 @@ inherits@2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
ini@^1.3.4, ini@~1.3.0:
ini@~1.3.0:
version "1.3.4"
resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.4.tgz#0537cb79daf59b59a1a517dff706c86ec039162e"
@@ -3066,15 +3045,6 @@ js-base64@^2.1.9:
version "2.1.9"
resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.1.9.tgz#f0e80ae039a4bd654b5f281fc93f04a914a7fcce"
js-beautify@^1.6.14:
version "1.6.14"
resolved "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.6.14.tgz#d3b8f7322d02b9277d58bd238264c327e58044cd"
dependencies:
config-chain "~1.1.5"
editorconfig "^0.13.2"
mkdirp "~0.5.0"
nopt "~3.0.1"
js-tokens@^3.0.0:
version "3.0.1"
resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.1.tgz#08e9f132484a2c45a30907e9dc4d5567b7f114d7"
@@ -3313,12 +3283,6 @@ lowercase-keys@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.0.tgz#4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"
lru-cache@^3.2.0:
version "3.2.0"
resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-3.2.0.tgz#71789b3b7f5399bec8565dda38aa30d2a097efee"
dependencies:
pseudomap "^1.0.1"
lru-cache@^4.0.1:
version "4.1.1"
resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.1.tgz#622e32e82488b49279114a4f9ecf45e7cd6bba55"
@@ -3660,12 +3624,6 @@ nopt@~1.0.10:
dependencies:
abbrev "1"
nopt@~3.0.1:
version "3.0.6"
resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
dependencies:
abbrev "1"
normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
version "2.4.0"
resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f"
@@ -4293,10 +4251,6 @@ prop-types@15.5.10, prop-types@15.x, prop-types@^15.5.10, prop-types@^15.5.4, pr
fbjs "^0.8.9"
loose-envify "^1.3.1"
proto-list@~1.2.1:
version "1.2.4"
resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
proxy-addr@~1.1.5:
version "1.1.5"
resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-1.1.5.tgz#71c0ee3b102de3f202f3b64f608d173fcba1a918"
@@ -4308,7 +4262,7 @@ prr@~0.0.0:
version "0.0.0"
resolved "https://registry.yarnpkg.com/prr/-/prr-0.0.0.tgz#1a84b85908325501411853d0081ee3fa86e2926a"
pseudomap@^1.0.1, pseudomap@^1.0.2:
pseudomap@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
@@ -4854,10 +4808,6 @@ shebang-regex@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
sigmund@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590"
signal-exit@^3.0.0, signal-exit@^3.0.2:
version "3.0.2"
resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"