Skip to content

Commit d7c3faa

Browse files
committed
Change toValues() to ES6 Object.values()
1 parent 6e5a8ea commit d7c3faa

File tree

3 files changed

+6
-13
lines changed

3 files changed

+6
-13
lines changed

args.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
function validate(options) {
44
let validated = {}
55
for (let [option, definition] of Object.entries(options)) {
6-
if (!(Array.isArray(definition)) || definition.length < 2) {
6+
if (!Array.isArray(definition) || definition.length < 2) {
77
throw `Option should be defined as '--opt': ['help string', (arg,..) => handle(), 2/*optional order*/], wrong value: ${definition}`
88
}
99
let [info, handler, order] = definition

idea.js

+2-5
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,11 @@ function moduleXml(mod) {
5252
<sourceFolder url="file://$MODULE_DIR$/../../${mod.path}/${p}"
5353
isTestSource="${f.test}" generated="${f.gen}"/>`)
5454

55-
let depmods = toValues(mod.depmods).map(d => `
55+
let depmods = Object.values(mod.depmods).map(d => `
5656
<orderEntry type="module" module-name="${d.mod.name}"
5757
scope="${scope(d)}" ${d.exported ? ' exported=""':''} />`)
5858

59-
let deplibs = toValues(mod.deplibs).map(d => `
59+
let deplibs = Object.values(mod.deplibs).map(d => `
6060
<orderEntry type="library" name="${d.lib.name}"
6161
scope="${scope(d)}" level="project"${d.exported ? ' exported=""':''}/>`)
6262

@@ -73,9 +73,6 @@ function moduleXml(mod) {
7373
</component>
7474
</module>
7575
`
76-
function toValues(o) {
77-
return Object.keys(o).map(k => o[k])
78-
}
7976

8077
function scope(dep) {
8178
if (dep.test) return 'TEST'

solar.js

+3-7
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,15 @@ function dotClasspath(m) {
5151

5252
let depmods = []
5353

54-
for (let d of toValues(m.depmods)) {
54+
for (let d of Object.values(m.depmods)) {
5555
depmods.push(`
5656
<!-- ${d.mod.path} ${d.mod.name} -->
5757
<classpathentry kind="src" path="/${projectName(d.mod)}"${d.exported ? ' exported="true"':''} combineaccessrules="false"/>`)
5858
}
5959

6060
let deplibs = []
6161

62-
for (let d of toValues(m.deplibs)) {
62+
for (let d of Object.values(m.deplibs)) {
6363
for (let i in d.lib.jars) {
6464
let j = d.lib.jars[i]
6565
let s = d.lib.srcs[i]
@@ -87,10 +87,6 @@ function projectName(m) {
8787
return `${mods.rootname}.${m.name}`
8888
}
8989

90-
function toValues(o) {
91-
return Object.keys(o).map(k => o[k])
92-
}
93-
9490
module.exports = {
9591
genProject() {
9692
ops.write('.project', dotProject(mods.rootname, {
@@ -99,7 +95,7 @@ module.exports = {
9995
for (let m of mods.all) {
10096
ops.write(`${m.path}/.project`, dotProject(projectName(m), {
10197
natures: 'java',
102-
projects: toValues(m.depmods).map(m => projectName(m.mod))
98+
projects: Object.values(m.depmods).map(m => projectName(m.mod))
10399
}))
104100
ops.write(`${m.path}/.classpath`, dotClasspath(m))
105101
}

0 commit comments

Comments
 (0)