diff --git a/images/board-back.png b/images/board-back.png index 72794c5..d07c717 100644 Binary files a/images/board-back.png and b/images/board-back.png differ diff --git a/images/board-front.png b/images/board-front.png index c3654b8..3c38903 100644 Binary files a/images/board-front.png and b/images/board-front.png differ diff --git a/package-lock.json b/package-lock.json index 7b74de6..58a3073 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,42 +8,10 @@ "ergogen": "github:soundmonster/ergogen#samoklava" } }, - "../../ergogen": { - "version": "3.1.0", - "extraneous": true, - "license": "MIT", - "dependencies": { - "@jscad/openjscad": "github:ergogen/oldjscad", - "fs-extra": "^10.0.0", - "js-yaml": "^3.14.0", - "kle-serial": "github:ergogen/kle-serial#ergogen", - "makerjs": "github:ergogen/maker.js#ergogen", - "mathjs": "^10.0.0", - "semver": "^7.3.5", - "yargs": "^17.3.0" - }, - "bin": { - "ergogen": "src/cli.js" - }, - "devDependencies": { - "@rollup/plugin-commonjs": "^21.0.1", - "@rollup/plugin-json": "^4.1.0", - "chai": "^4.3.4", - "chai-as-promised": "^7.1.1", - "dir-compare": "^3.3.0", - "glob": "^7.2.0", - "mocha": "^9.1.3", - "nyc": "^15.1.0", - "rollup": "^2.61.1" - } - }, - "../ergogen": { - "extraneous": true - }, "node_modules/@babel/runtime": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.7.tgz", - "integrity": "sha512-9E9FJowqAsytyOY6LG+1KuueckRL+aQW+mKvXRXnuFGyRAyepJPmEo9vgMfXUA6O9u3IeEdv9MAkppFcaQwogQ==", + "version": "7.18.9", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.18.9.tgz", + "integrity": "sha512-lkqXDcvlFT5rvEjiu6+QYO+1GXrEHRo2LOtS7E4GtX5ESIZOgepqsZBVIj6Pv+a6zqsya9VCgiK1KAK4BvJDAw==", "dependencies": { "regenerator-runtime": "^0.13.4" }, @@ -65,12 +33,13 @@ "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=" + "integrity": "sha512-/d3192aL8WAWX7KU5MRc61y7n9ZIzPik/F+d+rCtb7uxMmhzt7j5mcno4CDwSrfeIrzK8U+8Pyrdq13QkHOaLA==" }, "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=" + "integrity": "sha512-RielAllRKm2oz+lG0On0aOeB2+qI7/lbzc/kQPzcBeObnqyuJKyHMVeFHDQ18o9Zjyrkv4g2QA6FDcVTbrmr0Q==", + "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info." }, "node_modules/@jscad/io": { "version": "0.3.7", @@ -97,7 +66,7 @@ "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=", + "integrity": "sha512-Z0lm1kTrJzA6Irv+TQmX4q2MWl97rLU2H9LDdC5y9utsO1J47Krllta2DJECWj7KfYcbf/je3kRZ2CQ7dHvaBA==", "dependencies": { "@jscad/csg": "0.3.6" } @@ -105,7 +74,7 @@ "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=", + "integrity": "sha512-xQCBwjyRuEXolIRiCIZEf7k/FDERFTzyt1amY12u4ZWULY4QWU4d4fY5KaSkaZkBdkXE/leh0AylR0Q6mUwBKA==", "dependencies": { "@jscad/csg": "0.3.6", "@jscad/io-utils": "^0.1.2" @@ -114,7 +83,7 @@ "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=" + "integrity": "sha512-uD57ahy1DfW9siy/nbwA4hAO5nE/gt/ZJoTbUfso3DnfwwqUbM42lw/AYAcFYw8Ab2U2GybDulKTPT3lr+eJdA==" }, "node_modules/@jscad/openjscad": { "version": "1.6.1", @@ -140,7 +109,7 @@ "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=", + "integrity": "sha512-gw4iD8qVDm7Qb0PFYuwP4yYMU90wOQ0992WBLwqQSaLdKET0c2UlVJUu1jM5GUzxVEyJwm2ZbS1/c+JwOdTc6Q==", "deprecated": "See @jscad/scad-deserializer", "dependencies": { "lodash": "^4.17.4", @@ -165,7 +134,7 @@ "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=", + "integrity": "sha512-2HpFv0G0TfV1v2psHvnx/PAOZ7iYmqp0REnOT/pQ9T5LRkdHrI1uvgzT4VHp9lOdK6vD5jO9uwRyj8dFWQhLYw==", "dependencies": { "@jscad/csg": "0.3.6", "@jscad/io-utils": "^0.1.2" @@ -174,7 +143,7 @@ "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=", + "integrity": "sha512-yf47E+rCtE3sdoMIIVeOGmB/gaQzrgN2JhFsYa4pEVcbh7RnUJauegFyacbGIEAxAYC8Ck7f5DU0mc/JbIjFhQ==", "dependencies": { "@jscad/io-utils": "^0.1.2" } @@ -182,7 +151,7 @@ "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=", + "integrity": "sha512-i/LVaOCKkn5CdncoQFUhq9HPZOd9diupknlDBRmllLiuP2zzZLowz7a3mxF1hkVkwOx45WD02JPPkKUSBzz6tQ==", "dependencies": { "@jscad/csg": "0.3.6", "sax": "1.2.4" @@ -191,7 +160,7 @@ "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=", + "integrity": "sha512-vXyxOVpVmlO7oeshbtCVwU42Mqz350o4/r0ToP9XtG2gv7F/e9GcpCaM9XIgyeeu8cQQGTcbfjGb1t9MFlPrOg==", "dependencies": { "@jscad/csg": "0.3.6" } @@ -215,7 +184,7 @@ "node_modules/@types/bezier-js": { "version": "0.0.6", "resolved": "https://registry.npmjs.org/@types/bezier-js/-/bezier-js-0.0.6.tgz", - "integrity": "sha1-DZdtaBY8SVUzLveYohoLPWOB0Ss=" + "integrity": "sha512-kXsAlt8e8N6zt9R6LcMYWB1HkBw3q2g+M9BdI/UE+s4agIONuIscQaRCoInH22+Jas3rw8yLUehL2InaZjyNSA==" }, "node_modules/@types/node": { "version": "7.10.14", @@ -266,9 +235,9 @@ } }, "node_modules/astring": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/astring/-/astring-1.8.1.tgz", - "integrity": "sha512-Aj3mbwVzj7Vve4I/v2JYOPFkCGM2YS7OqQTNSxmUR+LECRpokuPgAYghePgr6SALDo5bD5DlfbSaYjOzGJZOLQ==", + "version": "1.8.3", + "resolved": "https://registry.npmjs.org/astring/-/astring-1.8.3.tgz", + "integrity": "sha512-sRpyiNrx2dEYIMmUXprS8nlpRg2Drs8m9ElX9vVEXaCB4XEAJhKfs7IcX0IwShjuOAjLR6wzIrgoptz1n19i1A==", "bin": { "astring": "bin/astring" } @@ -281,7 +250,7 @@ "node_modules/brace": { "version": "0.10.0", "resolved": "https://registry.npmjs.org/brace/-/brace-0.10.0.tgz", - "integrity": "sha1-7e9OubCSi6HuX3F//BV3SabdXXY=", + "integrity": "sha512-C0nbmcNIY2nRtA3hY5NNmZuNZDs4X676WHf+xiFw0NXUQIdSCkIgZHkztqtSOmC0BGjvBR2DNO9USiZMY+Qx6w==", "dependencies": { "w3c-blob": "0.0.1" } @@ -299,7 +268,7 @@ "node_modules/clone": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz", - "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=", + "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==", "engines": { "node": ">=0.8" } @@ -321,9 +290,9 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, "node_modules/complex.js": { - "version": "2.0.15", - "resolved": "https://registry.npmjs.org/complex.js/-/complex.js-2.0.15.tgz", - "integrity": "sha512-gDBvQU8IG139ZBQTSo2qvDFP+lANMGluM779csXOr6ny1NUtA3wkUnCFjlDNH/moAVfXtvClYt6G0zarFbtz5w==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/complex.js/-/complex.js-2.1.1.tgz", + "integrity": "sha512-8njCHOTtFFLtegk6zQo0kkVX1rngygb/KQI6z1qZxlFI3scluC+LVTCFbrkWjBv4vvLlbQ9t88IPMC6k95VTTg==", "engines": { "node": "*" }, @@ -333,19 +302,23 @@ } }, "node_modules/decimal.js": { - "version": "10.3.1", - "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.3.1.tgz", - "integrity": "sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ==" + "version": "10.4.0", + "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.0.tgz", + "integrity": "sha512-Nv6ENEzyPQ6AItkGwLE2PGKinZZ9g59vSh2BeH6NqPu0OTKZ5ruJsVqh/orbAnqXc9pBbgXAIrc2EyaCj8NpGg==" }, "node_modules/define-properties": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", - "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz", + "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==", "dependencies": { - "object-keys": "^1.0.12" + "has-property-descriptors": "^1.0.0", + "object-keys": "^1.1.1" }, "engines": { "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/emoji-regex": { @@ -355,7 +328,7 @@ }, "node_modules/ergogen": { "version": "3.1.0", - "resolved": "git+ssh://git@github.com/soundmonster/ergogen.git#8670eee8977de5fa2a2763733b7c1cc4bb140678", + "resolved": "git+ssh://git@github.com/soundmonster/ergogen.git#7946fbe9b8e7b82e0259da5cbfda1a0de7dc1b57", "license": "MIT", "dependencies": { "@jscad/openjscad": "github:ergogen/oldjscad", @@ -387,7 +360,7 @@ "node_modules/esprima": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz", - "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=", + "integrity": "sha512-AWwVMNxwhN8+NIPQzAQZCm7RkLC4RbM3B1OobMuyp3i+w73X57KCKaVIxaRZb+DYCojq7rspo+fmuQfAboyhFg==", "bin": { "esparse": "bin/esparse.js", "esvalidate": "bin/esvalidate.js" @@ -405,9 +378,9 @@ } }, "node_modules/fraction.js": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.1.2.tgz", - "integrity": "sha512-o2RiJQ6DZaR/5+Si0qJUIy637QMRudSi9kU/FFzx9EZazrIdnBgpU+3sEWCxAVhH2RtxW2Oz+T4p2o8uOPVcgA==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz", + "integrity": "sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==", "engines": { "node": "*" }, @@ -417,9 +390,9 @@ } }, "node_modules/fs-extra": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz", - "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==", + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", + "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", "dependencies": { "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", @@ -429,6 +402,11 @@ "node": ">=12" } }, + "node_modules/function-bind": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" + }, "node_modules/get-caller-file": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", @@ -437,10 +415,23 @@ "node": "6.* || 8.* || >= 10.*" } }, + "node_modules/get-intrinsic": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.2.tgz", + "integrity": "sha512-Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA==", + "dependencies": { + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.3" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/globalthis": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.2.tgz", - "integrity": "sha512-ZQnSFO1la8P7auIOQECnm0sSuoMeaSq0EEdXMBFF2QJO4uNcwbyhSgG3MruWNbFTqCLmxVwGOl7LZ9kASvHdeQ==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz", + "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==", "dependencies": { "define-properties": "^1.1.3" }, @@ -452,14 +443,47 @@ } }, "node_modules/graceful-fs": { - "version": "4.2.9", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz", - "integrity": "sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==" + "version": "4.2.10", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", + "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==" }, "node_modules/graham_scan": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/graham_scan/-/graham_scan-1.0.4.tgz", - "integrity": "sha1-OZZR3R+DU+GID1nqjl+Uud9Mkoo=" + "integrity": "sha512-jL+zq9xTYXxsDIf+qy9aaudRXx/X4sqrOlbFkg1ElqCznhYAQ/wXv8cifgzRvzFopStDeIvny5sIu6jgSjnRww==" + }, + "node_modules/has": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", + "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", + "dependencies": { + "function-bind": "^1.1.1" + }, + "engines": { + "node": ">= 0.4.0" + } + }, + "node_modules/has-property-descriptors": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz", + "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==", + "dependencies": { + "get-intrinsic": "^1.1.1" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-symbols": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", + "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } }, "node_modules/is-fullwidth-code-point": { "version": "3.0.0", @@ -472,7 +496,7 @@ "node_modules/javascript-natural-sort": { "version": "0.7.1", "resolved": "https://registry.npmjs.org/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz", - "integrity": "sha1-+eIwPUUH9tdDVac2ZNFED7Wg71k=" + "integrity": "sha512-nO6jcEfZWQXDhOiBtG2KvKyEptz7RVbpGP4vTD2hLBdmNQSsCiicO2Ioinv6UI4y9ukqnBpy+XZ9H6uLNgJTlw==" }, "node_modules/js-yaml": { "version": "3.14.1", @@ -499,12 +523,9 @@ } }, "node_modules/json5": { - "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" - }, + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz", + "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==", "bin": { "json5": "lib/cli.js" }, @@ -570,32 +591,27 @@ } }, "node_modules/mathjs": { - "version": "10.0.2", - "resolved": "https://registry.npmjs.org/mathjs/-/mathjs-10.0.2.tgz", - "integrity": "sha512-QCbsqJ2iBCJP/yTj9Dg45SWecwVf5fxe8sZo4SyerthHVydpxRL33hU0MynwAHqz1XglSGkSKk7QzTD8U8wPFg==", + "version": "10.6.4", + "resolved": "https://registry.npmjs.org/mathjs/-/mathjs-10.6.4.tgz", + "integrity": "sha512-omQyvRE1jIy+3k2qsqkWASOcd45aZguXZDckr3HtnTYyXk5+2xpVfC3kATgbO2Srjxlqww3TVdhD0oUdZ/hiFA==", "dependencies": { - "@babel/runtime": "^7.16.5", - "complex.js": "^2.0.15", + "@babel/runtime": "^7.18.6", + "complex.js": "^2.1.1", "decimal.js": "^10.3.1", "escape-latex": "^1.2.0", - "fraction.js": "^4.1.2", + "fraction.js": "^4.2.0", "javascript-natural-sort": "^0.7.1", "seedrandom": "^3.0.5", "tiny-emitter": "^2.1.0", - "typed-function": "^2.0.0" + "typed-function": "^2.1.0" }, "bin": { "mathjs": "bin/cli.js" }, "engines": { - "node": ">= 12" + "node": ">= 14" } }, - "node_modules/minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" - }, "node_modules/most": { "version": "1.9.0", "resolved": "https://registry.npmjs.org/most/-/most-1.9.0.tgz", @@ -610,7 +626,7 @@ "node_modules/most-gestures": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/most-gestures/-/most-gestures-0.3.0.tgz", - "integrity": "sha1-Y07mZK2vU9dA0BSKa0tNF0QDpHg=", + "integrity": "sha512-v57B+eOZ5XVDRUyN8KHcVpeuert8qW6xdVCBfld0mglBJb6Jf3U5hualvTlBODGsai1v5O9jxengsQCq3Lxdkg==", "dependencies": { "most": "^1.7.2" } @@ -631,7 +647,7 @@ "node_modules/require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", + "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", "engines": { "node": ">=0.10.0" } @@ -647,9 +663,9 @@ "integrity": "sha512-8OwmbklUNzwezjGInmZ+2clQmExQPvomqjL7LFqOYqtmuxRgQYqOD3mHaU+MvZn5FLUeVxVfQjwLZW/n/JFuqg==" }, "node_modules/semver": { - "version": "7.3.5", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", - "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", + "version": "7.3.7", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz", + "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==", "dependencies": { "lru-cache": "^6.0.0" }, @@ -663,7 +679,7 @@ "node_modules/sprintf-js": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=" + "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==" }, "node_modules/string-width": { "version": "4.2.3", @@ -712,11 +728,11 @@ "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==" }, "node_modules/typed-function": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/typed-function/-/typed-function-2.0.0.tgz", - "integrity": "sha512-Hhy1Iwo/e4AtLZNK10ewVVcP2UEs408DS35ubP825w/YgSBK1KVLwALvvIG4yX75QJrxjCpcWkzkVRB0BwwYlA==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/typed-function/-/typed-function-2.1.0.tgz", + "integrity": "sha512-bctQIOqx2iVbWGDGPWwIm18QScpu2XRmkC19D8rQGFsjKSgteq/o1hTZvIG/wuDq8fanpBDrLkLq+aEN/6y5XQ==", "engines": { - "node": ">= 8" + "node": ">= 10" } }, "node_modules/universalify": { @@ -730,7 +746,7 @@ "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=" + "integrity": "sha512-fKfmCyRd0A/tSLt0zPR2716jAkoysa4+2nA2ip6ytr6fs1I9Tml2aXb28w8ljUjUutT23Zn7Vyc2GQM5w3rtWA==" }, "node_modules/webworkify": { "version": "1.5.0", @@ -767,9 +783,9 @@ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" }, "node_modules/yargs": { - "version": "17.3.1", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.3.1.tgz", - "integrity": "sha512-WUANQeVgjLbNsEmGk20f+nlHgOqzRFpiGWVaBrYGYIGANIIu3lWjoyi0fNlFmJkvfhCZ6BXINe7/W2O2bV4iaA==", + "version": "17.5.1", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.5.1.tgz", + "integrity": "sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA==", "dependencies": { "cliui": "^7.0.2", "escalade": "^3.1.1", @@ -784,9 +800,9 @@ } }, "node_modules/yargs-parser": { - "version": "21.0.0", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.0.tgz", - "integrity": "sha512-z9kApYUOCwoeZ78rfRYYWdiU/iNL6mwwYlkkZfJoyMR1xps+NEBX5X7XmRpxkZHhXJ6+Ey00IwKxBBSW9FIjyA==", + "version": "21.1.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", + "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", "engines": { "node": ">=12" } @@ -794,9 +810,9 @@ }, "dependencies": { "@babel/runtime": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.7.tgz", - "integrity": "sha512-9E9FJowqAsytyOY6LG+1KuueckRL+aQW+mKvXRXnuFGyRAyepJPmEo9vgMfXUA6O9u3IeEdv9MAkppFcaQwogQ==", + "version": "7.18.9", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.18.9.tgz", + "integrity": "sha512-lkqXDcvlFT5rvEjiu6+QYO+1GXrEHRo2LOtS7E4GtX5ESIZOgepqsZBVIj6Pv+a6zqsya9VCgiK1KAK4BvJDAw==", "requires": { "regenerator-runtime": "^0.13.4" } @@ -814,12 +830,12 @@ "@jscad/dxf-serializer": { "version": "0.0.4", "resolved": "https://registry.npmjs.org/@jscad/dxf-serializer/-/dxf-serializer-0.0.4.tgz", - "integrity": "sha1-P7O3a2HmqYfiUIJ8SWNPAHNvasg=" + "integrity": "sha512-/d3192aL8WAWX7KU5MRc61y7n9ZIzPik/F+d+rCtb7uxMmhzt7j5mcno4CDwSrfeIrzK8U+8Pyrdq13QkHOaLA==" }, "@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=" + "integrity": "sha512-RielAllRKm2oz+lG0On0aOeB2+qI7/lbzc/kQPzcBeObnqyuJKyHMVeFHDQ18o9Zjyrkv4g2QA6FDcVTbrmr0Q==" }, "@jscad/io": { "version": "git+ssh://git@github.com/ergogen/oldjscadio.git#692cf142062208b0097b2d4852c30d6cc51eea8d", @@ -845,7 +861,7 @@ "@jscad/json-deserializer": { "version": "0.0.4", "resolved": "https://registry.npmjs.org/@jscad/json-deserializer/-/json-deserializer-0.0.4.tgz", - "integrity": "sha1-ffpQCUUoh5LgTlcaDCTxXFXuurA=", + "integrity": "sha512-Z0lm1kTrJzA6Irv+TQmX4q2MWl97rLU2H9LDdC5y9utsO1J47Krllta2DJECWj7KfYcbf/je3kRZ2CQ7dHvaBA==", "requires": { "@jscad/csg": "0.3.6" } @@ -853,7 +869,7 @@ "@jscad/json-serializer": { "version": "0.0.5", "resolved": "https://registry.npmjs.org/@jscad/json-serializer/-/json-serializer-0.0.5.tgz", - "integrity": "sha1-DEAQz7ZyntspQnJycvlB0TAZR7g=", + "integrity": "sha512-xQCBwjyRuEXolIRiCIZEf7k/FDERFTzyt1amY12u4ZWULY4QWU4d4fY5KaSkaZkBdkXE/leh0AylR0Q6mUwBKA==", "requires": { "@jscad/csg": "0.3.6", "@jscad/io-utils": "^0.1.2" @@ -862,7 +878,7 @@ "@jscad/obj-deserializer": { "version": "0.0.4", "resolved": "https://registry.npmjs.org/@jscad/obj-deserializer/-/obj-deserializer-0.0.4.tgz", - "integrity": "sha1-3LPPXMRyeKfPejW3azLq0NBE38M=" + "integrity": "sha512-uD57ahy1DfW9siy/nbwA4hAO5nE/gt/ZJoTbUfso3DnfwwqUbM42lw/AYAcFYw8Ab2U2GybDulKTPT3lr+eJdA==" }, "@jscad/openjscad": { "version": "git+ssh://git@github.com/ergogen/oldjscad.git#040637f3d8d4da0ad0a9ffdfe1a33a791c8008f4", @@ -883,7 +899,7 @@ "@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=", + "integrity": "sha512-gw4iD8qVDm7Qb0PFYuwP4yYMU90wOQ0992WBLwqQSaLdKET0c2UlVJUu1jM5GUzxVEyJwm2ZbS1/c+JwOdTc6Q==", "requires": { "lodash": "^4.17.4", "sylvester": "github:kaosat-dev/node-sylvester" @@ -907,7 +923,7 @@ "@jscad/stl-deserializer": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/@jscad/stl-deserializer/-/stl-deserializer-0.1.2.tgz", - "integrity": "sha1-P05QMMjBgf6Xwniz5pdOojemM4M=", + "integrity": "sha512-2HpFv0G0TfV1v2psHvnx/PAOZ7iYmqp0REnOT/pQ9T5LRkdHrI1uvgzT4VHp9lOdK6vD5jO9uwRyj8dFWQhLYw==", "requires": { "@jscad/csg": "0.3.6", "@jscad/io-utils": "^0.1.2" @@ -916,7 +932,7 @@ "@jscad/stl-serializer": { "version": "0.0.6", "resolved": "https://registry.npmjs.org/@jscad/stl-serializer/-/stl-serializer-0.0.6.tgz", - "integrity": "sha1-OIDuOw2YzeYhpVg92GDcN6kAZtQ=", + "integrity": "sha512-yf47E+rCtE3sdoMIIVeOGmB/gaQzrgN2JhFsYa4pEVcbh7RnUJauegFyacbGIEAxAYC8Ck7f5DU0mc/JbIjFhQ==", "requires": { "@jscad/io-utils": "^0.1.2" } @@ -924,7 +940,7 @@ "@jscad/svg-deserializer": { "version": "0.2.3", "resolved": "https://registry.npmjs.org/@jscad/svg-deserializer/-/svg-deserializer-0.2.3.tgz", - "integrity": "sha1-HbFVKSax7J7yXLjYE0ryZfYOTSI=", + "integrity": "sha512-i/LVaOCKkn5CdncoQFUhq9HPZOd9diupknlDBRmllLiuP2zzZLowz7a3mxF1hkVkwOx45WD02JPPkKUSBzz6tQ==", "requires": { "@jscad/csg": "0.3.6", "sax": "1.2.4" @@ -933,7 +949,7 @@ "@jscad/svg-serializer": { "version": "0.0.4", "resolved": "https://registry.npmjs.org/@jscad/svg-serializer/-/svg-serializer-0.0.4.tgz", - "integrity": "sha1-uqYjfTPtbg96AS8rtgYTopXiUdE=", + "integrity": "sha512-vXyxOVpVmlO7oeshbtCVwU42Mqz350o4/r0ToP9XtG2gv7F/e9GcpCaM9XIgyeeu8cQQGTcbfjGb1t9MFlPrOg==", "requires": { "@jscad/csg": "0.3.6" } @@ -954,7 +970,7 @@ "@types/bezier-js": { "version": "0.0.6", "resolved": "https://registry.npmjs.org/@types/bezier-js/-/bezier-js-0.0.6.tgz", - "integrity": "sha1-DZdtaBY8SVUzLveYohoLPWOB0Ss=" + "integrity": "sha512-kXsAlt8e8N6zt9R6LcMYWB1HkBw3q2g+M9BdI/UE+s4agIONuIscQaRCoInH22+Jas3rw8yLUehL2InaZjyNSA==" }, "@types/node": { "version": "7.10.14", @@ -996,9 +1012,9 @@ } }, "astring": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/astring/-/astring-1.8.1.tgz", - "integrity": "sha512-Aj3mbwVzj7Vve4I/v2JYOPFkCGM2YS7OqQTNSxmUR+LECRpokuPgAYghePgr6SALDo5bD5DlfbSaYjOzGJZOLQ==" + "version": "1.8.3", + "resolved": "https://registry.npmjs.org/astring/-/astring-1.8.3.tgz", + "integrity": "sha512-sRpyiNrx2dEYIMmUXprS8nlpRg2Drs8m9ElX9vVEXaCB4XEAJhKfs7IcX0IwShjuOAjLR6wzIrgoptz1n19i1A==" }, "bezier-js": { "version": "2.6.1", @@ -1008,7 +1024,7 @@ "brace": { "version": "0.10.0", "resolved": "https://registry.npmjs.org/brace/-/brace-0.10.0.tgz", - "integrity": "sha1-7e9OubCSi6HuX3F//BV3SabdXXY=", + "integrity": "sha512-C0nbmcNIY2nRtA3hY5NNmZuNZDs4X676WHf+xiFw0NXUQIdSCkIgZHkztqtSOmC0BGjvBR2DNO9USiZMY+Qx6w==", "requires": { "w3c-blob": "0.0.1" } @@ -1026,7 +1042,7 @@ "clone": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz", - "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=" + "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==" }, "color-convert": { "version": "2.0.1", @@ -1042,21 +1058,22 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, "complex.js": { - "version": "2.0.15", - "resolved": "https://registry.npmjs.org/complex.js/-/complex.js-2.0.15.tgz", - "integrity": "sha512-gDBvQU8IG139ZBQTSo2qvDFP+lANMGluM779csXOr6ny1NUtA3wkUnCFjlDNH/moAVfXtvClYt6G0zarFbtz5w==" + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/complex.js/-/complex.js-2.1.1.tgz", + "integrity": "sha512-8njCHOTtFFLtegk6zQo0kkVX1rngygb/KQI6z1qZxlFI3scluC+LVTCFbrkWjBv4vvLlbQ9t88IPMC6k95VTTg==" }, "decimal.js": { - "version": "10.3.1", - "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.3.1.tgz", - "integrity": "sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ==" + "version": "10.4.0", + "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.0.tgz", + "integrity": "sha512-Nv6ENEzyPQ6AItkGwLE2PGKinZZ9g59vSh2BeH6NqPu0OTKZ5ruJsVqh/orbAnqXc9pBbgXAIrc2EyaCj8NpGg==" }, "define-properties": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", - "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz", + "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==", "requires": { - "object-keys": "^1.0.12" + "has-property-descriptors": "^1.0.0", + "object-keys": "^1.1.1" } }, "emoji-regex": { @@ -1065,7 +1082,7 @@ "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" }, "ergogen": { - "version": "git+ssh://git@github.com/soundmonster/ergogen.git#8670eee8977de5fa2a2763733b7c1cc4bb140678", + "version": "git+ssh://git@github.com/soundmonster/ergogen.git#7946fbe9b8e7b82e0259da5cbfda1a0de7dc1b57", "from": "ergogen@github:soundmonster/ergogen#samoklava", "requires": { "@jscad/openjscad": "github:ergogen/oldjscad", @@ -1091,7 +1108,7 @@ "esprima": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz", - "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=" + "integrity": "sha512-AWwVMNxwhN8+NIPQzAQZCm7RkLC4RbM3B1OobMuyp3i+w73X57KCKaVIxaRZb+DYCojq7rspo+fmuQfAboyhFg==" }, "estraverse": { "version": "4.3.0", @@ -1099,42 +1116,78 @@ "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==" }, "fraction.js": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.1.2.tgz", - "integrity": "sha512-o2RiJQ6DZaR/5+Si0qJUIy637QMRudSi9kU/FFzx9EZazrIdnBgpU+3sEWCxAVhH2RtxW2Oz+T4p2o8uOPVcgA==" + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz", + "integrity": "sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==" }, "fs-extra": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz", - "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==", + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", + "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", "requires": { "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", "universalify": "^2.0.0" } }, + "function-bind": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" + }, "get-caller-file": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==" }, + "get-intrinsic": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.2.tgz", + "integrity": "sha512-Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA==", + "requires": { + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.3" + } + }, "globalthis": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.2.tgz", - "integrity": "sha512-ZQnSFO1la8P7auIOQECnm0sSuoMeaSq0EEdXMBFF2QJO4uNcwbyhSgG3MruWNbFTqCLmxVwGOl7LZ9kASvHdeQ==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz", + "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==", "requires": { "define-properties": "^1.1.3" } }, "graceful-fs": { - "version": "4.2.9", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz", - "integrity": "sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==" + "version": "4.2.10", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", + "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==" }, "graham_scan": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/graham_scan/-/graham_scan-1.0.4.tgz", - "integrity": "sha1-OZZR3R+DU+GID1nqjl+Uud9Mkoo=" + "integrity": "sha512-jL+zq9xTYXxsDIf+qy9aaudRXx/X4sqrOlbFkg1ElqCznhYAQ/wXv8cifgzRvzFopStDeIvny5sIu6jgSjnRww==" + }, + "has": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", + "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", + "requires": { + "function-bind": "^1.1.1" + } + }, + "has-property-descriptors": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz", + "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==", + "requires": { + "get-intrinsic": "^1.1.1" + } + }, + "has-symbols": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", + "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==" }, "is-fullwidth-code-point": { "version": "3.0.0", @@ -1144,7 +1197,7 @@ "javascript-natural-sort": { "version": "0.7.1", "resolved": "https://registry.npmjs.org/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz", - "integrity": "sha1-+eIwPUUH9tdDVac2ZNFED7Wg71k=" + "integrity": "sha512-nO6jcEfZWQXDhOiBtG2KvKyEptz7RVbpGP4vTD2hLBdmNQSsCiicO2Ioinv6UI4y9ukqnBpy+XZ9H6uLNgJTlw==" }, "js-yaml": { "version": "3.14.1", @@ -1163,12 +1216,9 @@ } }, "json5": { - "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" - } + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz", + "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==" }, "jsonfile": { "version": "6.1.0", @@ -1220,26 +1270,21 @@ } }, "mathjs": { - "version": "10.0.2", - "resolved": "https://registry.npmjs.org/mathjs/-/mathjs-10.0.2.tgz", - "integrity": "sha512-QCbsqJ2iBCJP/yTj9Dg45SWecwVf5fxe8sZo4SyerthHVydpxRL33hU0MynwAHqz1XglSGkSKk7QzTD8U8wPFg==", + "version": "10.6.4", + "resolved": "https://registry.npmjs.org/mathjs/-/mathjs-10.6.4.tgz", + "integrity": "sha512-omQyvRE1jIy+3k2qsqkWASOcd45aZguXZDckr3HtnTYyXk5+2xpVfC3kATgbO2Srjxlqww3TVdhD0oUdZ/hiFA==", "requires": { - "@babel/runtime": "^7.16.5", - "complex.js": "^2.0.15", + "@babel/runtime": "^7.18.6", + "complex.js": "^2.1.1", "decimal.js": "^10.3.1", "escape-latex": "^1.2.0", - "fraction.js": "^4.1.2", + "fraction.js": "^4.2.0", "javascript-natural-sort": "^0.7.1", "seedrandom": "^3.0.5", "tiny-emitter": "^2.1.0", - "typed-function": "^2.0.0" + "typed-function": "^2.1.0" } }, - "minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" - }, "most": { "version": "1.9.0", "resolved": "https://registry.npmjs.org/most/-/most-1.9.0.tgz", @@ -1254,7 +1299,7 @@ "most-gestures": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/most-gestures/-/most-gestures-0.3.0.tgz", - "integrity": "sha1-Y07mZK2vU9dA0BSKa0tNF0QDpHg=", + "integrity": "sha512-v57B+eOZ5XVDRUyN8KHcVpeuert8qW6xdVCBfld0mglBJb6Jf3U5hualvTlBODGsai1v5O9jxengsQCq3Lxdkg==", "requires": { "most": "^1.7.2" } @@ -1272,7 +1317,7 @@ "require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=" + "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==" }, "sax": { "version": "1.2.4", @@ -1285,9 +1330,9 @@ "integrity": "sha512-8OwmbklUNzwezjGInmZ+2clQmExQPvomqjL7LFqOYqtmuxRgQYqOD3mHaU+MvZn5FLUeVxVfQjwLZW/n/JFuqg==" }, "semver": { - "version": "7.3.5", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", - "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", + "version": "7.3.7", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz", + "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==", "requires": { "lru-cache": "^6.0.0" } @@ -1295,7 +1340,7 @@ "sprintf-js": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=" + "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==" }, "string-width": { "version": "4.2.3", @@ -1330,9 +1375,9 @@ "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==" }, "typed-function": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/typed-function/-/typed-function-2.0.0.tgz", - "integrity": "sha512-Hhy1Iwo/e4AtLZNK10ewVVcP2UEs408DS35ubP825w/YgSBK1KVLwALvvIG4yX75QJrxjCpcWkzkVRB0BwwYlA==" + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/typed-function/-/typed-function-2.1.0.tgz", + "integrity": "sha512-bctQIOqx2iVbWGDGPWwIm18QScpu2XRmkC19D8rQGFsjKSgteq/o1hTZvIG/wuDq8fanpBDrLkLq+aEN/6y5XQ==" }, "universalify": { "version": "2.0.0", @@ -1342,7 +1387,7 @@ "w3c-blob": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/w3c-blob/-/w3c-blob-0.0.1.tgz", - "integrity": "sha1-sM01KhpQ9RVWNCD/1YYflQ8dhbg=" + "integrity": "sha512-fKfmCyRd0A/tSLt0zPR2716jAkoysa4+2nA2ip6ytr6fs1I9Tml2aXb28w8ljUjUutT23Zn7Vyc2GQM5w3rtWA==" }, "webworkify": { "version": "1.5.0", @@ -1370,9 +1415,9 @@ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" }, "yargs": { - "version": "17.3.1", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.3.1.tgz", - "integrity": "sha512-WUANQeVgjLbNsEmGk20f+nlHgOqzRFpiGWVaBrYGYIGANIIu3lWjoyi0fNlFmJkvfhCZ6BXINe7/W2O2bV4iaA==", + "version": "17.5.1", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.5.1.tgz", + "integrity": "sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA==", "requires": { "cliui": "^7.0.2", "escalade": "^3.1.1", @@ -1384,9 +1429,9 @@ } }, "yargs-parser": { - "version": "21.0.0", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.0.tgz", - "integrity": "sha512-z9kApYUOCwoeZ78rfRYYWdiU/iNL6mwwYlkkZfJoyMR1xps+NEBX5X7XmRpxkZHhXJ6+Ey00IwKxBBSW9FIjyA==" + "version": "21.1.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", + "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==" } } } diff --git a/samoklava.yaml b/samoklava.yaml index 4624aa6..ec7ac0c 100644 --- a/samoklava.yaml +++ b/samoklava.yaml @@ -253,7 +253,6 @@ outlines: operation: subtract pcbs: top_plate: - # include JLCJLCJLCJLC text somewhere include_keys: false outlines: edge: @@ -280,13 +279,11 @@ pcbs: edge: outline: pcb layer: Edge.Cuts - # TODO there's a way to add stuff to the silkscreen layer footprints: mcu_l: type: promicro params: orientation: up - batteryPins: true anchor: ref: - matrix_inner_top @@ -296,7 +293,6 @@ pcbs: type: promicro params: orientation: down - batteryPins: true anchor: ref: - matrix_inner_top @@ -307,7 +303,7 @@ pcbs: anchor: ref: - matrix_inner_top - shift: [23, -18] + shift: [23, -6] rotate: 0 params: front: true @@ -316,13 +312,13 @@ pcbs: height: 1.5 text: "B+" nets: - net: Braw + net: Bplus pad_minus: type: pad anchor: ref: - matrix_inner_top - shift: [23, -15] + shift: [23, -3] rotate: 0 params: front: true @@ -331,7 +327,7 @@ pcbs: height: 1.5 text: "B-" nets: - net: Bminus + net: GND trrs_l: type: trrs anchor: @@ -374,8 +370,8 @@ pcbs: params: side: B nets: - from: Braw - to: Bplus + from: Bplus + to: RAW jumper_r: type: jumper anchor: @@ -386,8 +382,8 @@ pcbs: params: side: F nets: - from: Braw - to: Bplus + from: Bplus + to: RAW slider_l: type: slider anchor: @@ -398,8 +394,9 @@ pcbs: params: side: F nets: - from: Braw - to: Bplus + from: RAW + left: Bplus + right: '' slider_r: type: slider anchor: @@ -410,8 +407,9 @@ pcbs: params: side: B nets: - from: Braw - to: Bplus + from: RAW + left: '' + right: Bplus reset: type: button anchor: