foosinn/ergogen
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

YAML-ification and minor output restructure

Browse source
This commit is contained in:
Bán Dénes 2021-07-21 21:24:12 +02:00
parent 282e117457
commit fa850a643c
22 changed files with 287 additions and 409 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/cli.js
View file

@ -67,9 +67,7 @@ const single = (data, rel) => {
if (!data) return if (!data) return
const abs = path.join(args.o, rel) const abs = path.join(args.o, rel)
fs.mkdirpSync(path.dirname(abs)) fs.mkdirpSync(path.dirname(abs))
if (abs.endsWith('.json')) { if (abs.endsWith('.yaml')) {
fs.writeJSONSync(abs, data, {spaces: 4})
} else if (abs.endsWith('.yaml')) {
fs.writeFileSync(abs, yaml.dump(data, {indent: 4})) fs.writeFileSync(abs, yaml.dump(data, {indent: 4}))
} else { } else {
fs.writeFileSync(abs, data) fs.writeFileSync(abs, data)
@ -79,9 +77,9 @@ const single = (data, rel) => {
const composite = (data, rel) => { const composite = (data, rel) => {
if (!data) return if (!data) return
const abs = path.join(args.o, rel) const abs = path.join(args.o, rel)
if (data.json) { if (data.yaml) {
fs.mkdirpSync(path.dirname(abs)) fs.mkdirpSync(path.dirname(abs))
fs.writeJSONSync(abs + '.json', data.json, {spaces: 4}) fs.writeFileSync(abs + '.yaml', yaml.dump(data.yaml, {indent: 4}))
} }
for (const format of ['svg', 'dxf', 'jscad', 'stl']) { for (const format of ['svg', 'dxf', 'jscad', 'stl']) {
if (data[format]) { if (data[format]) {
@ -101,11 +99,11 @@ if (args.clean) {
console.log('Writing output to disk...') console.log('Writing output to disk...')
fs.mkdirpSync(args.o) fs.mkdirpSync(args.o)
single(results.raw, 'raw.txt') single(results.raw, 'source/raw.txt')
single(results.canonical, 'canonical.yaml') single(results.canonical, 'source/canonical.yaml')
single(results.units, 'units.json')
single(results.points, 'points/points.json') single(results.units, 'points/units.yaml')
single(results.points, 'points/points.yaml')
composite(results.demo, 'points/demo') composite(results.demo, 'points/demo')
for (const [name, outline] of Object.entries(results.outlines)) { for (const [name, outline] of Object.entries(results.outlines)) {

2
src/io.js
View file

@ -60,7 +60,7 @@ exports.twodee = (model, debug) => {
dxf: makerjs.exporter.toDXF(assembly), dxf: makerjs.exporter.toDXF(assembly),
} }
if (debug) { if (debug) {
result.json = assembly result.yaml = assembly
result.svg = makerjs.exporter.toSVG(assembly) result.svg = makerjs.exporter.toSVG(assembly)
} }
return result return result

91
test/cli/big/reference/outlines/_export.json
View file

@ -1,91 +0,0 @@
{
"models": {
"export": {
"models": {
"a": {
"models": {},
"origin": [
0,
0
]
},
"b": {
"models": {
"a": {
"models": {},
"origin": [
0,
0
]
},
"b": {
"paths": {
"ShapeLine1": {
"type": "line",
"origin": [
-9,
-9
],
"end": [
9,
-9
]
},
"ShapeLine2": {
"type": "line",
"origin": [
9,
-9
],
"end": [
9,
9
]
},
"ShapeLine3": {
"type": "line",
"origin": [
9,
9
],
"end": [
-9,
9
]
},
"ShapeLine4": {
"type": "line",
"origin": [
-9,
9
],
"end": [
-9,
-9
]
}
},
"origin": [
0,
0
]
}
},
"origin": [
0,
0
]
}
},
"origin": [
0,
0
]
}
},
"units": "mm",
"origin": [
0,
0
]
}

62
test/cli/big/reference/outlines/_export.yaml Normal file
View file

@ -0,0 +1,62 @@
models:
export:
models:
a:
models: {}
origin:
- 0
- 0
b:
models:
a:
models: {}
origin:
- 0
- 0
b:
paths:
ShapeLine1:
type: line
origin:
- -9
- -9
end:
- 9
- -9
ShapeLine2:
type: line
origin:
- 9
- -9
end:
- 9
- 9
ShapeLine3:
type: line
origin:
- 9
- 9
end:
- -9
- 9
ShapeLine4:
type: line
origin:
- -9
- 9
end:
- -9
- -9
origin:
- 0
- 0
origin:
- 0
- 0
origin:
- 0
- 0
units: mm
origin:
- 0
- 0

91
test/cli/big/reference/outlines/export.json
View file

@ -1,91 +0,0 @@
{
"models": {
"export": {
"models": {
"a": {
"models": {},
"origin": [
0,
0
]
},
"b": {
"models": {
"a": {
"models": {},
"origin": [
0,
0
]
},
"b": {
"paths": {
"ShapeLine1": {
"type": "line",
"origin": [
-9,
-9
],
"end": [
9,
-9
]
},
"ShapeLine2": {
"type": "line",
"origin": [
9,
-9
],
"end": [
9,
9
]
},
"ShapeLine3": {
"type": "line",
"origin": [
9,
9
],
"end": [
-9,
9
]
},
"ShapeLine4": {
"type": "line",
"origin": [
-9,
9
],
"end": [
-9,
-9
]
}
},
"origin": [
0,
0
]
}
},
"origin": [
0,
0
]
}
},
"origin": [
0,
0
]
}
},
"units": "mm",
"origin": [
0,
0
]
}

62
test/cli/big/reference/outlines/export.yaml Normal file
View file

@ -0,0 +1,62 @@
models:
export:
models:
a:
models: {}
origin:
- 0
- 0
b:
models:
a:
models: {}
origin:
- 0
- 0
b:
paths:
ShapeLine1:
type: line
origin:
- -9
- -9
end:
- 9
- -9
ShapeLine2:
type: line
origin:
- 9
- -9
end:
- 9
- 9
ShapeLine3:
type: line
origin:
- 9
- 9
end:
- -9
- 9
ShapeLine4:
type: line
origin:
- -9
- 9
end:
- -9
- -9
origin:
- 0
- 0
origin:
- 0
- 0
origin:
- 0
- 0
units: mm
origin:
- 0
- 0

69
test/cli/big/reference/points/demo.json
View file

@ -1,69 +0,0 @@
{
"models": {
"export": {
"models": {
"matrix_col_row": {
"paths": {
"top": {
"type": "line",
"origin": [
-9,
9
],
"end": [
9,
9
]
},
"right": {
"type": "line",
"origin": [
9,
9
],
"end": [
9,
-9
]
},
"bottom": {
"type": "line",
"origin": [
9,
-9
],
"end": [
-9,
-9
]
},
"left": {
"type": "line",
"origin": [
-9,
-9
],
"end": [
-9,
9
]
}
},
"origin": [
0,
0
]
}
},
"origin": [
0,
0
]
}
},
"units": "mm",
"origin": [
0,
0
]
}

47
test/cli/big/reference/points/demo.yaml Normal file
View file

@ -0,0 +1,47 @@
models:
export:
models:
matrix_col_row:
paths:
top:
type: line
origin:
- -9
- 9
end:
- 9
- 9
right:
type: line
origin:
- 9
- 9
end:
- 9
- -9
bottom:
type: line
origin:
- 9
- -9
end:
- -9
- -9
left:
type: line
origin:
- -9
- -9
end:
- -9
- 9
origin:
- 0
- 0
origin:
- 0
- 0
units: mm
origin:
- 0
- 0

34
test/cli/big/reference/points/points.json
View file

@ -1,34 +0,0 @@
{
"matrix_col_row": {
"x": 0,
"y": 0,
"r": 0,
"meta": {
"shift": [
0,
0
],
"rotate": 0,
"padding": 19,
"width": 1,
"height": 1,
"skip": false,
"asym": "both",
"name": "matrix_col_row",
"colrow": "col_row",
"col": {
"stagger": 0,
"spread": 0,
"rotate": 0,
"origin": [
0,
0
],
"rows": {},
"key": {},
"name": "col"
},
"row": "row"
}
}
}

27
test/cli/big/reference/points/points.yaml Normal file
View file

@ -0,0 +1,27 @@
matrix_col_row:
x: 0
'y': 0
r: 0
meta:
shift:
- 0
- 0
rotate: 0
padding: 19
width: 1
height: 1
skip: false
asym: both
name: matrix_col_row
colrow: col_row
col:
stagger: 0
spread: 0
rotate: 0
origin:
- 0
- 0
rows: {}
key: {}
name: col
row: row

4
test/cli/big/reference/points/units.yaml Normal file
View file

@ -0,0 +1,4 @@
u: 19
cx: 18
cy: 17
a: 47

0
test/cli/big/reference/canonical.yaml → test/cli/big/reference/source/canonical.yaml
View file

0
test/cli/big/reference/raw.txt → test/cli/big/reference/source/raw.txt
View file

6
test/cli/big/reference/units.json
View file

@ -1,6 +0,0 @@
{
"u": 19,
"cx": 18,
"cy": 17,
"a": 47
}

69
test/cli/minimal/reference/points/demo.json
View file

@ -1,69 +0,0 @@
{
"models": {
"export": {
"models": {
"matrix_col_row": {
"paths": {
"top": {
"type": "line",
"origin": [
-9,
9
],
"end": [
9,
9
]
},
"right": {
"type": "line",
"origin": [
9,
9
],
"end": [
9,
-9
]
},
"bottom": {
"type": "line",
"origin": [
9,
-9
],
"end": [
-9,
-9
]
},
"left": {
"type": "line",
"origin": [
-9,
-9
],
"end": [
-9,
9
]
}
},
"origin": [
0,
0
]
}
},
"origin": [
0,
0
]
}
},
"units": "mm",
"origin": [
0,
0
]
}

47
test/cli/minimal/reference/points/demo.yaml Normal file
View file

@ -0,0 +1,47 @@
models:
export:
models:
matrix_col_row:
paths:
top:
type: line
origin:
- -9
- 9
end:
- 9
- 9
right:
type: line
origin:
- 9
- 9
end:
- 9
- -9
bottom:
type: line
origin:
- 9
- -9
end:
- -9
- -9
left:
type: line
origin:
- -9
- -9
end:
- -9
- 9
origin:
- 0
- 0
origin:
- 0
- 0
units: mm
origin:
- 0
- 0

34
test/cli/minimal/reference/points/points.json
View file

@ -1,34 +0,0 @@
{
"matrix_col_row": {
"x": 0,
"y": 0,
"r": 0,
"meta": {
"shift": [
0,
0
],
"rotate": 0,
"padding": 19,
"width": 1,
"height": 1,
"skip": false,
"asym": "both",
"name": "matrix_col_row",
"colrow": "col_row",
"col": {
"stagger": 0,
"spread": 0,
"rotate": 0,
"origin": [
0,
0
],
"rows": {},
"key": {},
"name": "col"
},
"row": "row"
}
}
}

27
test/cli/minimal/reference/points/points.yaml Normal file
View file

@ -0,0 +1,27 @@
matrix_col_row:
x: 0
'y': 0
r: 0
meta:
shift:
- 0
- 0
rotate: 0
padding: 19
width: 1
height: 1
skip: false
asym: both
name: matrix_col_row
colrow: col_row
col:
stagger: 0
spread: 0
rotate: 0
origin:
- 0
- 0
rows: {}
key: {}
name: col
row: row

3
test/cli/minimal/reference/points/units.yaml Normal file
View file

@ -0,0 +1,3 @@
u: 19
cx: 18
cy: 17

0
test/cli/minimal/reference/canonical.yaml → test/cli/minimal/reference/source/canonical.yaml
View file

0
test/cli/minimal/reference/raw.txt → test/cli/minimal/reference/source/raw.txt
View file

5
test/cli/minimal/reference/units.json
View file

@ -1,5 +0,0 @@
{
"u": 19,
"cx": 18,
"cy": 17
}