CLI and output restructure, SVG/DXF/STL integration
This commit is contained in:
Bán Dénes
parent
c49881c2b4
commit
42a3e2de55
7 changed files with 730 additions and 154 deletions
645
package-lock.json
generated
645
package-lock.json
generated
|
|
@ -8,8 +8,10 @@
|
|||
"version": "2.0.0",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@jscad/openjscad": "^1.6.1",
|
||||
"fs-extra": "^9.0.1",
|
||||
"js-yaml": "^3.14.0",
|
||||
"json5": "^2.2.0",
|
||||
"makerjs": "github:mrzealot/maker.js-dist#a0ca32948845efe8ad5c9ca454f1285926853138",
|
||||
"mathjs": "^8.1.1",
|
||||
"yargs": "^15.4.1"
|
||||
|
|
@ -63,15 +65,6 @@
|
|||
"node": ">=6.9.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@babel/core/node_modules/debug": {
|
||||
"version": "4.1.1",
|
||||
"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
|
||||
"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"ms": "^2.1.1"
|
||||
}
|
||||
},
|
||||
"node_modules/@babel/core/node_modules/semver": {
|
||||
"version": "5.7.1",
|
||||
"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
|
||||
|
|
@ -254,15 +247,6 @@
|
|||
"lodash": "^4.17.13"
|
||||
}
|
||||
},
|
||||
"node_modules/@babel/traverse/node_modules/debug": {
|
||||
"version": "4.1.1",
|
||||
"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
|
||||
"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"ms": "^2.1.1"
|
||||
}
|
||||
},
|
||||
"node_modules/@babel/types": {
|
||||
"version": "7.10.2",
|
||||
"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.2.tgz",
|
||||
|
|
@ -304,6 +288,205 @@
|
|||
"node": ">=8"
|
||||
}
|
||||
},
|
||||
"node_modules/@jscad/amf-deserializer": {
|
||||
"version": "0.0.4",
|
||||
"resolved": "https://registry.npmjs.org/@jscad/amf-deserializer/-/amf-deserializer-0.0.4.tgz",
|
||||
"integrity": "sha1-BB3uKQrNpBEPs7m/hxoepUIDTCs=",
|
||||
"dependencies": {
|
||||
"sax": "^1.2.1"
|
||||
}
|
||||
},
|
||||
"node_modules/@jscad/amf-serializer": {
|
||||
"version": "0.0.5",
|
||||
"resolved": "https://registry.npmjs.org/@jscad/amf-serializer/-/amf-serializer-0.0.5.tgz",
|
||||
"integrity": "sha1-3A+Hx7LG15/F9rZnfwxoag0/Bg4=",
|
||||
"dependencies": {
|
||||
"@jscad/io-utils": "^0.1.2",
|
||||
"sax": "^1.2.1",
|
||||
"xmldom": "^0.1.27"
|
||||
}
|
||||
},
|
||||
"node_modules/@jscad/csg": {
|
||||
"version": "0.3.6",
|
||||
"resolved": "https://registry.npmjs.org/@jscad/csg/-/csg-0.3.6.tgz",
|
||||
"integrity": "sha512-GoUXhTwO0L+Cxba8VfFFLGm+ECd0xZKoIAPpeUYsDiCVsIZ6XK+3GLgBgn5waeumQNh+H6WsHjMMRKXBrDBreA==",
|
||||
"deprecated": "See @jscad/modeling"
|
||||
},
|
||||
"node_modules/@jscad/dxf-serializer": {
|
||||
"version": "0.0.4",
|
||||
"resolved": "https://registry.npmjs.org/@jscad/dxf-serializer/-/dxf-serializer-0.0.4.tgz",
|
||||
"integrity": "sha1-P7O3a2HmqYfiUIJ8SWNPAHNvasg="
|
||||
},
|
||||
"node_modules/@jscad/gcode-deserializer": {
|
||||
"version": "0.0.4",
|
||||
"resolved": "https://registry.npmjs.org/@jscad/gcode-deserializer/-/gcode-deserializer-0.0.4.tgz",
|
||||
"integrity": "sha1-pdk+zvhGvzCllvUCHXs26mKhOic="
|
||||
},
|
||||
"node_modules/@jscad/io": {
|
||||
"version": "0.3.7",
|
||||
"resolved": "https://registry.npmjs.org/@jscad/io/-/io-0.3.7.tgz",
|
||||
"integrity": "sha1-CNWCv/0juTdopkvYo3Qv3De86u4=",
|
||||
"dependencies": {
|
||||
"@jscad/amf-deserializer": "^0.0.4",
|
||||
"@jscad/amf-serializer": "^0.0.5",
|
||||
"@jscad/dxf-serializer": "^0.0.4",
|
||||
"@jscad/gcode-deserializer": "^0.0.4",
|
||||
"@jscad/io-utils": "^0.1.2",
|
||||
"@jscad/json-deserializer": "^0.0.4",
|
||||
"@jscad/json-serializer": "^0.0.5",
|
||||
"@jscad/obj-deserializer": "^0.0.4",
|
||||
"@jscad/stl-deserializer": "^0.1.2",
|
||||
"@jscad/stl-serializer": "^0.0.6",
|
||||
"@jscad/svg-deserializer": "^0.2.3",
|
||||
"@jscad/svg-serializer": "^0.0.4",
|
||||
"@jscad/x3d-serializer": "^0.0.6"
|
||||
}
|
||||
},
|
||||
"node_modules/@jscad/io-utils": {
|
||||
"version": "0.1.3",
|
||||
"resolved": "https://registry.npmjs.org/@jscad/io-utils/-/io-utils-0.1.3.tgz",
|
||||
"integrity": "sha512-aCVUZovewI4njtEJ1fvjhasqd8EHIzQaPb88MtFWf/ff1NdGOu/vRH3yGG8vu0NZektGEDCKp028g2nTBL7aFg=="
|
||||
},
|
||||
"node_modules/@jscad/json-deserializer": {
|
||||
"version": "0.0.4",
|
||||
"resolved": "https://registry.npmjs.org/@jscad/json-deserializer/-/json-deserializer-0.0.4.tgz",
|
||||
"integrity": "sha1-ffpQCUUoh5LgTlcaDCTxXFXuurA=",
|
||||
"dependencies": {
|
||||
"@jscad/csg": "0.3.6"
|
||||
}
|
||||
},
|
||||
"node_modules/@jscad/json-serializer": {
|
||||
"version": "0.0.5",
|
||||
"resolved": "https://registry.npmjs.org/@jscad/json-serializer/-/json-serializer-0.0.5.tgz",
|
||||
"integrity": "sha1-DEAQz7ZyntspQnJycvlB0TAZR7g=",
|
||||
"dependencies": {
|
||||
"@jscad/csg": "0.3.6",
|
||||
"@jscad/io-utils": "^0.1.2"
|
||||
}
|
||||
},
|
||||
"node_modules/@jscad/obj-deserializer": {
|
||||
"version": "0.0.4",
|
||||
"resolved": "https://registry.npmjs.org/@jscad/obj-deserializer/-/obj-deserializer-0.0.4.tgz",
|
||||
"integrity": "sha1-3LPPXMRyeKfPejW3azLq0NBE38M="
|
||||
},
|
||||
"node_modules/@jscad/openjscad": {
|
||||
"version": "1.6.1",
|
||||
"resolved": "https://registry.npmjs.org/@jscad/openjscad/-/openjscad-1.6.1.tgz",
|
||||
"integrity": "sha512-D8W/ErfXhERXXbx9jGD75IupYEw85XyEF2lgrpekJaqKzETJRYAiQeggPEYk1U4zd8i6swoCNTkqgGI3NYdnQg==",
|
||||
"deprecated": "See @jscad for a list of supported packages",
|
||||
"hasInstallScript": true,
|
||||
"dependencies": {
|
||||
"@jscad/csg": "0.3.6",
|
||||
"@jscad/io": "0.3.7",
|
||||
"@jscad/openscad-openjscad-translator": "0.0.10",
|
||||
"@jscad/scad-api": "^0.5.1",
|
||||
"astring": "^1.0.2",
|
||||
"brace": "0.10.0",
|
||||
"esprima": "^3.1.3",
|
||||
"estraverse": "^4.2.0",
|
||||
"most-gestures": "^0.3.0",
|
||||
"webworkify": "^1.4.0"
|
||||
},
|
||||
"bin": {
|
||||
"openjscad": "src/cli/cli.js"
|
||||
}
|
||||
},
|
||||
"node_modules/@jscad/openjscad/node_modules/esprima": {
|
||||
"version": "3.1.3",
|
||||
"resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
|
||||
"integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=",
|
||||
"bin": {
|
||||
"esparse": "bin/esparse.js",
|
||||
"esvalidate": "bin/esvalidate.js"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=4"
|
||||
}
|
||||
},
|
||||
"node_modules/@jscad/openscad-openjscad-translator": {
|
||||
"version": "0.0.10",
|
||||
"resolved": "https://registry.npmjs.org/@jscad/openscad-openjscad-translator/-/openscad-openjscad-translator-0.0.10.tgz",
|
||||
"integrity": "sha1-b1o9wlL9ILr1I6sRwfwqPdqlfns=",
|
||||
"deprecated": "See @jscad/scad-deserializer",
|
||||
"dependencies": {
|
||||
"lodash": "^4.17.4",
|
||||
"sylvester": "github:kaosat-dev/node-sylvester"
|
||||
}
|
||||
},
|
||||
"node_modules/@jscad/scad-api": {
|
||||
"version": "0.5.1",
|
||||
"resolved": "https://registry.npmjs.org/@jscad/scad-api/-/scad-api-0.5.1.tgz",
|
||||
"integrity": "sha512-1BlfqcAf0xIicbaKU1bCOxHh0+aHJ7fBRY6r+7/e+0uMrfoqHoULGqkAZCwnftt0cPj5uAP8JSlyOinHKaFIJw==",
|
||||
"deprecated": "See @jscad/modeling",
|
||||
"dependencies": {
|
||||
"@jscad/csg": "0.3.7"
|
||||
}
|
||||
},
|
||||
"node_modules/@jscad/scad-api/node_modules/@jscad/csg": {
|
||||
"version": "0.3.7",
|
||||
"resolved": "https://registry.npmjs.org/@jscad/csg/-/csg-0.3.7.tgz",
|
||||
"integrity": "sha512-CuqKgXEZDH1FzbwQTdMWQ0FiEGi+LrP32tP6nW6rdWEEBjL6w19F3OrShD7SP8mK9IcqiuhgN9JcbWaiBswWlQ==",
|
||||
"deprecated": "See @jscad/modeling"
|
||||
},
|
||||
"node_modules/@jscad/stl-deserializer": {
|
||||
"version": "0.1.2",
|
||||
"resolved": "https://registry.npmjs.org/@jscad/stl-deserializer/-/stl-deserializer-0.1.2.tgz",
|
||||
"integrity": "sha1-P05QMMjBgf6Xwniz5pdOojemM4M=",
|
||||
"dependencies": {
|
||||
"@jscad/csg": "0.3.6",
|
||||
"@jscad/io-utils": "^0.1.2"
|
||||
}
|
||||
},
|
||||
"node_modules/@jscad/stl-serializer": {
|
||||
"version": "0.0.6",
|
||||
"resolved": "https://registry.npmjs.org/@jscad/stl-serializer/-/stl-serializer-0.0.6.tgz",
|
||||
"integrity": "sha1-OIDuOw2YzeYhpVg92GDcN6kAZtQ=",
|
||||
"dependencies": {
|
||||
"@jscad/io-utils": "^0.1.2"
|
||||
}
|
||||
},
|
||||
"node_modules/@jscad/svg-deserializer": {
|
||||
"version": "0.2.3",
|
||||
"resolved": "https://registry.npmjs.org/@jscad/svg-deserializer/-/svg-deserializer-0.2.3.tgz",
|
||||
"integrity": "sha1-HbFVKSax7J7yXLjYE0ryZfYOTSI=",
|
||||
"dependencies": {
|
||||
"@jscad/csg": "0.3.6",
|
||||
"sax": "1.2.4"
|
||||
}
|
||||
},
|
||||
"node_modules/@jscad/svg-serializer": {
|
||||
"version": "0.0.4",
|
||||
"resolved": "https://registry.npmjs.org/@jscad/svg-serializer/-/svg-serializer-0.0.4.tgz",
|
||||
"integrity": "sha1-uqYjfTPtbg96AS8rtgYTopXiUdE=",
|
||||
"dependencies": {
|
||||
"@jscad/csg": "0.3.6"
|
||||
}
|
||||
},
|
||||
"node_modules/@jscad/x3d-serializer": {
|
||||
"version": "0.0.6",
|
||||
"resolved": "https://registry.npmjs.org/@jscad/x3d-serializer/-/x3d-serializer-0.0.6.tgz",
|
||||
"integrity": "sha1-pBl1qeN0B2E2JkjklutkKTuD99c=",
|
||||
"dependencies": {
|
||||
"@jscad/io-utils": "^0.1.2",
|
||||
"xmldom": "^0.1.27"
|
||||
}
|
||||
},
|
||||
"node_modules/@most/multicast": {
|
||||
"version": "1.3.0",
|
||||
"resolved": "https://registry.npmjs.org/@most/multicast/-/multicast-1.3.0.tgz",
|
||||
"integrity": "sha512-DWH8AShgp5bXn+auGzf5tzPxvpmEvQJd0CNsApOci1LDF4eAEcnw4HQOr2Jaa+L92NbDYFKBSXxll+i7r1ikvw==",
|
||||
"dependencies": {
|
||||
"@most/prelude": "^1.4.0"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"most": "^1.0.1"
|
||||
}
|
||||
},
|
||||
"node_modules/@most/prelude": {
|
||||
"version": "1.8.0",
|
||||
"resolved": "https://registry.npmjs.org/@most/prelude/-/prelude-1.8.0.tgz",
|
||||
"integrity": "sha512-t1CcURpZzfmBA6fEWwqmCqeNzWAj1w2WqEmCk/2yXMe/p8Ut000wFmVKMy8A1Rl9VVxZEZ5nBHd/pU0dR4bv/w=="
|
||||
},
|
||||
"node_modules/@rollup/plugin-commonjs": {
|
||||
"version": "13.0.2",
|
||||
"resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-13.0.2.tgz",
|
||||
|
|
@ -485,6 +668,14 @@
|
|||
"node": "*"
|
||||
}
|
||||
},
|
||||
"node_modules/astring": {
|
||||
"version": "1.7.5",
|
||||
"resolved": "https://registry.npmjs.org/astring/-/astring-1.7.5.tgz",
|
||||
"integrity": "sha512-lobf6RWXb8c4uZ7Mdq0U12efYmpD1UFnyOWVJPTa3ukqZrMopav+2hdNu0hgBF0JIBFK9QgrBDfwYvh3DFJDAA==",
|
||||
"bin": {
|
||||
"astring": "bin/astring"
|
||||
}
|
||||
},
|
||||
"node_modules/at-least-node": {
|
||||
"version": "1.0.0",
|
||||
"resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
|
||||
|
|
@ -513,6 +704,14 @@
|
|||
"node": ">=8"
|
||||
}
|
||||
},
|
||||
"node_modules/brace": {
|
||||
"version": "0.10.0",
|
||||
"resolved": "https://registry.npmjs.org/brace/-/brace-0.10.0.tgz",
|
||||
"integrity": "sha1-7e9OubCSi6HuX3F//BV3SabdXXY=",
|
||||
"dependencies": {
|
||||
"w3c-blob": "0.0.1"
|
||||
}
|
||||
},
|
||||
"node_modules/brace-expansion": {
|
||||
"version": "1.1.11",
|
||||
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
|
||||
|
|
@ -800,7 +999,6 @@
|
|||
"version": "1.1.3",
|
||||
"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
|
||||
"integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"object-keys": "^1.0.12"
|
||||
},
|
||||
|
|
@ -911,6 +1109,14 @@
|
|||
"node": ">=4"
|
||||
}
|
||||
},
|
||||
"node_modules/estraverse": {
|
||||
"version": "4.3.0",
|
||||
"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
|
||||
"integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
|
||||
"engines": {
|
||||
"node": ">=4.0"
|
||||
}
|
||||
},
|
||||
"node_modules/estree-walker": {
|
||||
"version": "1.0.1",
|
||||
"resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz",
|
||||
|
|
@ -1106,6 +1312,20 @@
|
|||
"node": ">=4"
|
||||
}
|
||||
},
|
||||
"node_modules/globalthis": {
|
||||
"version": "1.0.2",
|
||||
"resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.2.tgz",
|
||||
"integrity": "sha512-ZQnSFO1la8P7auIOQECnm0sSuoMeaSq0EEdXMBFF2QJO4uNcwbyhSgG3MruWNbFTqCLmxVwGOl7LZ9kASvHdeQ==",
|
||||
"dependencies": {
|
||||
"define-properties": "^1.1.3"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">= 0.4"
|
||||
},
|
||||
"funding": {
|
||||
"url": "https://github.com/sponsors/ljharb"
|
||||
}
|
||||
},
|
||||
"node_modules/graceful-fs": {
|
||||
"version": "4.2.4",
|
||||
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
|
||||
|
|
@ -1484,15 +1704,6 @@
|
|||
"node": ">=8"
|
||||
}
|
||||
},
|
||||
"node_modules/istanbul-lib-source-maps/node_modules/debug": {
|
||||
"version": "4.1.1",
|
||||
"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
|
||||
"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"ms": "^2.1.1"
|
||||
}
|
||||
},
|
||||
"node_modules/istanbul-lib-source-maps/node_modules/source-map": {
|
||||
"version": "0.6.1",
|
||||
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
|
||||
|
|
@ -1567,10 +1778,9 @@
|
|||
}
|
||||
},
|
||||
"node_modules/json5": {
|
||||
"version": "2.1.3",
|
||||
"resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz",
|
||||
"integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==",
|
||||
"dev": true,
|
||||
"version": "2.2.0",
|
||||
"resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
|
||||
"integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
|
||||
"dependencies": {
|
||||
"minimist": "^1.2.5"
|
||||
},
|
||||
|
|
@ -1609,8 +1819,7 @@
|
|||
"node_modules/lodash": {
|
||||
"version": "4.17.21",
|
||||
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
|
||||
"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
|
||||
"dev": true
|
||||
"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
|
||||
},
|
||||
"node_modules/lodash.flattendeep": {
|
||||
"version": "4.4.0",
|
||||
|
|
@ -1717,8 +1926,7 @@
|
|||
"node_modules/minimist": {
|
||||
"version": "1.2.5",
|
||||
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
|
||||
"integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
|
||||
"dev": true
|
||||
"integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
|
||||
},
|
||||
"node_modules/mocha": {
|
||||
"version": "8.1.3",
|
||||
|
|
@ -2006,6 +2214,25 @@
|
|||
"node": ">=4"
|
||||
}
|
||||
},
|
||||
"node_modules/most": {
|
||||
"version": "1.9.0",
|
||||
"resolved": "https://registry.npmjs.org/most/-/most-1.9.0.tgz",
|
||||
"integrity": "sha512-M7yHMcMGaclzEL6eg8Yh8PlAsaWfL/oSThF4+ZuWKM5CKXcbzmLh+qESwgZFzMKHJ+iVJwb28yFvDEOobI653w==",
|
||||
"dependencies": {
|
||||
"@most/multicast": "^1.2.5",
|
||||
"@most/prelude": "^1.4.0",
|
||||
"globalthis": "^1.0.1",
|
||||
"symbol-observable": "^2.0.3"
|
||||
}
|
||||
},
|
||||
"node_modules/most-gestures": {
|
||||
"version": "0.3.0",
|
||||
"resolved": "https://registry.npmjs.org/most-gestures/-/most-gestures-0.3.0.tgz",
|
||||
"integrity": "sha1-Y07mZK2vU9dA0BSKa0tNF0QDpHg=",
|
||||
"dependencies": {
|
||||
"most": "^1.7.2"
|
||||
}
|
||||
},
|
||||
"node_modules/ms": {
|
||||
"version": "2.1.2",
|
||||
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
|
||||
|
|
@ -2084,7 +2311,6 @@
|
|||
"version": "1.1.1",
|
||||
"resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
|
||||
"integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
|
||||
"dev": true,
|
||||
"engines": {
|
||||
"node": ">= 0.4"
|
||||
}
|
||||
|
|
@ -2357,6 +2583,11 @@
|
|||
"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
|
||||
"dev": true
|
||||
},
|
||||
"node_modules/sax": {
|
||||
"version": "1.2.4",
|
||||
"resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
|
||||
"integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
|
||||
},
|
||||
"node_modules/seedrandom": {
|
||||
"version": "3.0.5",
|
||||
"resolved": "https://registry.npmjs.org/seedrandom/-/seedrandom-3.0.5.tgz",
|
||||
|
|
@ -2532,6 +2763,23 @@
|
|||
"node": ">=8"
|
||||
}
|
||||
},
|
||||
"node_modules/sylvester": {
|
||||
"name": "@kaosat-dev/sylvester",
|
||||
"version": "0.0.21",
|
||||
"resolved": "git+ssh://git@github.com/kaosat-dev/node-sylvester.git#ce74d23a2092ae02a56b840ef70f5d61c54df409",
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">=0.2.6"
|
||||
}
|
||||
},
|
||||
"node_modules/symbol-observable": {
|
||||
"version": "2.0.3",
|
||||
"resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-2.0.3.tgz",
|
||||
"integrity": "sha512-sQV7phh2WCYAn81oAkakC5qjq2Ml0g8ozqz03wOGnx9dDlG1de6yrF+0RAzSJD8fPUow3PTSMf2SAbOGxb93BA==",
|
||||
"engines": {
|
||||
"node": ">=0.10"
|
||||
}
|
||||
},
|
||||
"node_modules/test-exclude": {
|
||||
"version": "6.0.0",
|
||||
"resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
|
||||
|
|
@ -2624,6 +2872,16 @@
|
|||
"uuid": "bin/uuid"
|
||||
}
|
||||
},
|
||||
"node_modules/w3c-blob": {
|
||||
"version": "0.0.1",
|
||||
"resolved": "https://registry.npmjs.org/w3c-blob/-/w3c-blob-0.0.1.tgz",
|
||||
"integrity": "sha1-sM01KhpQ9RVWNCD/1YYflQ8dhbg="
|
||||
},
|
||||
"node_modules/webworkify": {
|
||||
"version": "1.5.0",
|
||||
"resolved": "https://registry.npmjs.org/webworkify/-/webworkify-1.5.0.tgz",
|
||||
"integrity": "sha512-AMcUeyXAhbACL8S2hqqdqOLqvJ8ylmIbNwUIqQujRSouf4+eUFaXbG6F1Rbu+srlJMmxQWsiU7mOJi0nMBfM1g=="
|
||||
},
|
||||
"node_modules/which": {
|
||||
"version": "2.0.2",
|
||||
"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
|
||||
|
|
@ -2733,6 +2991,15 @@
|
|||
"typedarray-to-buffer": "^3.1.5"
|
||||
}
|
||||
},
|
||||
"node_modules/xmldom": {
|
||||
"version": "0.1.31",
|
||||
"resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.31.tgz",
|
||||
"integrity": "sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ==",
|
||||
"deprecated": "Deprecated due to CVE-2021-21366 resolved in 0.5.0",
|
||||
"engines": {
|
||||
"node": ">=0.1"
|
||||
}
|
||||
},
|
||||
"node_modules/y18n": {
|
||||
"version": "4.0.1",
|
||||
"resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz",
|
||||
|
|
@ -2999,15 +3266,6 @@
|
|||
"source-map": "^0.5.0"
|
||||
},
|
||||
"dependencies": {
|
||||
"debug": {
|
||||
"version": "4.1.1",
|
||||
"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
|
||||
"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"ms": "^2.1.1"
|
||||
}
|
||||
},
|
||||
"semver": {
|
||||
"version": "5.7.1",
|
||||
"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
|
||||
|
|
@ -3181,17 +3439,6 @@
|
|||
"debug": "^4.1.0",
|
||||
"globals": "^11.1.0",
|
||||
"lodash": "^4.17.13"
|
||||
},
|
||||
"dependencies": {
|
||||
"debug": {
|
||||
"version": "4.1.1",
|
||||
"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
|
||||
"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"ms": "^2.1.1"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"@babel/types": {
|
||||
|
|
@ -3229,6 +3476,190 @@
|
|||
"integrity": "sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==",
|
||||
"dev": true
|
||||
},
|
||||
"@jscad/amf-deserializer": {
|
||||
"version": "0.0.4",
|
||||
"resolved": "https://registry.npmjs.org/@jscad/amf-deserializer/-/amf-deserializer-0.0.4.tgz",
|
||||
"integrity": "sha1-BB3uKQrNpBEPs7m/hxoepUIDTCs=",
|
||||
"requires": {
|
||||
"sax": "^1.2.1"
|
||||
}
|
||||
},
|
||||
"@jscad/amf-serializer": {
|
||||
"version": "0.0.5",
|
||||
"resolved": "https://registry.npmjs.org/@jscad/amf-serializer/-/amf-serializer-0.0.5.tgz",
|
||||
"integrity": "sha1-3A+Hx7LG15/F9rZnfwxoag0/Bg4=",
|
||||
"requires": {
|
||||
"@jscad/io-utils": "^0.1.2",
|
||||
"sax": "^1.2.1",
|
||||
"xmldom": "^0.1.27"
|
||||
}
|
||||
},
|
||||
"@jscad/csg": {
|
||||
"version": "0.3.6",
|
||||
"resolved": "https://registry.npmjs.org/@jscad/csg/-/csg-0.3.6.tgz",
|
||||
"integrity": "sha512-GoUXhTwO0L+Cxba8VfFFLGm+ECd0xZKoIAPpeUYsDiCVsIZ6XK+3GLgBgn5waeumQNh+H6WsHjMMRKXBrDBreA=="
|
||||
},
|
||||
"@jscad/dxf-serializer": {
|
||||
"version": "0.0.4",
|
||||
"resolved": "https://registry.npmjs.org/@jscad/dxf-serializer/-/dxf-serializer-0.0.4.tgz",
|
||||
"integrity": "sha1-P7O3a2HmqYfiUIJ8SWNPAHNvasg="
|
||||
},
|
||||
"@jscad/gcode-deserializer": {
|
||||
"version": "0.0.4",
|
||||
"resolved": "https://registry.npmjs.org/@jscad/gcode-deserializer/-/gcode-deserializer-0.0.4.tgz",
|
||||
"integrity": "sha1-pdk+zvhGvzCllvUCHXs26mKhOic="
|
||||
},
|
||||
"@jscad/io": {
|
||||
"version": "0.3.7",
|
||||
"resolved": "https://registry.npmjs.org/@jscad/io/-/io-0.3.7.tgz",
|
||||
"integrity": "sha1-CNWCv/0juTdopkvYo3Qv3De86u4=",
|
||||
"requires": {
|
||||
"@jscad/amf-deserializer": "^0.0.4",
|
||||
"@jscad/amf-serializer": "^0.0.5",
|
||||
"@jscad/dxf-serializer": "^0.0.4",
|
||||
"@jscad/gcode-deserializer": "^0.0.4",
|
||||
"@jscad/io-utils": "^0.1.2",
|
||||
"@jscad/json-deserializer": "^0.0.4",
|
||||
"@jscad/json-serializer": "^0.0.5",
|
||||
"@jscad/obj-deserializer": "^0.0.4",
|
||||
"@jscad/stl-deserializer": "^0.1.2",
|
||||
"@jscad/stl-serializer": "^0.0.6",
|
||||
"@jscad/svg-deserializer": "^0.2.3",
|
||||
"@jscad/svg-serializer": "^0.0.4",
|
||||
"@jscad/x3d-serializer": "^0.0.6"
|
||||
}
|
||||
},
|
||||
"@jscad/io-utils": {
|
||||
"version": "0.1.3",
|
||||
"resolved": "https://registry.npmjs.org/@jscad/io-utils/-/io-utils-0.1.3.tgz",
|
||||
"integrity": "sha512-aCVUZovewI4njtEJ1fvjhasqd8EHIzQaPb88MtFWf/ff1NdGOu/vRH3yGG8vu0NZektGEDCKp028g2nTBL7aFg=="
|
||||
},
|
||||
"@jscad/json-deserializer": {
|
||||
"version": "0.0.4",
|
||||
"resolved": "https://registry.npmjs.org/@jscad/json-deserializer/-/json-deserializer-0.0.4.tgz",
|
||||
"integrity": "sha1-ffpQCUUoh5LgTlcaDCTxXFXuurA=",
|
||||
"requires": {
|
||||
"@jscad/csg": "0.3.6"
|
||||
}
|
||||
},
|
||||
"@jscad/json-serializer": {
|
||||
"version": "0.0.5",
|
||||
"resolved": "https://registry.npmjs.org/@jscad/json-serializer/-/json-serializer-0.0.5.tgz",
|
||||
"integrity": "sha1-DEAQz7ZyntspQnJycvlB0TAZR7g=",
|
||||
"requires": {
|
||||
"@jscad/csg": "0.3.6",
|
||||
"@jscad/io-utils": "^0.1.2"
|
||||
}
|
||||
},
|
||||
"@jscad/obj-deserializer": {
|
||||
"version": "0.0.4",
|
||||
"resolved": "https://registry.npmjs.org/@jscad/obj-deserializer/-/obj-deserializer-0.0.4.tgz",
|
||||
"integrity": "sha1-3LPPXMRyeKfPejW3azLq0NBE38M="
|
||||
},
|
||||
"@jscad/openjscad": {
|
||||
"version": "1.6.1",
|
||||
"resolved": "https://registry.npmjs.org/@jscad/openjscad/-/openjscad-1.6.1.tgz",
|
||||
"integrity": "sha512-D8W/ErfXhERXXbx9jGD75IupYEw85XyEF2lgrpekJaqKzETJRYAiQeggPEYk1U4zd8i6swoCNTkqgGI3NYdnQg==",
|
||||
"requires": {
|
||||
"@jscad/csg": "0.3.6",
|
||||
"@jscad/io": "0.3.7",
|
||||
"@jscad/openscad-openjscad-translator": "0.0.10",
|
||||
"@jscad/scad-api": "^0.5.1",
|
||||
"astring": "^1.0.2",
|
||||
"brace": "0.10.0",
|
||||
"esprima": "^3.1.3",
|
||||
"estraverse": "^4.2.0",
|
||||
"most-gestures": "^0.3.0",
|
||||
"webworkify": "^1.4.0"
|
||||
},
|
||||
"dependencies": {
|
||||
"esprima": {
|
||||
"version": "3.1.3",
|
||||
"resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
|
||||
"integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM="
|
||||
}
|
||||
}
|
||||
},
|
||||
"@jscad/openscad-openjscad-translator": {
|
||||
"version": "0.0.10",
|
||||
"resolved": "https://registry.npmjs.org/@jscad/openscad-openjscad-translator/-/openscad-openjscad-translator-0.0.10.tgz",
|
||||
"integrity": "sha1-b1o9wlL9ILr1I6sRwfwqPdqlfns=",
|
||||
"requires": {
|
||||
"lodash": "^4.17.4",
|
||||
"sylvester": "github:kaosat-dev/node-sylvester"
|
||||
}
|
||||
},
|
||||
"@jscad/scad-api": {
|
||||
"version": "0.5.1",
|
||||
"resolved": "https://registry.npmjs.org/@jscad/scad-api/-/scad-api-0.5.1.tgz",
|
||||
"integrity": "sha512-1BlfqcAf0xIicbaKU1bCOxHh0+aHJ7fBRY6r+7/e+0uMrfoqHoULGqkAZCwnftt0cPj5uAP8JSlyOinHKaFIJw==",
|
||||
"requires": {
|
||||
"@jscad/csg": "0.3.7"
|
||||
},
|
||||
"dependencies": {
|
||||
"@jscad/csg": {
|
||||
"version": "0.3.7",
|
||||
"resolved": "https://registry.npmjs.org/@jscad/csg/-/csg-0.3.7.tgz",
|
||||
"integrity": "sha512-CuqKgXEZDH1FzbwQTdMWQ0FiEGi+LrP32tP6nW6rdWEEBjL6w19F3OrShD7SP8mK9IcqiuhgN9JcbWaiBswWlQ=="
|
||||
}
|
||||
}
|
||||
},
|
||||
"@jscad/stl-deserializer": {
|
||||
"version": "0.1.2",
|
||||
"resolved": "https://registry.npmjs.org/@jscad/stl-deserializer/-/stl-deserializer-0.1.2.tgz",
|
||||
"integrity": "sha1-P05QMMjBgf6Xwniz5pdOojemM4M=",
|
||||
"requires": {
|
||||
"@jscad/csg": "0.3.6",
|
||||
"@jscad/io-utils": "^0.1.2"
|
||||
}
|
||||
},
|
||||
"@jscad/stl-serializer": {
|
||||
"version": "0.0.6",
|
||||
"resolved": "https://registry.npmjs.org/@jscad/stl-serializer/-/stl-serializer-0.0.6.tgz",
|
||||
"integrity": "sha1-OIDuOw2YzeYhpVg92GDcN6kAZtQ=",
|
||||
"requires": {
|
||||
"@jscad/io-utils": "^0.1.2"
|
||||
}
|
||||
},
|
||||
"@jscad/svg-deserializer": {
|
||||
"version": "0.2.3",
|
||||
"resolved": "https://registry.npmjs.org/@jscad/svg-deserializer/-/svg-deserializer-0.2.3.tgz",
|
||||
"integrity": "sha1-HbFVKSax7J7yXLjYE0ryZfYOTSI=",
|
||||
"requires": {
|
||||
"@jscad/csg": "0.3.6",
|
||||
"sax": "1.2.4"
|
||||
}
|
||||
},
|
||||
"@jscad/svg-serializer": {
|
||||
"version": "0.0.4",
|
||||
"resolved": "https://registry.npmjs.org/@jscad/svg-serializer/-/svg-serializer-0.0.4.tgz",
|
||||
"integrity": "sha1-uqYjfTPtbg96AS8rtgYTopXiUdE=",
|
||||
"requires": {
|
||||
"@jscad/csg": "0.3.6"
|
||||
}
|
||||
},
|
||||
"@jscad/x3d-serializer": {
|
||||
"version": "0.0.6",
|
||||
"resolved": "https://registry.npmjs.org/@jscad/x3d-serializer/-/x3d-serializer-0.0.6.tgz",
|
||||
"integrity": "sha1-pBl1qeN0B2E2JkjklutkKTuD99c=",
|
||||
"requires": {
|
||||
"@jscad/io-utils": "^0.1.2",
|
||||
"xmldom": "^0.1.27"
|
||||
}
|
||||
},
|
||||
"@most/multicast": {
|
||||
"version": "1.3.0",
|
||||
"resolved": "https://registry.npmjs.org/@most/multicast/-/multicast-1.3.0.tgz",
|
||||
"integrity": "sha512-DWH8AShgp5bXn+auGzf5tzPxvpmEvQJd0CNsApOci1LDF4eAEcnw4HQOr2Jaa+L92NbDYFKBSXxll+i7r1ikvw==",
|
||||
"requires": {
|
||||
"@most/prelude": "^1.4.0"
|
||||
}
|
||||
},
|
||||
"@most/prelude": {
|
||||
"version": "1.8.0",
|
||||
"resolved": "https://registry.npmjs.org/@most/prelude/-/prelude-1.8.0.tgz",
|
||||
"integrity": "sha512-t1CcURpZzfmBA6fEWwqmCqeNzWAj1w2WqEmCk/2yXMe/p8Ut000wFmVKMy8A1Rl9VVxZEZ5nBHd/pU0dR4bv/w=="
|
||||
},
|
||||
"@rollup/plugin-commonjs": {
|
||||
"version": "13.0.2",
|
||||
"resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-13.0.2.tgz",
|
||||
|
|
@ -3380,6 +3811,11 @@
|
|||
"integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==",
|
||||
"dev": true
|
||||
},
|
||||
"astring": {
|
||||
"version": "1.7.5",
|
||||
"resolved": "https://registry.npmjs.org/astring/-/astring-1.7.5.tgz",
|
||||
"integrity": "sha512-lobf6RWXb8c4uZ7Mdq0U12efYmpD1UFnyOWVJPTa3ukqZrMopav+2hdNu0hgBF0JIBFK9QgrBDfwYvh3DFJDAA=="
|
||||
},
|
||||
"at-least-node": {
|
||||
"version": "1.0.0",
|
||||
"resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
|
||||
|
|
@ -3402,6 +3838,14 @@
|
|||
"integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==",
|
||||
"dev": true
|
||||
},
|
||||
"brace": {
|
||||
"version": "0.10.0",
|
||||
"resolved": "https://registry.npmjs.org/brace/-/brace-0.10.0.tgz",
|
||||
"integrity": "sha1-7e9OubCSi6HuX3F//BV3SabdXXY=",
|
||||
"requires": {
|
||||
"w3c-blob": "0.0.1"
|
||||
}
|
||||
},
|
||||
"brace-expansion": {
|
||||
"version": "1.1.11",
|
||||
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
|
||||
|
|
@ -3638,7 +4082,6 @@
|
|||
"version": "1.1.3",
|
||||
"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
|
||||
"integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"object-keys": "^1.0.12"
|
||||
}
|
||||
|
|
@ -3727,6 +4170,11 @@
|
|||
"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
|
||||
"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
|
||||
},
|
||||
"estraverse": {
|
||||
"version": "4.3.0",
|
||||
"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
|
||||
"integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="
|
||||
},
|
||||
"estree-walker": {
|
||||
"version": "1.0.1",
|
||||
"resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz",
|
||||
|
|
@ -3874,6 +4322,14 @@
|
|||
"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
|
||||
"dev": true
|
||||
},
|
||||
"globalthis": {
|
||||
"version": "1.0.2",
|
||||
"resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.2.tgz",
|
||||
"integrity": "sha512-ZQnSFO1la8P7auIOQECnm0sSuoMeaSq0EEdXMBFF2QJO4uNcwbyhSgG3MruWNbFTqCLmxVwGOl7LZ9kASvHdeQ==",
|
||||
"requires": {
|
||||
"define-properties": "^1.1.3"
|
||||
}
|
||||
},
|
||||
"graceful-fs": {
|
||||
"version": "4.2.4",
|
||||
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
|
||||
|
|
@ -4165,15 +4621,6 @@
|
|||
"source-map": "^0.6.1"
|
||||
},
|
||||
"dependencies": {
|
||||
"debug": {
|
||||
"version": "4.1.1",
|
||||
"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
|
||||
"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"ms": "^2.1.1"
|
||||
}
|
||||
},
|
||||
"source-map": {
|
||||
"version": "0.6.1",
|
||||
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
|
||||
|
|
@ -4235,10 +4682,9 @@
|
|||
"dev": true
|
||||
},
|
||||
"json5": {
|
||||
"version": "2.1.3",
|
||||
"resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz",
|
||||
"integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==",
|
||||
"dev": true,
|
||||
"version": "2.2.0",
|
||||
"resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
|
||||
"integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
|
||||
"requires": {
|
||||
"minimist": "^1.2.5"
|
||||
}
|
||||
|
|
@ -4268,8 +4714,7 @@
|
|||
"lodash": {
|
||||
"version": "4.17.21",
|
||||
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
|
||||
"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
|
||||
"dev": true
|
||||
"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
|
||||
},
|
||||
"lodash.flattendeep": {
|
||||
"version": "4.4.0",
|
||||
|
|
@ -4359,8 +4804,7 @@
|
|||
"minimist": {
|
||||
"version": "1.2.5",
|
||||
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
|
||||
"integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
|
||||
"dev": true
|
||||
"integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
|
||||
},
|
||||
"mocha": {
|
||||
"version": "8.1.3",
|
||||
|
|
@ -4597,6 +5041,25 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
"most": {
|
||||
"version": "1.9.0",
|
||||
"resolved": "https://registry.npmjs.org/most/-/most-1.9.0.tgz",
|
||||
"integrity": "sha512-M7yHMcMGaclzEL6eg8Yh8PlAsaWfL/oSThF4+ZuWKM5CKXcbzmLh+qESwgZFzMKHJ+iVJwb28yFvDEOobI653w==",
|
||||
"requires": {
|
||||
"@most/multicast": "^1.2.5",
|
||||
"@most/prelude": "^1.4.0",
|
||||
"globalthis": "^1.0.1",
|
||||
"symbol-observable": "^2.0.3"
|
||||
}
|
||||
},
|
||||
"most-gestures": {
|
||||
"version": "0.3.0",
|
||||
"resolved": "https://registry.npmjs.org/most-gestures/-/most-gestures-0.3.0.tgz",
|
||||
"integrity": "sha1-Y07mZK2vU9dA0BSKa0tNF0QDpHg=",
|
||||
"requires": {
|
||||
"most": "^1.7.2"
|
||||
}
|
||||
},
|
||||
"ms": {
|
||||
"version": "2.1.2",
|
||||
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
|
||||
|
|
@ -4662,8 +5125,7 @@
|
|||
"object-keys": {
|
||||
"version": "1.1.1",
|
||||
"resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
|
||||
"integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
|
||||
"dev": true
|
||||
"integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
|
||||
},
|
||||
"object.assign": {
|
||||
"version": "4.1.0",
|
||||
|
|
@ -4870,6 +5332,11 @@
|
|||
"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
|
||||
"dev": true
|
||||
},
|
||||
"sax": {
|
||||
"version": "1.2.4",
|
||||
"resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
|
||||
"integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
|
||||
},
|
||||
"seedrandom": {
|
||||
"version": "3.0.5",
|
||||
"resolved": "https://registry.npmjs.org/seedrandom/-/seedrandom-3.0.5.tgz",
|
||||
|
|
@ -5014,6 +5481,15 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
"sylvester": {
|
||||
"version": "git+ssh://git@github.com/kaosat-dev/node-sylvester.git#ce74d23a2092ae02a56b840ef70f5d61c54df409",
|
||||
"from": "sylvester@github:kaosat-dev/node-sylvester"
|
||||
},
|
||||
"symbol-observable": {
|
||||
"version": "2.0.3",
|
||||
"resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-2.0.3.tgz",
|
||||
"integrity": "sha512-sQV7phh2WCYAn81oAkakC5qjq2Ml0g8ozqz03wOGnx9dDlG1de6yrF+0RAzSJD8fPUow3PTSMf2SAbOGxb93BA=="
|
||||
},
|
||||
"test-exclude": {
|
||||
"version": "6.0.0",
|
||||
"resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
|
||||
|
|
@ -5082,6 +5558,16 @@
|
|||
"integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
|
||||
"dev": true
|
||||
},
|
||||
"w3c-blob": {
|
||||
"version": "0.0.1",
|
||||
"resolved": "https://registry.npmjs.org/w3c-blob/-/w3c-blob-0.0.1.tgz",
|
||||
"integrity": "sha1-sM01KhpQ9RVWNCD/1YYflQ8dhbg="
|
||||
},
|
||||
"webworkify": {
|
||||
"version": "1.5.0",
|
||||
"resolved": "https://registry.npmjs.org/webworkify/-/webworkify-1.5.0.tgz",
|
||||
"integrity": "sha512-AMcUeyXAhbACL8S2hqqdqOLqvJ8ylmIbNwUIqQujRSouf4+eUFaXbG6F1Rbu+srlJMmxQWsiU7mOJi0nMBfM1g=="
|
||||
},
|
||||
"which": {
|
||||
"version": "2.0.2",
|
||||
"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
|
||||
|
|
@ -5172,6 +5658,11 @@
|
|||
"typedarray-to-buffer": "^3.1.5"
|
||||
}
|
||||
},
|
||||
"xmldom": {
|
||||
"version": "0.1.31",
|
||||
"resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.31.tgz",
|
||||
"integrity": "sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ=="
|
||||
},
|
||||
"y18n": {
|
||||
"version": "4.0.1",
|
||||
"resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz",
|
||||
|
|
|
|||
|
|
@ -15,8 +15,10 @@
|
|||
"coverage": "nyc --reporter=html --reporter=text npm test"
|
||||
},
|
||||
"dependencies": {
|
||||
"@jscad/openjscad": "^1.6.1",
|
||||
"fs-extra": "^9.0.1",
|
||||
"js-yaml": "^3.14.0",
|
||||
"json5": "^2.2.0",
|
||||
"makerjs": "github:mrzealot/maker.js-dist#a0ca32948845efe8ad5c9ca454f1285926853138",
|
||||
"mathjs": "^8.1.1",
|
||||
"yargs": "^15.4.1"
|
||||
|
|
@ -36,8 +38,7 @@
|
|||
"src/**/*.js"
|
||||
],
|
||||
"exclude": [
|
||||
"src/cli.js",
|
||||
"src/io.js"
|
||||
"src/cli.js"
|
||||
]
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ import replace from '@rollup/plugin-replace'
|
|||
|
||||
export default {
|
||||
input: 'src/ergogen.js',
|
||||
external: ['makerjs', 'js-yaml', 'mathjs'],
|
||||
external: ['makerjs', 'js-yaml', 'mathjs', 'json5'],
|
||||
output: {
|
||||
name: 'ergogen',
|
||||
file: 'dist/ergogen.js',
|
||||
|
|
@ -13,7 +13,8 @@ export default {
|
|||
globals: {
|
||||
'makerjs': 'makerjs',
|
||||
'js-yaml': 'jsyaml',
|
||||
'mathjs': 'math'
|
||||
'mathjs': 'math',
|
||||
'json5': 'json5'
|
||||
}
|
||||
},
|
||||
plugins: [
|
||||
|
|
|
|||
113
src/cli.js
Normal file → Executable file
113
src/cli.js
Normal file → Executable file
|
|
@ -1,26 +1,15 @@
|
|||
#!/usr/bin/env node
|
||||
|
||||
// libs
|
||||
|
||||
const fs = require('fs-extra')
|
||||
const path = require('path')
|
||||
const yaml = require('js-yaml')
|
||||
const yargs = require('yargs')
|
||||
|
||||
// internals
|
||||
|
||||
const io = require('./io')
|
||||
const ergogen = require('./ergogen')
|
||||
const pkg = require('../package.json')
|
||||
|
||||
// command line args
|
||||
|
||||
const args = yargs
|
||||
.option('config', {
|
||||
alias: 'c',
|
||||
demandOption: true,
|
||||
describe: 'Config yaml/json file',
|
||||
type: 'string'
|
||||
})
|
||||
.option('output', {
|
||||
alias: 'o',
|
||||
default: path.resolve('output'),
|
||||
|
|
@ -40,60 +29,100 @@ const args = yargs
|
|||
})
|
||||
.argv
|
||||
|
||||
if (args.clean) fs.removeSync(args.o)
|
||||
fs.mkdirpSync(args.o)
|
||||
// config reading
|
||||
|
||||
// config parsing
|
||||
const config_file = args._[0]
|
||||
if (!config_file) {
|
||||
console.error('Usage: ergogen <config_file> [options]')
|
||||
process.exit(1)
|
||||
}
|
||||
|
||||
let config_text
|
||||
try {
|
||||
config_text = fs.readFileSync(args.c).toString()
|
||||
config_text = fs.readFileSync(config_file).toString()
|
||||
} catch (err) {
|
||||
throw new Error(`Could not read file "${args.c}": ${err}`)
|
||||
console.error(`Could not read config file "${config_file}": ${err}`)
|
||||
process.exit(2)
|
||||
}
|
||||
|
||||
const is_yaml = args.c.endsWith('.yaml') || args.c.endsWith('.yml')
|
||||
const config_parser = is_yaml ? yaml.load : JSON.parse
|
||||
let config
|
||||
try {
|
||||
config = config_parser(config_text)
|
||||
} catch (err) {
|
||||
throw new Error(`Malformed input within "${args.c}": ${err}`)
|
||||
}
|
||||
const title_suffix = args.debug ? ' (Debug Mode)' : ''
|
||||
console.log(`Ergogen v${pkg.version} CLI${title_suffix}`)
|
||||
console.log()
|
||||
|
||||
;(async () => {
|
||||
|
||||
// processing
|
||||
|
||||
const results = ergogen.process(config, args.debug, s => console.log(s))
|
||||
let results
|
||||
try {
|
||||
results = await ergogen.process(config_text, args.debug, s => console.log(s))
|
||||
} catch (err) {
|
||||
console.error(err)
|
||||
process.exit(3)
|
||||
}
|
||||
|
||||
// helpers
|
||||
|
||||
const single = (data, rel) => {
|
||||
if (!data) return
|
||||
const abs = path.join(args.o, rel)
|
||||
fs.mkdirpSync(path.dirname(abs))
|
||||
if (abs.endsWith('.json')) {
|
||||
fs.writeJSONSync(abs, data, {spaces: 4})
|
||||
} else if (abs.endsWith('.yaml')) {
|
||||
fs.writeFileSync(abs, yaml.dump(data, {indent: 4}))
|
||||
} else {
|
||||
fs.writeFileSync(abs, data)
|
||||
}
|
||||
}
|
||||
|
||||
const composite = (data, rel) => {
|
||||
if (!data) return
|
||||
const abs = path.join(args.o, rel)
|
||||
if (data.json) {
|
||||
fs.mkdirpSync(path.dirname(abs))
|
||||
fs.writeJSONSync(abs + '.json', data.json, {spaces: 4})
|
||||
}
|
||||
for (const format of ['svg', 'dxf', 'jscad', 'stl']) {
|
||||
if (data[format]) {
|
||||
fs.mkdirpSync(path.dirname(abs))
|
||||
fs.writeFileSync(abs + '.' + format, data[format])
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// output
|
||||
|
||||
console.log('Writing output to disk...')
|
||||
|
||||
if (args.debug) {
|
||||
io.dump_model(results.demo, path.join(args.o, 'points/demo'), args.debug)
|
||||
fs.writeJSONSync(path.join(args.o, 'points/data.json'), results.points, {spaces: 4})
|
||||
if (args.clean) {
|
||||
console.log('Cleaning output folder...')
|
||||
fs.removeSync(args.o)
|
||||
}
|
||||
|
||||
console.log('Writing output to disk...')
|
||||
fs.mkdirpSync(args.o)
|
||||
|
||||
single(results.raw, 'raw.txt')
|
||||
single(results.canonical, 'canonical.yaml')
|
||||
single(results.units, 'units.json')
|
||||
|
||||
single(results.points, 'points/points.json')
|
||||
composite(results.demo, 'points/demo')
|
||||
|
||||
for (const [name, outline] of Object.entries(results.outlines)) {
|
||||
io.dump_model(outline, path.join(args.o, `outlines/${name}`), args.debug)
|
||||
composite(outline, `outlines/${name}`)
|
||||
}
|
||||
|
||||
for (const [name, _case] of Object.entries(results.cases)) {
|
||||
const file = path.join(args.o, `cases/${name}.jscad`)
|
||||
fs.mkdirpSync(path.dirname(file))
|
||||
fs.writeFileSync(file, _case)
|
||||
composite(_case, `cases/${name}`)
|
||||
}
|
||||
|
||||
for (const [name, pcb] of Object.entries(results.pcbs)) {
|
||||
const file = path.join(args.o, `pcbs/${name}.kicad_pcb`)
|
||||
fs.mkdirpSync(path.dirname(file))
|
||||
fs.writeFileSync(file, pcb)
|
||||
}
|
||||
|
||||
if (args.debug) {
|
||||
fs.writeJSONSync(path.join(args.o, 'results.json'), results, {spaces: 4})
|
||||
single(pcb, `pcbs/${name}.kicad_pcb`)
|
||||
}
|
||||
|
||||
// goodbye
|
||||
|
||||
console.log('Done.')
|
||||
console.log()
|
||||
|
||||
})()
|
||||
|
|
|
|||
|
|
@ -1,3 +1,11 @@
|
|||
const yaml = require('js-yaml')
|
||||
const json5 = require('json5')
|
||||
const makerjs = require('makerjs')
|
||||
const jscad = require('@jscad/openjscad')
|
||||
|
||||
const a = require('./assert')
|
||||
const u = require('./utils')
|
||||
|
||||
const prepare = require('./prepare')
|
||||
const units_lib = require('./units')
|
||||
const points_lib = require('./points')
|
||||
|
|
@ -7,16 +15,79 @@ const pcbs_lib = require('./pcbs')
|
|||
|
||||
const noop = () => {}
|
||||
|
||||
const twodee = (model, debug) => {
|
||||
const assembly = makerjs.model.originate({
|
||||
models: {
|
||||
export: u.deepcopy(model)
|
||||
},
|
||||
units: 'mm'
|
||||
})
|
||||
|
||||
const result = {
|
||||
dxf: makerjs.exporter.toDXF(assembly),
|
||||
}
|
||||
if (debug) {
|
||||
result.json = assembly
|
||||
result.svg = makerjs.exporter.toSVG(assembly)
|
||||
}
|
||||
return result
|
||||
}
|
||||
|
||||
const threedee = async (script, debug) => {
|
||||
const compiled = await new Promise((resolve, reject) => {
|
||||
jscad.compile(script, {}).then(compiled => {
|
||||
resolve(compiled)
|
||||
})
|
||||
})
|
||||
const result = {
|
||||
stl: jscad.generateOutput('stla', compiled).asBuffer()
|
||||
}
|
||||
if (debug) {
|
||||
result.jscad = script
|
||||
}
|
||||
return result
|
||||
}
|
||||
|
||||
module.exports = {
|
||||
version: '__ergogen_version',
|
||||
process: (config, debug=false, logger=noop) => {
|
||||
process: async (raw, debug=false, logger=noop) => {
|
||||
|
||||
logger('Preparing input...')
|
||||
const prefix = 'Interpreting format... '
|
||||
let config = raw
|
||||
if (a.type(raw)() != 'object') {
|
||||
try {
|
||||
config = yaml.safeLoad(raw)
|
||||
logger(prefix + 'YAML detected.')
|
||||
} catch (yamlex) {
|
||||
try {
|
||||
config = json5.parse(raw)
|
||||
logger(prefix + 'JSON detected.')
|
||||
} catch (jsonex) {
|
||||
try {
|
||||
config = new Function(raw)()
|
||||
logger(prefix + 'JS code detected.')
|
||||
} catch (codeex) {
|
||||
logger('YAML exception:', yamlex)
|
||||
logger('JSON exception:', jsonex)
|
||||
logger('Code exception:', codeex)
|
||||
throw new Error('Input is not valid YAML, JSON, or JS code!')
|
||||
}
|
||||
}
|
||||
}
|
||||
if (!config) {
|
||||
throw new Error('Input appears to be empty!')
|
||||
}
|
||||
}
|
||||
|
||||
logger('Preprocessing input...')
|
||||
config = prepare.unnest(config)
|
||||
config = prepare.inherit(config)
|
||||
const results = {}
|
||||
if (debug) {
|
||||
results.raw = raw
|
||||
results.canonical = config
|
||||
}
|
||||
|
||||
// parsing units
|
||||
logger('Calculating variables...')
|
||||
const units = units_lib.parse(config)
|
||||
if (debug) {
|
||||
|
|
@ -24,10 +95,13 @@ module.exports = {
|
|||
}
|
||||
|
||||
logger('Parsing points...')
|
||||
if (!config.points) {
|
||||
throw new Error('Input does not contain any points!')
|
||||
}
|
||||
const points = points_lib.parse(config.points, units)
|
||||
if (debug) {
|
||||
results.points = points
|
||||
results.demo = points_lib.visualize(points)
|
||||
results.demo = twodee(points_lib.visualize(points), debug)
|
||||
}
|
||||
|
||||
logger('Generating outlines...')
|
||||
|
|
@ -35,15 +109,15 @@ module.exports = {
|
|||
results.outlines = {}
|
||||
for (const [name, outline] of Object.entries(outlines)) {
|
||||
if (!debug && name.startsWith('_')) continue
|
||||
results.outlines[name] = outline
|
||||
results.outlines[name] = twodee(outline, debug)
|
||||
}
|
||||
|
||||
logger('Extruding cases...')
|
||||
const cases = cases_lib.parse(config.cases || {}, outlines, units)
|
||||
results.cases = {}
|
||||
for (const [case_name, case_text] of Object.entries(cases)) {
|
||||
for (const [case_name, case_script] of Object.entries(cases)) {
|
||||
if (!debug && case_name.startsWith('_')) continue
|
||||
results.cases[case_name] = case_text
|
||||
results.cases[case_name] = await threedee(case_script, debug)
|
||||
}
|
||||
|
||||
logger('Scaffolding PCBs...')
|
||||
|
|
@ -56,6 +130,5 @@ module.exports = {
|
|||
|
||||
return results
|
||||
},
|
||||
visualize: points_lib.visualize,
|
||||
inject_footprint: pcbs_lib.inject_footprint
|
||||
}
|
||||
21
src/io.js
21
src/io.js
|
|
@ -1,21 +0,0 @@
|
|||
const m = require('makerjs')
|
||||
const fs = require('fs-extra')
|
||||
const path = require('path')
|
||||
|
||||
const u = require('./utils')
|
||||
|
||||
exports.dump_model = (model, file='model', debug=false) => {
|
||||
const assembly = m.model.originate({
|
||||
models: {
|
||||
export: u.deepcopy(model)
|
||||
},
|
||||
units: 'mm'
|
||||
})
|
||||
|
||||
fs.mkdirpSync(path.dirname(`${file}.dxf`))
|
||||
fs.writeFileSync(`${file}.dxf`, m.exporter.toDXF(assembly))
|
||||
if (debug) {
|
||||
fs.writeFileSync(`${file}.svg`, m.exporter.toSVG(assembly))
|
||||
fs.writeJSONSync(`${file}.json`, assembly, {spaces: 4})
|
||||
}
|
||||
}
|
||||
|
|
@ -168,11 +168,13 @@ const footprint = exports._footprint = (config, name, points, point, net_indexer
|
|||
// connecting other, non-net, non-anchor parameters
|
||||
parsed_params.param = {}
|
||||
for (const [param_name, param_value] of Object.entries(prep.extend(fp.params || {}, params))) {
|
||||
let value = a.sane(param_value, `${name}.nets.${param_name}`, 'string')()
|
||||
let value = param_value
|
||||
if (a.type(value)() == 'string' && value.startsWith('=') && point) {
|
||||
const indirect = value.substring(1)
|
||||
value = point.meta[indirect]
|
||||
value = a.sane(value, `${name}.params.${param} --> ${point.meta.name}.${indirect}`, 'string')()
|
||||
if (value === undefined) {
|
||||
throw new Error(`Indirection "${name}.params.${param}" --> "${point.meta.name}.${indirect}" to undefined value!`)
|
||||
}
|
||||
}
|
||||
parsed_params.param[param_name] = value
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue