Skip to content

Commit abf04f1

Browse files
committed
prettify after decompressing (#3)
1 parent fcf247f commit abf04f1

File tree

5 files changed

+94
-18
lines changed

5 files changed

+94
-18
lines changed

index.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,5 @@
33
const toJson = require('./lib/to-json')
44
const toSketch = require('./lib/to-sketch')
55

6-
toJson()
7-
86
exports.toJson = toJson
97
exports.toSketch = toSketch

lib/prettify.js

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
'use strict'
2+
3+
const fs = require('fs')
4+
const { js_beautify } = require('js-beautify')
5+
const globby = require('globby')
6+
7+
module.exports = () =>
8+
globby('./sketch-json/**/*.json').then(files =>
9+
files.map(file => {
10+
return fs.readFile(file, 'utf-8', (err, data) => {
11+
if (err) {
12+
throw new TypeError(err)
13+
}
14+
15+
const json = js_beautify(data, { indent_size: 2 })
16+
17+
fs.writeFile(file, json, err => {
18+
if (err) {
19+
throw new TypeError(err)
20+
}
21+
})
22+
})
23+
})
24+
)

lib/to-json.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ const decompress = require('decompress')
55
const globby = require('globby')
66
const del = require('del')
77

8+
const prettify = require('./prettify')
9+
810
module.exports = () => {
911
return new Promise((resolve, reject) => {
1012
globby(['*.sketch']).then(sketchFiles => {
@@ -28,7 +30,10 @@ module.exports = () => {
2830
sketchFiles.length > 1
2931
? `sketch-json/${sketchFile.replace('.sketch', '')}`
3032
: 'sketch-json'
31-
decompress(sketchCopy, folder).then(() => resolve())
33+
34+
decompress(sketchCopy, folder).then(() =>
35+
prettify().then(() => resolve())
36+
)
3237
})
3338
})
3439
})

package.json

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,7 @@
66
"repository": "[email protected]:bukinoshita/sketch-json.git",
77
"author": "Bu Kinoshita <[email protected]>",
88
"license": "MIT",
9-
"keywords": [
10-
"sketch",
11-
"git",
12-
"github",
13-
"versioning",
14-
"json",
15-
"design"
16-
],
9+
"keywords": ["sketch", "git", "github", "versioning", "json", "design"],
1710
"scripts": {
1811
"test": "xo --quiet"
1912
},
@@ -22,6 +15,7 @@
2215
"del": "^3.0.0",
2316
"fs-extra": "^4.0.1",
2417
"globby": "^6.1.0",
18+
"js-beautify": "^1.6.14",
2519
"json-beautify": "^1.0.1"
2620
},
2721
"devDependencies": {
@@ -30,8 +24,9 @@
3024
"xo": "^0.18.2"
3125
},
3226
"xo": {
33-
"extends": [
34-
"prettier"
35-
]
27+
"extends": ["prettier"],
28+
"rules": {
29+
"camelcase": 0
30+
}
3631
}
3732
}

yarn.lock

Lines changed: 58 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
# yarn lockfile v1
33

44

5+
abbrev@1:
6+
version "1.1.0"
7+
resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.0.tgz#d0554c2256636e2f56e7c2e5ad183f859428d81f"
8+
59
acorn-jsx@^3.0.0:
610
version "3.0.1"
711
resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-3.0.1.tgz#afdf9488fb1ecefc8348f6fb22f464e32a58b36b"
@@ -118,6 +122,10 @@ bl@^1.0.0:
118122
dependencies:
119123
readable-stream "^2.0.5"
120124

125+
bluebird@^3.0.5:
126+
version "3.5.0"
127+
resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.0.tgz#791420d7f551eea2897453a8a77653f96606d67c"
128+
121129
boxen@^1.0.0:
122130
version "1.2.1"
123131
resolved "https://registry.yarnpkg.com/boxen/-/boxen-1.2.1.tgz#0f11e7fe344edb9397977fc13ede7f64d956481d"
@@ -262,7 +270,7 @@ color-name@^1.1.1:
262270
version "1.1.3"
263271
resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
264272

265-
commander@^2.11.0:
273+
commander@^2.11.0, commander@^2.9.0:
266274
version "2.11.0"
267275
resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563"
268276

@@ -284,6 +292,13 @@ concat-stream@^1.5.2:
284292
readable-stream "^2.2.2"
285293
typedarray "^0.0.6"
286294

295+
config-chain@~1.1.5:
296+
version "1.1.11"
297+
resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.11.tgz#aba09747dfbe4c3e70e766a6e41586e1859fc6f2"
298+
dependencies:
299+
ini "^1.3.4"
300+
proto-list "~1.2.1"
301+
287302
configstore@^3.0.0:
288303
version "3.1.1"
289304
resolved "https://registry.yarnpkg.com/configstore/-/configstore-3.1.1.tgz#094ee662ab83fad9917678de114faaea8fcdca90"
@@ -485,6 +500,16 @@ duplexer@^0.1.1:
485500
version "0.1.1"
486501
resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
487502

503+
editorconfig@^0.13.2:
504+
version "0.13.3"
505+
resolved "https://registry.yarnpkg.com/editorconfig/-/editorconfig-0.13.3.tgz#e5219e587951d60958fd94ea9a9a008cdeff1b34"
506+
dependencies:
507+
bluebird "^3.0.5"
508+
commander "^2.9.0"
509+
lru-cache "^3.2.0"
510+
semver "^5.1.0"
511+
sigmund "^1.0.1"
512+
488513
end-of-stream@^1.0.0:
489514
version "1.4.0"
490515
resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.0.tgz#7a90d833efda6cfa6eac0f4949dbb0fad3a63206"
@@ -1010,7 +1035,7 @@ inherits@2, inherits@^2.0.3, inherits@~2.0.3:
10101035
version "2.0.3"
10111036
resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
10121037

1013-
ini@~1.3.0:
1038+
ini@^1.3.4, ini@~1.3.0:
10141039
version "1.3.4"
10151040
resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.4.tgz#0537cb79daf59b59a1a517dff706c86ec039162e"
10161041

@@ -1176,6 +1201,15 @@ isexe@^2.0.0:
11761201
version "2.0.0"
11771202
resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
11781203

1204+
js-beautify@^1.6.14:
1205+
version "1.6.14"
1206+
resolved "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.6.14.tgz#d3b8f7322d02b9277d58bd238264c327e58044cd"
1207+
dependencies:
1208+
config-chain "~1.1.5"
1209+
editorconfig "^0.13.2"
1210+
mkdirp "~0.5.0"
1211+
nopt "~3.0.1"
1212+
11791213
js-tokens@^3.0.0:
11801214
version "3.0.2"
11811215
resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
@@ -1299,6 +1333,12 @@ lowercase-keys@^1.0.0:
12991333
version "1.0.0"
13001334
resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.0.tgz#4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"
13011335

1336+
lru-cache@^3.2.0:
1337+
version "3.2.0"
1338+
resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-3.2.0.tgz#71789b3b7f5399bec8565dda38aa30d2a097efee"
1339+
dependencies:
1340+
pseudomap "^1.0.1"
1341+
13021342
lru-cache@^4.0.1:
13031343
version "4.1.1"
13041344
resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.1.tgz#622e32e82488b49279114a4f9ecf45e7cd6bba55"
@@ -1345,7 +1385,7 @@ minimist@^1.1.3, minimist@^1.2.0:
13451385
version "1.2.0"
13461386
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
13471387

1348-
mkdirp@^0.5.0, mkdirp@^0.5.1:
1388+
mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0:
13491389
version "0.5.1"
13501390
resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
13511391
dependencies:
@@ -1372,6 +1412,12 @@ natural-compare@^1.4.0:
13721412
version "1.4.0"
13731413
resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
13741414

1415+
nopt@~3.0.1:
1416+
version "3.0.6"
1417+
resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
1418+
dependencies:
1419+
abbrev "1"
1420+
13751421
normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
13761422
version "2.4.0"
13771423
resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f"
@@ -1570,11 +1616,15 @@ progress@^1.1.8:
15701616
version "1.1.8"
15711617
resolved "https://registry.yarnpkg.com/progress/-/progress-1.1.8.tgz#e260c78f6161cdd9b0e56cc3e0a85de17c7a57be"
15721618

1619+
proto-list@~1.2.1:
1620+
version "1.2.4"
1621+
resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
1622+
15731623
proto-props@^0.2.0:
15741624
version "0.2.1"
15751625
resolved "https://registry.yarnpkg.com/proto-props/-/proto-props-0.2.1.tgz#5e01dc2675a0de9abfa76e799dfa334d6f483f4b"
15761626

1577-
pseudomap@^1.0.2:
1627+
pseudomap@^1.0.1, pseudomap@^1.0.2:
15781628
version "1.0.2"
15791629
resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
15801630

@@ -1757,6 +1807,10 @@ shelljs@^0.7.5:
17571807
interpret "^1.0.0"
17581808
rechoir "^0.6.2"
17591809

1810+
sigmund@^1.0.1:
1811+
version "1.0.1"
1812+
resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590"
1813+
17601814
signal-exit@^3.0.0:
17611815
version "3.0.2"
17621816
resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"

0 commit comments

Comments
 (0)