diff --git a/config/changelog.yaml b/config/changelog.yaml index 913cbe808fe..791beef0ca2 100644 --- a/config/changelog.yaml +++ b/config/changelog.yaml @@ -1,13 +1,19 @@ 2.15.1: - date: 2021-04-20 + date: 2021-04-24 Added: + charlie: + - Added a curved waistband option simon: - Added some dimensions to clarify the X value of shoulder/armhole points + Fixed: charlie: - Keep `frontPocketSlantRound` and `frontPocketSlantBend` options from being zero + core: + - Fixed bug in the dependency resolved when dependecies are passed as a string + See [#971](https://github.com/freesewing/freesewing/issues/971) 2.15.0: date: 2021-04-15 diff --git a/package.json b/package.json index 520e448d226..43c4ffc44d0 100644 --- a/package.json +++ b/package.json @@ -14,12 +14,9 @@ "homepage": "https://freesewing.org/", "license": "MIT", "scripts": { - "lint": "eslint --fix 'src/*.js'", "kickstart": "npx lerna bootstrap && npx lerna run build --no-bail && npx lerna run build", "clean": "rimraf dist", "test": "lerna run test", - "jsonlint": "yarn --silent jsonlint:files | xargs -n1 jsonlint -q -c && echo \"jsonlint: no lint errors\"", - "jsonlint:files": "find . -name \"*.json\" | grep -v -f .eslintignore", "prettier": "npx prettier --write 'packages/**/src/*.js' 'packages/**/config/*.js' 'packages/**/example/src/*' 'packages/i18n/src/locales/**/*.*'", "reconfigure": "npx babel-node scripts/reconfigure.js", "dxf": "npx babel-node scripts/export-dxf.js", @@ -71,22 +68,11 @@ "codecov": "^3.7.2", "cross-env": "^7.0.2", "deep-freeze": "^0.0.1", - "eslint": "^7.6.0", - "eslint-config-prettier": "^7.2.0", - "eslint-config-standard": "^15.0.1", - "eslint-config-standard-react": "^10.0.0", - "eslint-plugin-import": "^2.22.0", - "eslint-plugin-node": "^11.1.0", - "eslint-plugin-prettier": "^3.1.4", - "eslint-plugin-promise": "^4.0.0", - "eslint-plugin-react": "^7.20.5", - "eslint-plugin-standard": "^5.0.0", "esm": "^3.2.25", "file-saver": "^2.0.2", "fs-extra": "^9.1.0", "husky": "^4.2.5", "js-yaml": "^4.0.0", - "jsonlint": "^1.6.3", "lerna": "^3.22.1", "mocha": "^8.1.0", "mustache": "^4.0.1", diff --git a/packages/aaron/config/index.js b/packages/aaron/config/index.js index 04bd4b2d663..82aacfa01f8 100644 --- a/packages/aaron/config/index.js +++ b/packages/aaron/config/index.js @@ -18,8 +18,8 @@ export default { 'necklineDrop', 'shoulderStrapWidth', 'shoulderStrapPlacement', - 'lengthBonus' - ] + 'lengthBonus', + ], }, measurements: [ 'biceps', @@ -29,15 +29,15 @@ export default { 'neck', 'shoulderSlope', 'shoulderToShoulder', - 'hips' + 'hips', ], dependencies: { front: 'base', - back: 'front' + back: 'front', }, inject: { front: 'base', - back: 'front' + back: 'front', }, hide: ['base'], options: { @@ -63,6 +63,6 @@ export default { necklineDrop: { pct: 20, min: 10, max: 35 }, stretchFactor: { pct: 5, min: 0, max: 15 }, shoulderStrapWidth: { pct: 15, min: 10, max: 40 }, - shoulderStrapPlacement: { pct: 40, min: 20, max: 80 } - } + shoulderStrapPlacement: { pct: 40, min: 20, max: 80 }, + }, } diff --git a/packages/aaron/src/back.js b/packages/aaron/src/back.js index 070529487f0..7df7869b8b8 100644 --- a/packages/aaron/src/back.js +++ b/packages/aaron/src/back.js @@ -14,7 +14,7 @@ export default function (part) { macro, utils, units, - measurements + measurements, } = part.shorthand() // Lower back neck a bit @@ -88,7 +88,7 @@ export default function (part) { macro('cutonfold', { from: points.cfNeck, to: points.cfHem, - grainline: true + grainline: true, }) macro('title', { at: points.title, nr: 2, title: 'back' }) @@ -102,7 +102,7 @@ export default function (part) { macro('vd', { from: points.cbHem, to: points.cbNeck, - x: points.cbHem.x - sa - 15 + x: points.cbHem.x - sa - 15, }) } diff --git a/packages/aaron/src/front.js b/packages/aaron/src/front.js index af64c9fc999..a23c06238c0 100644 --- a/packages/aaron/src/front.js +++ b/packages/aaron/src/front.js @@ -15,7 +15,7 @@ export default function (part) { measurements, complete, paperless, - macro + macro, } = part.shorthand() // Hide Brian paths @@ -120,7 +120,7 @@ export default function (part) { macro('cutonfold', { from: points.cfNeck, to: points.cfHem, - grainline: true + grainline: true, }) points.title = new Point(points.waist.x / 2, points.waist.y) macro('title', { at: points.title, nr: 1, title: 'front' }) @@ -161,7 +161,7 @@ export default function (part) { macro('vd', { from: points.cfHem, to: points.cfNeck, - x: points.cfHem.x - sa - 15 + x: points.cfHem.x - sa - 15, }) } diff --git a/packages/aaron/src/shared.js b/packages/aaron/src/shared.js index 3c4fc43915f..74f0c74794f 100644 --- a/packages/aaron/src/shared.js +++ b/packages/aaron/src/shared.js @@ -2,36 +2,36 @@ export function dimensions(macro, points, sa) { macro('hd', { from: points.cfHem, to: points.hem, - y: points.hem.y + sa * 2.5 + 15 + y: points.hem.y + sa * 2.5 + 15, }) macro('hd', { from: points.cfNeck, to: points.strapLeft, - y: points.neck.y - sa - 15 + y: points.neck.y - sa - 15, }) macro('hd', { from: points.cfNeck, to: points.strapRight, - y: points.neck.y - sa - 30 + y: points.neck.y - sa - 30, }) macro('vd', { from: points.hem, to: points.armhole, - x: points.armhole.x + sa + 15 + x: points.armhole.x + sa + 15, }) macro('vd', { from: points.hem, to: points.strapRight, - x: points.armhole.x + sa + 30 + x: points.armhole.x + sa + 30, }) macro('vd', { from: points.hem, to: points.strapLeft, - x: points.armhole.x + sa + 45 + x: points.armhole.x + sa + 45, }) macro('hd', { from: points.cfNeck, to: points.armhole, - y: points.neck.y - sa - 45 + y: points.neck.y - sa - 45, }) } diff --git a/packages/albert/config/index.js b/packages/albert/config/index.js index b8a0929596a..f9b6bef771c 100644 --- a/packages/albert/config/index.js +++ b/packages/albert/config/index.js @@ -11,7 +11,7 @@ export default { tags: ['accessories'], optionGroups: { fit: ['backOpening', 'chestDepth'], - style: ['lengthBonus', 'bibLength', 'bibWidth', 'strapWidth'] + style: ['lengthBonus', 'bibLength', 'bibWidth', 'strapWidth'], }, measurements: ['chest', 'waist', 'hips', 'hpsToWaistBack', 'waistToKnee'], dependencies: {}, @@ -24,6 +24,6 @@ export default { chestDepth: { pct: 22, min: 15, max: 90 }, bibLength: { pct: 75, min: 0, max: 90 }, bibWidth: { pct: 100, min: 50, max: 125 }, - strapWidth: { pct: 60, min: 20, max: 100 } - } + strapWidth: { pct: 60, min: 20, max: 100 }, + }, } diff --git a/packages/albert/src/front.js b/packages/albert/src/front.js index 2ae8709629b..35d6a8d6bc5 100644 --- a/packages/albert/src/front.js +++ b/packages/albert/src/front.js @@ -11,7 +11,7 @@ export default function (part) { complete, sa, paperless, - macro + macro, } = part.shorthand() let chestWidth = measurements.chest / 4 @@ -111,7 +111,7 @@ export default function (part) { macro('title', { nr: 1, at: points.title, - title: 'Front' + title: 'Front', }) points.scaleboxAnchor = points.pocketLeftBottom.shiftFractionTowards(points.bottomRight, 0.5) @@ -119,12 +119,12 @@ export default function (part) { macro('crossBox', { from: points.topRightHem, - to: points.crossBoxTo1 + to: points.crossBoxTo1, }) macro('crossBox', { from: points.topRightBack, to: points.crossBoxTo2, - text: 'attachment' + text: 'attachment', }) if (sa) { @@ -133,7 +133,7 @@ export default function (part) { macro('cutonfold', { from: points.topCOF, - to: points.bottomCOF + to: points.bottomCOF, }) } @@ -142,42 +142,42 @@ export default function (part) { macro('hd', { from: points.bottomLeft, to: points.bottomRight, - y: points.bottomLeft.y + sa + 15 + y: points.bottomLeft.y + sa + 15, }) macro('hd', { from: points.topLeft, to: points.topRight, - y: points.topLeft.y - sa - 15 + y: points.topLeft.y - sa - 15, }) macro('vd', { from: points.bottomLeft, to: points.topLeft, - x: points.topLeft.x - sa - 15 + x: points.topLeft.x - sa - 15, }) macro('vd', { from: points.bottomRight, to: points.topRightBack, - x: points.topRightBack.x + sa + 15 + x: points.topRightBack.x + sa + 15, }) macro('vd', { from: points.topRightBack, to: points.topRight, - x: points.topRightBack.x + sa + 15 + x: points.topRightBack.x + sa + 15, }) macro('vd', { from: points.topLeft, to: points.topLeftHem, - x: points.topLeftHem.x + sa + 15 + x: points.topLeftHem.x + sa + 15, }) macro('vd', { from: points.topLeftHem, to: points.bottomLeftHem, - x: points.topLeftHem.x + sa + 15 + x: points.topLeftHem.x + sa + 15, }) macro('vd', { from: points.bottomLeftHem, to: points.bottomLeft, - x: points.bottomLeftHem.x + sa + 15 + x: points.bottomLeftHem.x + sa + 15, }) } diff --git a/packages/albert/src/index.js b/packages/albert/src/index.js index 4f859de7d66..487540657a1 100644 --- a/packages/albert/src/index.js +++ b/packages/albert/src/index.js @@ -58,8 +58,8 @@ const crossBox = { .attr('data-text', so.text) .attr('data-text-class', 'center') } - } - } + }, + }, } // Create new design diff --git a/packages/albert/src/pocket.js b/packages/albert/src/pocket.js index 4c489da7fdd..71a3c849041 100644 --- a/packages/albert/src/pocket.js +++ b/packages/albert/src/pocket.js @@ -11,7 +11,7 @@ export default function (part) { complete, sa, paperless, - macro + macro, } = part.shorthand() let apronLength = @@ -49,7 +49,7 @@ export default function (part) { macro('cutonfold', { from: points.topCOF, - to: points.bottomCOF + to: points.bottomCOF, }) // Complete? @@ -60,7 +60,7 @@ export default function (part) { macro('title', { nr: 3, at: points.title, - title: 'Pocket' + title: 'Pocket', }) if (sa) { paths.sa = paths.seam.offset(sa).attr('class', 'fabric sa') @@ -72,12 +72,12 @@ export default function (part) { macro('hd', { from: points.bottomLeft, to: points.bottomRight, - y: points.bottomLeft.y + sa + 15 + y: points.bottomLeft.y + sa + 15, }) macro('vd', { from: points.bottomLeft, to: points.topLeft, - x: points.topLeft.x - sa - 15 + x: points.topLeft.x - sa - 15, }) } diff --git a/packages/albert/src/strap.js b/packages/albert/src/strap.js index adccac30e3b..c998edc130e 100644 --- a/packages/albert/src/strap.js +++ b/packages/albert/src/strap.js @@ -11,7 +11,7 @@ export default function (part) { complete, sa, paperless, - macro + macro, } = part.shorthand() let chestWidth = measurements.chest / 4 @@ -89,7 +89,7 @@ export default function (part) { macro('title', { nr: 2, at: points.title, - title: 'Strap' + title: 'Strap', }) macro('crossBox', { from: points.topLeft, to: points.topMiddleHem }) macro('crossBox', { from: points.bottomLeftHem, to: points.bottomMiddle }) @@ -103,27 +103,27 @@ export default function (part) { macro('hd', { from: points.bottomLeft, to: points.bottomRight, - y: points.bottomLeft.y + sa + 15 + y: points.bottomLeft.y + sa + 15, }) macro('vd', { from: points.bottomLeft, to: points.topLeft, - x: points.topLeft.x - sa - 15 + x: points.topLeft.x - sa - 15, }) macro('vd', { from: points.topMiddle, to: points.topMiddleHem, - x: points.topMiddleHem.x + sa + 15 + x: points.topMiddleHem.x + sa + 15, }) macro('vd', { from: points.topMiddleHem, to: points.bottomMiddleHem, - x: points.topMiddleHem.x + sa + 15 + x: points.topMiddleHem.x + sa + 15, }) macro('vd', { from: points.bottomMiddleHem, to: points.bottomMiddle, - x: points.bottomMiddleHem.x + sa + 15 + x: points.bottomMiddleHem.x + sa + 15, }) } diff --git a/packages/bella/config/index.js b/packages/bella/config/index.js index 3f7d20c5aa5..2464a421d17 100644 --- a/packages/bella/config/index.js +++ b/packages/bella/config/index.js @@ -17,9 +17,9 @@ export default { 'backArmholeSlant', 'backArmholeCurvature', 'frontArmholePitchDepth', - 'backArmholePitchDepth' + 'backArmholePitchDepth', ], - advanced: ['backNeckCutout', 'backHemSlope', 'frontShoulderWidth', 'highBustWidth'] + advanced: ['backNeckCutout', 'backHemSlope', 'frontShoulderWidth', 'highBustWidth'], }, measurements: [ 'highBust', @@ -33,17 +33,17 @@ export default { 'hpsToWaistFront', 'hpsToWaistBack', 'shoulderToShoulder', - 'shoulderSlope' + 'shoulderSlope', // FIXME: Measurement from waist up to armhole (for sleeveless) ], dependencies: { - back: 'frontSideDart' + back: 'frontSideDart', }, inject: {}, hide: [], parts: [ 'back', - 'frontSideDart' + 'frontSideDart', // 'frontShoulderDart' ], options: { @@ -75,6 +75,6 @@ export default { highBustWidth: { pct: 86, max: 92, min: 80 }, bustDartLength: { pct: 90, min: 75, max: 100 }, waistDartLength: { pct: 90, min: 75, max: 95 }, - bustDartCurve: { pct: 100, min: 0, max: 100 } - } + bustDartCurve: { pct: 100, min: 0, max: 100 }, + }, } diff --git a/packages/bella/src/back.js b/packages/bella/src/back.js index 079cdb0bbb9..fdf4cc9629f 100644 --- a/packages/bella/src/back.js +++ b/packages/bella/src/back.js @@ -12,7 +12,7 @@ export default function (part) { macro, utils, measurements, - raise + raise, } = part.shorthand() // Get to work @@ -186,15 +186,15 @@ export default function (part) { macro('title', { nr: 2, title: 'back', - at: points.titleAnchor + at: points.titleAnchor, }) macro('grainline', { from: new Point(points.hps.x / 2, points.shoulder.y), - to: new Point(points.hps.x / 2, points.waistSide.y) + to: new Point(points.hps.x / 2, points.waistSide.y), }) macro('sprinkle', { snippet: 'bnotch', - on: ['armholePitch', 'bustCenter'] + on: ['armholePitch', 'bustCenter'], }) if (sa) paths.sa = paths.saBase.offset(sa).attr('class', 'fabric sa') @@ -203,92 +203,92 @@ export default function (part) { macro('vd', { from: points.waistCenter, to: points.dartTip, - x: points.cbNeck.x - sa - 15 + x: points.cbNeck.x - sa - 15, }) macro('vd', { from: points.waistCenter, to: points.cbNeck, - x: points.cbNeck.x - sa - 30 + x: points.cbNeck.x - sa - 30, }) macro('vd', { from: points.waistCenter, to: points.hps, - x: points.cbNeck.x - sa - 45 + x: points.cbNeck.x - sa - 45, }) macro('hd', { from: points.cbNeck, to: points.waistCenter, - y: points.waistCenter.y + sa + 15 + y: points.waistCenter.y + sa + 15, }) macro('hd', { from: points.cbNeck, to: points.dartBottomLeft, - y: points.waistCenter.y + sa + 30 + y: points.waistCenter.y + sa + 30, }) macro('hd', { from: points.cbNeck, to: points.dartBottomRight, - y: points.waistCenter.y + sa + 45 + y: points.waistCenter.y + sa + 45, }) macro('hd', { from: points.dartBottomLeft, to: points.dartBottomRight, - y: points.waistCenter.y + sa + 15 + y: points.waistCenter.y + sa + 15, }) macro('hd', { from: points.cbNeck, to: points.waistSide, - y: points.waistCenter.y + sa + 60 + y: points.waistCenter.y + sa + 60, }) macro('hd', { from: points.cbNeck, to: points.armhole, - y: points.waistCenter.y + sa + 75 + y: points.waistCenter.y + sa + 75, }) macro('vd', { from: points.waistSide, to: points.armhole, - x: points.armhole.x + sa + 15 + x: points.armhole.x + sa + 15, }) macro('vd', { from: points.waistSide, to: points.armholePitch, - x: points.armhole.x + sa + 30 + x: points.armhole.x + sa + 30, }) macro('vd', { from: points.waistSide, to: points.shoulder, - x: points.armhole.x + sa + 45 + x: points.armhole.x + sa + 45, }) macro('vd', { from: points.waistSide, to: points.hps, - x: points.armhole.x + sa + 60 + x: points.armhole.x + sa + 60, }) macro('vd', { from: points.waistCenter, to: points.waistSide, - x: points.waistSide.x + sa + 15 + x: points.waistSide.x + sa + 15, }) macro('hd', { from: points.cbNeck, to: points.hps, - y: points.hps.y - sa - 15 + y: points.hps.y - sa - 15, }) macro('hd', { from: points.cbNeck, to: points.armholePitch, - y: points.hps.y - sa - 30 + y: points.hps.y - sa - 30, }) macro('hd', { from: points.cbNeck, to: points.shoulder, - y: points.hps.y - sa - 45 + y: points.hps.y - sa - 45, }) macro('hd', { from: points.cbNeck, to: points.armhole, - y: points.hps.y - sa - 60 + y: points.hps.y - sa - 60, }) } } diff --git a/packages/bella/src/front-side-dart.js b/packages/bella/src/front-side-dart.js index 5c92d219e1b..5ca57351d00 100644 --- a/packages/bella/src/front-side-dart.js +++ b/packages/bella/src/front-side-dart.js @@ -11,7 +11,7 @@ export default function (part) { paperless, macro, utils, - measurements + measurements, } = part.shorthand() // Get to work @@ -200,7 +200,7 @@ export default function (part) { macro('title', { at: points.titleAnchor, nr: 1, - title: 'front' + title: 'front', }) points.scaleboxAnchor = points.titleAnchor.shift(-90, 70) macro('scalebox', { at: points.scaleboxAnchor }) @@ -212,11 +212,11 @@ export default function (part) { macro('cutonfold', { from: points.cfNeck, to: points.cfHem, - grainline: true + grainline: true, }) macro('sprinkle', { snippet: 'notch', - on: ['bust', 'armholePitch', 'cfBust'] + on: ['bust', 'armholePitch', 'cfBust'], }) if (sa) { @@ -227,102 +227,102 @@ export default function (part) { macro('vd', { from: points.cfHem, to: points.waistDartTip, - x: 0 - 15 + x: 0 - 15, }) macro('vd', { from: points.cfHem, to: points.bust, - x: 0 - 30 + x: 0 - 30, }) macro('vd', { from: points.cfHem, to: points.cfNeck, - x: 0 - 45 + x: 0 - 45, }) macro('vd', { from: points.cfHem, to: points.hps, - x: 0 - 60 + x: 0 - 60, }) macro('hd', { from: points.cfBust, to: points.bust, - y: points.bust.y - 15 + y: points.bust.y - 15, }) macro('hd', { from: points.cfBust, to: points.bustDartTip, - y: points.bust.y - 30 + y: points.bust.y - 30, }) macro('hd', { from: points.cfHem, to: points.waistDartLeft, - y: points.cfHem.y + sa + 15 + y: points.cfHem.y + sa + 15, }) macro('hd', { from: points.cfHem, to: points.waistDartRight, - y: points.cfHem.y + sa + 30 + y: points.cfHem.y + sa + 30, }) macro('hd', { from: points.cfHem, to: points.sideHem, - y: points.cfHem.y + sa + 45 + y: points.cfHem.y + sa + 45, }) macro('hd', { from: points.cfHem, to: points.bustDartBottom, - y: points.cfHem.y + sa + 60 + y: points.cfHem.y + sa + 60, }) macro('hd', { from: points.cfHem, to: points.bustDartTop, - y: points.cfHem.y + sa + 75 + y: points.cfHem.y + sa + 75, }) macro('vd', { from: points.sideHem, to: points.bustDartBottom, - x: points.bustDartTop.x + sa + 15 + x: points.bustDartTop.x + sa + 15, }) macro('vd', { from: points.sideHem, to: points.bustDartTop, - x: points.bustDartTop.x + sa + 30 + x: points.bustDartTop.x + sa + 30, }) macro('vd', { from: points.sideHem, to: points.armhole, - x: points.bustDartTop.x + sa + 45 + x: points.bustDartTop.x + sa + 45, }) macro('vd', { from: points.sideHem, to: points.armholePitch, - x: points.bustDartTop.x + sa + 60 + x: points.bustDartTop.x + sa + 60, }) macro('vd', { from: points.sideHem, to: points.shoulder, - x: points.bustDartTop.x + sa + 75 + x: points.bustDartTop.x + sa + 75, }) macro('hd', { from: points.cfNeck, to: points.hps, - y: points.hps.y - sa - 15 + y: points.hps.y - sa - 15, }) macro('hd', { from: points.cfNeck, to: points.armholePitch, - y: points.hps.y - sa - 30 + y: points.hps.y - sa - 30, }) macro('hd', { from: points.cfNeck, to: points.shoulder, - y: points.hps.y - sa - 45 + y: points.hps.y - sa - 45, }) macro('hd', { from: points.cfNeck, to: points.armhole, - y: points.hps.y - sa - 60 + y: points.hps.y - sa - 60, }) } } diff --git a/packages/benjamin/config/index.js b/packages/benjamin/config/index.js index e2288261d66..b458275ec3b 100644 --- a/packages/benjamin/config/index.js +++ b/packages/benjamin/config/index.js @@ -11,14 +11,14 @@ export default { tags: ['top', 'basics'], optionGroups: { fit: ['collarEase', 'adjustmentRibbon'], - style: ['tipWidth', 'knotWidth', 'bowLength', 'bowStyle', 'endStyle'] + style: ['tipWidth', 'knotWidth', 'bowLength', 'bowStyle', 'endStyle'], }, measurements: ['neck'], dependencies: {}, inject: { bow1: 'base', bow2: 'base', - bow3: 'base' + bow3: 'base', }, hide: ['base'], parts: ['ribbon'], @@ -28,39 +28,39 @@ export default { ribbonWidth: { pct: 6, min: 5, - max: 8 + max: 8, }, tipWidth: { pct: 15, min: 0, - max: 20 + max: 20, }, knotWidth: { pct: 7, min: 5, - max: 10 + max: 10, }, bowLength: { pct: 28, min: 23, - max: 33 + max: 33, }, collarEase: { pct: 3, min: 0, - max: 6 + max: 6, }, bowStyle: { dflt: 'butterfly', - list: ['diamond', 'butterfly', 'square', 'widesquare'] + list: ['diamond', 'butterfly', 'square', 'widesquare'], }, endStyle: { dflt: 'straight', - list: ['straight', 'pointed', 'rounded'] + list: ['straight', 'pointed', 'rounded'], }, adjustmentRibbon: { - bool: false + bool: false, }, - adjustmentRibbonWidth: 20 - } + adjustmentRibbonWidth: 20, + }, } diff --git a/packages/benjamin/src/base.js b/packages/benjamin/src/base.js index fe5606d5935..c7ce94d6921 100644 --- a/packages/benjamin/src/base.js +++ b/packages/benjamin/src/base.js @@ -12,7 +12,7 @@ export default function (part) { measurements, complete, paperless, - macro + macro, } = part.shorthand() if (options.bowStyle === 'square') options.tipWidth = options.knotWidth @@ -23,7 +23,7 @@ export default function (part) { 'tipWidth', 'knotWidth', 'bowLength', - 'collarEase' + 'collarEase', ]) store.set(option, measurements.neck * options[option]) @@ -76,13 +76,13 @@ export default function (part) { from: points.tip2Bottom, to: points.tip, via: points.roundBottom, - prefix: 'bottom' + prefix: 'bottom', }) macro('round', { from: points.tip, to: points.tip2Top, via: points.roundTop, - prefix: 'top' + prefix: 'top', }) paths.cap = paths.bottomRounded.join(paths.topRounded) } @@ -146,53 +146,53 @@ export default function (part) { macro('hd', { from: points.knotBottom, to: points.tip2Bottom, - y: baseY + y: baseY, }) baseY += 15 if (options.bowStyle === 'butterfly' || options.bowStyle === 'diamond') { macro('hd', { from: points.tip1Bottom, to: points.tip2Bottom, - y: baseY + y: baseY, }) baseY += 15 macro('vd', { from: points.tip1Bottom, - to: points.tip1Top + to: points.tip1Top, }) } macro('hd', { from: points.transitionBottomRight, to: points.tip2Bottom, - y: baseY + y: baseY, }) baseY += 15 macro('hd', { from: points.bandBottomRight, to: points.tip2Bottom, - y: baseY + y: baseY, }) baseY += 15 store.set('baseY', baseY) macro('vd', { from: points.bandBottomRight, - to: points.bandTopRight + to: points.bandTopRight, }) macro('vd', { from: points.transitionBottomRight, - to: points.transitionTopRight + to: points.transitionTopRight, }) macro('vd', { from: points.tip2Bottom, to: points.tip2Top, - x: points.tip.x + 15 + sa + x: points.tip.x + 15 + sa, }) if (options.endStyle !== 'straight') { macro('hd', { from: points.tip2Bottom, to: points.tip, - y: points.tip2Bottom.y + 15 + sa + y: points.tip2Bottom.y + 15 + sa, }) } } diff --git a/packages/benjamin/src/bow1.js b/packages/benjamin/src/bow1.js index ba7630fbd34..8fe9fdf858a 100644 --- a/packages/benjamin/src/bow1.js +++ b/packages/benjamin/src/bow1.js @@ -8,7 +8,7 @@ export default function (part) { macro('grainline', { from: points.grainlineStart, - to: points.tip.shift(180, 20) + to: points.tip.shift(180, 20), }) paths.seam = new Path() @@ -26,7 +26,7 @@ export default function (part) { macro('hd', { from: points.bandBottomLeft, to: points.tip2Bottom, - y: store.get('baseY') + y: store.get('baseY'), }) } if (sa) { @@ -36,7 +36,7 @@ export default function (part) { at: points.titleAnchor, nr: 1, title: 'bowTie', - scale: store.get('tipWidth') / 75 + scale: store.get('tipWidth') / 75, }) points.scaleboxAnchor = points.bandTopLeft.shift(30, 80) macro('scalebox', { at: points.scaleboxAnchor }) diff --git a/packages/benjamin/src/bow2.js b/packages/benjamin/src/bow2.js index 156a2c7c3c3..d5a2e690343 100644 --- a/packages/benjamin/src/bow2.js +++ b/packages/benjamin/src/bow2.js @@ -9,7 +9,7 @@ export default function (part) { macro, sa, store, - paperless + paperless, } = part.shorthand() if (!options.adjustmentRibbon) { @@ -24,7 +24,7 @@ export default function (part) { macro('grainline', { from: points.grainlineStart, - to: points.tip.shift(180, 20) + to: points.tip.shift(180, 20), }) paths.seam = new Path() @@ -42,7 +42,7 @@ export default function (part) { macro('hd', { from: points.bandBottomLeft, to: points.tip2Bottom, - y: store.get('baseY') + y: store.get('baseY'), }) } if (sa) { @@ -52,7 +52,7 @@ export default function (part) { at: points.titleAnchor, nr: 2, title: 'bowTie', - scale: store.get('tipWidth') / 75 + scale: store.get('tipWidth') / 75, }) } diff --git a/packages/benjamin/src/bow3.js b/packages/benjamin/src/bow3.js index bc849528ae3..8bc09f4ffa0 100644 --- a/packages/benjamin/src/bow3.js +++ b/packages/benjamin/src/bow3.js @@ -9,7 +9,7 @@ export default function (part) { macro, sa, store, - paperless + paperless, } = part.shorthand() if (!options.adjustmentRibbon) { @@ -24,7 +24,7 @@ export default function (part) { macro('grainline', { from: points.grainlineStart, - to: points.tip.shift(180, 20) + to: points.tip.shift(180, 20), }) paths.seam = new Path() @@ -42,7 +42,7 @@ export default function (part) { macro('hd', { from: points.bandBottomLeft, to: points.tip2Bottom, - y: store.get('baseY') + y: store.get('baseY'), }) } if (sa) { @@ -52,7 +52,7 @@ export default function (part) { at: points.titleAnchor, nr: 3, title: 'bowTie', - scale: store.get('tipWidth') / 75 + scale: store.get('tipWidth') / 75, }) } diff --git a/packages/benjamin/src/ribbon.js b/packages/benjamin/src/ribbon.js index 97e5fe8bde5..40a8b59064e 100644 --- a/packages/benjamin/src/ribbon.js +++ b/packages/benjamin/src/ribbon.js @@ -10,7 +10,7 @@ export default function (part) { points, paths, sa, - paperless + paperless, } = part.shorthand() if (options.adjustmentRibbon) { @@ -44,19 +44,19 @@ export default function (part) { at: points.titleAnchor, nr: 2, title: 'ribbon', - scale: 0.3 + scale: 0.3, }) if (paperless) { macro('hd', { from: points.bottomLeft, to: points.bottomRight, - y: points.bottomLeft.y + 15 + sa + y: points.bottomLeft.y + 15 + sa, }) macro('vd', { from: points.bottomRight, to: points.topRight, - x: points.topRight.x + 15 + sa + x: points.topRight.x + 15 + sa, }) } } diff --git a/packages/bent/config/index.js b/packages/bent/config/index.js index bfbc34788b8..6178d2e16c2 100644 --- a/packages/bent/config/index.js +++ b/packages/bent/config/index.js @@ -18,7 +18,7 @@ export default { 'shoulderEase', 'lengthBonus', 'sleeveLengthBonus', - 'sleeveBend' + 'sleeveBend', ], advanced: [ 'acrossBackFactor', @@ -27,8 +27,8 @@ export default { 'frontArmholeDeeper', 'shoulderSlopeReduction', 'sleevecapHeight', - 'sleevecapEase' - ] + 'sleevecapEase', + ], }, measurements: [ 'biceps', @@ -40,19 +40,19 @@ export default { 'shoulderToElbow', 'shoulderToShoulder', 'shoulderToWrist', - 'wrist' + 'wrist', ], dependencies: { back: 'base', front: 'back', topSleeve: 'sleeve', - underSleeve: 'sleeve' + underSleeve: 'sleeve', }, inject: { back: 'base', front: 'back', topSleeve: 'sleeve', - underSleeve: 'sleeve' + underSleeve: 'sleeve', }, hide: ['base', 'sleeve'], options: { @@ -77,6 +77,6 @@ export default { sleeveBend: { deg: 10, min: 0, max: 20 }, sleevecapHeight: { pct: 45, min: 40, max: 60 }, sleevecapEase: { pct: 1, min: 0, max: 10 }, - sleeveLengthBonus: { pct: 0, min: -20, max: 15 } - } + sleeveLengthBonus: { pct: 0, min: -20, max: 15 }, + }, } diff --git a/packages/bent/src/shared.js b/packages/bent/src/shared.js index adf718c6ddf..8c8c1a14204 100644 --- a/packages/bent/src/shared.js +++ b/packages/bent/src/shared.js @@ -4,49 +4,49 @@ export default function (part, s) { macro('ld', { from: points[s + 'WristLeft'], to: points[s + 'WristRight'], - d: 15 + d: 15, }) macro('ld', { from: points[s + 'ElbowLeft'], - to: points.elbowRight + to: points.elbowRight, }) macro('ld', { from: points[s + 'LeftEdge'], - to: points[s + 'RightEdge'] + to: points[s + 'RightEdge'], }) macro('hd', { from: points[s + 'LeftEdge'], to: points[s + 'ElbowLeft'], - y: points[s + 'WristRight'].y + 3 * sa + 15 + y: points[s + 'WristRight'].y + 3 * sa + 15, }) macro('hd', { from: points[s + 'LeftEdge'], to: points[s + 'WristLeft'], - y: points[s + 'WristRight'].y + 3 * sa + 30 + y: points[s + 'WristRight'].y + 3 * sa + 30, }) macro('hd', { from: points[s + 'LeftEdge'], to: points[s + 'WristRight'], - y: points[s + 'WristRight'].y + 3 * sa + 45 + y: points[s + 'WristRight'].y + 3 * sa + 45, }) macro('hd', { from: points[s + 'LeftEdge'], to: points.elbowRight, - y: points[s + 'WristRight'].y + 3 * sa + 60 + y: points[s + 'WristRight'].y + 3 * sa + 60, }) macro('vd', { from: points[s + 'ElbowLeft'], to: points[s + 'LeftEdge'], - x: points[s + 'LeftEdge'].x - sa - 15 + x: points[s + 'LeftEdge'].x - sa - 15, }) macro('vd', { from: points[s + 'WristLeft'], to: points[s + 'LeftEdge'], - x: points[s + 'LeftEdge'].x - sa - 30 + x: points[s + 'LeftEdge'].x - sa - 30, }) macro('vd', { from: points[s + 'WristRight'], to: points[s + 'LeftEdge'], - x: points[s + 'LeftEdge'].x - sa - 45 + x: points[s + 'LeftEdge'].x - sa - 45, }) } diff --git a/packages/bent/src/topsleeve.js b/packages/bent/src/topsleeve.js index 32b105338a5..d2904e22030 100644 --- a/packages/bent/src/topsleeve.js +++ b/packages/bent/src/topsleeve.js @@ -15,7 +15,7 @@ export default function (part) { macro('title', { at: points.armCenter, nr: 3, - title: 'topsleeve' + title: 'topsleeve', }) if (sa) { @@ -41,27 +41,27 @@ export default function (part) { macro('vd', { from: points.tsLeftEdge, to: points.top, - x: points.tsLeftEdge.x - sa - 15 + x: points.tsLeftEdge.x - sa - 15, }) macro('hd', { from: points.tsLeftEdge, to: points.top, - y: points.top.x - sa - 15 + y: points.top.x - sa - 15, }) macro('hd', { from: points.tsLeftEdge, to: points.backPitchPoint, - y: points.top.x - sa - 30 + y: points.top.x - sa - 30, }) macro('hd', { from: points.tsLeftEdge, to: points.tsRightEdge, - y: points.top.x - sa - 45 + y: points.top.x - sa - 45, }) macro('vd', { from: points.tsRightEdge, to: points.backPitchPoint, - x: points.tsRightEdge.x + sa + 15 + x: points.tsRightEdge.x + sa + 15, }) } diff --git a/packages/bent/src/undersleeve.js b/packages/bent/src/undersleeve.js index d2040f88203..81699fb569a 100644 --- a/packages/bent/src/undersleeve.js +++ b/packages/bent/src/undersleeve.js @@ -16,7 +16,7 @@ export default function (part) { macro('title', { at: points.armCenter, nr: 4, - title: 'undersleeve' + title: 'undersleeve', }) if (sa) { @@ -42,12 +42,12 @@ export default function (part) { macro('hd', { from: points.usLeftEdge, to: points.usTip, - y: points.usTip.y - sa - 15 + y: points.usTip.y - sa - 15, }) macro('vd', { from: points.tsRightEdge, to: points.usTip, - x: points.tsRightEdge.x + sa + 15 + x: points.tsRightEdge.x + sa + 15, }) } diff --git a/packages/breanna/config/index.js b/packages/breanna/config/index.js index 26aba108c3a..d5133162a89 100644 --- a/packages/breanna/config/index.js +++ b/packages/breanna/config/index.js @@ -24,7 +24,7 @@ export default { 'bicepsEase', 'cuffEase', 'shoulderEase', - 'waistEase' + 'waistEase', ], style: [ 'primaryBustDart', @@ -32,7 +32,7 @@ export default { 'secondaryBustDart', 'secondaryBustDartLength', 'primaryBustDartShaping', - 'sleeveLengthBonus' + 'sleeveLengthBonus', ], advanced: [ 'acrossBackFactor', @@ -60,10 +60,10 @@ export default { 'sleevecapQ3Spread1', 'sleevecapQ3Spread2', 'sleevecapQ4Spread1', - 'sleevecapQ4Spread2' - ] - } - ] + 'sleevecapQ4Spread2', + ], + }, + ], }, measurements: [ 'biceps', @@ -80,19 +80,19 @@ export default { 'shoulderToShoulder', 'shoulderToWrist', 'shoulderSlope', - 'wrist' + 'wrist', ], dependencies: { frontBase: 'back', front: ['back', 'frontBase'], sleevecap: ['front', 'frontBase', 'back'], - sleeve: ['sleevecap', 'front', 'frontBase', 'back'] + sleeve: ['sleevecap', 'front', 'frontBase', 'back'], }, inject: { back: 'base', frontBase: 'base', front: 'frontBase', - sleeve: 'sleevecap' + sleeve: 'sleevecap', }, hide: ['frontBase', 'sleevecap'], options: { @@ -125,9 +125,9 @@ export default { '14:00', '15:00', '16:00', - '17:00' + '17:00', ], - dflt: '06:00' + dflt: '06:00', }, secondaryBustDart: { list: [ @@ -146,9 +146,9 @@ export default { '14:00', '15:00', '16:00', - '17:00' + '17:00', ], - dflt: '13:30' + dflt: '13:30', }, // Percentages @@ -191,6 +191,6 @@ export default { sleevecapQ4Spread1: { pct: 7, min: 4, max: 20 }, sleevecapQ4Spread2: { pct: 7, min: 4, max: 20 }, sleeveLengthBonus: { pct: 0, min: -40, max: 10 }, - frontScyeDart: { pct: 25, min: 0, max: 45 } - } + frontScyeDart: { pct: 25, min: 0, max: 45 }, + }, } diff --git a/packages/breanna/src/back.js b/packages/breanna/src/back.js index 5ca813b8f94..b7315f488ad 100644 --- a/packages/breanna/src/back.js +++ b/packages/breanna/src/back.js @@ -12,7 +12,7 @@ export default (part) => { Point, options, utils, - store + store, } = part.shorthand() // Shoulder dart @@ -189,88 +189,88 @@ export default (part) => { macro('vd', { from: points.cbWaist, to: points.cbNeck, - x: -15 - sa + x: -15 - sa, }) if (options.waistDart) { let y = points.waist.y + 15 + sa macro('hd', { from: points.cbWaist, to: points.waistDart1, - y + y, }) macro('hd', { from: points.cbWaist, to: points.waistDartEdge, - y: y + 15 + y: y + 15, }) macro('hd', { from: points.cbWaist, to: points.waistDart2, - y: y + 30 + y: y + 30, }) macro('hd', { from: points.cbWaist, to: points.waist, - y: y + 45 + y: y + 45, }) macro('hd', { from: points.cbWaist, to: points.armhole, - y: y + 60 + y: y + 60, }) macro('vd', { from: points.waistDart2, to: points.waistDartTip, - x: points.waistDart2.x + 15 + x: points.waistDart2.x + 15, }) } else { let y = points.waist.y + 15 + sa macro('hd', { from: points.cbWaist, to: points.waist, - y: points.waist.y + 15 + sa + y: points.waist.y + 15 + sa, }) macro('hd', { from: points.cbWaist, to: points.armhole, - y: y + 30 + y: y + 30, }) } let x = points.armhole.x + 15 + sa macro('vd', { from: points.waist, to: points.armhole, - x + x, }) macro('vd', { from: points.waist, to: points.armholePitch, - x: x + 15 + x: x + 15, }) macro('vd', { from: points.waist, to: points.shoulder, - x: x + 30 + x: x + 30, }) macro('vd', { from: points.waist, to: points.hps, - x: x + 45 + x: x + 45, }) macro('hd', { from: points.cbNeck, to: points.armholePitch, - y: points.armholePitch.y + 25 + y: points.armholePitch.y + 25, }) macro('hd', { from: points.cbNeck, to: points.hps, - y: points.hps.y - sa - 15 + y: points.hps.y - sa - 15, }) macro('hd', { from: points.cbNeck, to: points.shoulder, - y: points.hps.y - sa - 30 + y: points.hps.y - sa - 30, }) } diff --git a/packages/breanna/src/dart-utils.js b/packages/breanna/src/dart-utils.js index e50532dba85..e103e2e6f01 100644 --- a/packages/breanna/src/dart-utils.js +++ b/packages/breanna/src/dart-utils.js @@ -92,7 +92,7 @@ export const getDartPaths = (Path, points) => [ new Path() .line(points.secondaryBustDart1) .line(points.secondaryBustDartTip) - .line(points.secondaryBustDart2) + .line(points.secondaryBustDart2), ] export const getSaDartPaths = (Path, points) => [ @@ -103,7 +103,7 @@ export const getSaDartPaths = (Path, points) => [ new Path() .line(points.secondaryBustDart1) .line(points.secondaryBustDartEdge) - .line(points.secondaryBustDart2) + .line(points.secondaryBustDart2), ] /* diff --git a/packages/breanna/src/front.js b/packages/breanna/src/front.js index 9a474fb70cc..c8c10750f10 100644 --- a/packages/breanna/src/front.js +++ b/packages/breanna/src/front.js @@ -15,7 +15,7 @@ import { getDartInsertionPoint, getDartLocationsAsNumbers, getDartPaths, - getSaDartPaths + getSaDartPaths, } from './dart-utils' export default (part) => { @@ -31,7 +31,7 @@ export default (part) => { paperless, macro, snippets, - Snippet + Snippet, } = part.shorthand() /* @@ -167,83 +167,83 @@ export default (part) => { macro('vd', { from: points.cfWaist, to: points.bustPoint, - x: tl.x - 15 - sa + x: tl.x - 15 - sa, }) macro('vd', { from: points.cfWaist, to: points.cfNeck, - x: tl.x - 30 - sa + x: tl.x - 30 - sa, }) macro('vd', { from: points.cfWaist, to: points.hps, - x: tl.x - 45 - sa + x: tl.x - 45 - sa, }) macro('vd', { from: points.waist, to: points.armhole, - x: br.x + 15 + sa + x: br.x + 15 + sa, }) macro('vd', { from: points.waist, to: points.armholePitch, - x: br.x + 30 + sa + x: br.x + 30 + sa, }) macro('vd', { from: points.waist, to: points.shoulder, - x: br.x + 45 + sa + x: br.x + 45 + sa, }) macro('vd', { from: points.waist, to: points.hps, - x: br.x + 60 + sa + x: br.x + 60 + sa, }) macro('hd', { from: points.cfNeck, to: points.hps, - y: tl.y - 15 - sa + y: tl.y - 15 - sa, }) macro('hd', { from: points.cfNeck, to: points.shoulder, - y: tl.y - 30 - sa + y: tl.y - 30 - sa, }) macro('hd', { from: points.cfNeck, to: points.armhole, - y: tl.y - 30 - sa + y: tl.y - 30 - sa, }) macro('hd', { from: points.cfWaist, to: points.bustPoint, - y: br.y + 15 + sa + y: br.y + 15 + sa, }) macro('hd', { from: points.cfWaist, to: points.waist, - y: br.y + 30 + sa + y: br.y + 30 + sa, }) macro('ld', { from: points.primaryBustDart1, to: points.primaryBustDart2, - d: 15 + d: 15, }) macro('ld', { from: points.primaryBustDart2, to: points.primaryBustDartTip, - d: 15 + d: 15, }) macro('ld', { from: points.primaryBustDart2, to: points.primaryBustDartTip, - d: 15 + d: 15, }) if (loc2 !== 0 && loc1 !== loc2) { macro('ld', { from: points.secondaryBustDart2, to: points.secondaryBustDartTip, - d: 15 + d: 15, }) } } diff --git a/packages/breanna/src/sleeve.js b/packages/breanna/src/sleeve.js index ecc20ecebbe..09864482678 100644 --- a/packages/breanna/src/sleeve.js +++ b/packages/breanna/src/sleeve.js @@ -12,7 +12,7 @@ export default (part) => { snippets, complete, paperless, - macro + macro, } = part.shorthand() // Wrist @@ -88,26 +88,26 @@ export default (part) => { macro('vd', { from: points.wristLeft, to: points.bicepsLeft, - x: points.bicepsLeft.x - sa - 15 + x: points.bicepsLeft.x - sa - 15, }) macro('vd', { from: points.wristLeft, to: points.sleeveTip, - x: points.bicepsLeft.x - sa - 30 + x: points.bicepsLeft.x - sa - 30, }) macro('hd', { from: points.bicepsLeft, to: points.bicepsRight, - y: points.sleeveTip.y - sa - 30 + y: points.sleeveTip.y - sa - 30, }) macro('hd', { from: points.wristLeft, to: points.wristRight, - y: points.wristLeft.y + sa + 30 + y: points.wristLeft.y + sa + 30, }) macro('pd', { path: paths.sleevecap.reverse(), - d: -1 * sa - 15 + d: -1 * sa - 15, }) } return part diff --git a/packages/breanna/src/sleevecap.js b/packages/breanna/src/sleevecap.js index a5f42309f32..21c5a9cdef8 100644 --- a/packages/breanna/src/sleevecap.js +++ b/packages/breanna/src/sleevecap.js @@ -162,7 +162,7 @@ function redrawSleevecapFront(part, delta) { 'capQ2Cp1', 'capQ2', 'capQ2Base', - 'capQ2Cp2' + 'capQ2Cp2', ]) { points[p].x += (points[p].x / factor) * delta * -1 } diff --git a/packages/brian/config/index.js b/packages/brian/config/index.js index c9dddfb2f72..3e3d8c30a7d 100644 --- a/packages/brian/config/index.js +++ b/packages/brian/config/index.js @@ -17,7 +17,7 @@ export default { 'cuffEase', 'shoulderEase', 'lengthBonus', - 'sleeveLengthBonus' + 'sleeveLengthBonus', ], advanced: [ 'acrossBackFactor', @@ -46,10 +46,10 @@ export default { 'sleevecapQ3Spread1', 'sleevecapQ3Spread2', 'sleevecapQ4Spread1', - 'sleevecapQ4Spread2' - ] - } - ] + 'sleevecapQ4Spread2', + ], + }, + ], }, measurements: [ 'biceps', @@ -60,18 +60,18 @@ export default { 'shoulderSlope', 'shoulderToShoulder', 'shoulderToWrist', - 'wrist' + 'wrist', ], dependencies: { back: 'base', front: 'back', sleevecap: 'front', - sleeve: 'sleevecap' + sleeve: 'sleevecap', }, inject: { back: 'base', front: 'back', - sleeve: 'sleevecap' + sleeve: 'sleevecap', }, hide: ['base', 'sleevecap'], options: { @@ -112,6 +112,6 @@ export default { sleevecapQ4Spread1: { pct: 7, min: 4, max: 20 }, sleevecapQ4Spread2: { pct: 7, min: 4, max: 20 }, sleeveWidthGuarantee: { pct: 90, min: 25, max: 100 }, - sleeveLengthBonus: { pct: 0, min: -40, max: 10 } - } + sleeveLengthBonus: { pct: 0, min: -40, max: 10 }, + }, } diff --git a/packages/brian/src/back.js b/packages/brian/src/back.js index e14d3c7d931..8ea5605301a 100644 --- a/packages/brian/src/back.js +++ b/packages/brian/src/back.js @@ -11,7 +11,7 @@ export default (part) => { snippets, complete, paperless, - macro + macro, } = part.shorthand() points.anchor = points.hps.clone() @@ -34,7 +34,7 @@ export default (part) => { macro('cutonfold', { from: points.cbNeck, to: points.cbHips, - grainline: true + grainline: true, }) macro('title', { at: points.title, nr: 2, title: 'back' }) @@ -56,27 +56,27 @@ export default (part) => { macro('hd', { from: points.cbHips, to: points.hips, - y: points.hips.y + sa + 15 + y: points.hips.y + sa + 15, }) macro('vd', { from: points.cbHips, to: points.cbWaist, - x: points.cbHips.x - sa - 15 + x: points.cbHips.x - sa - 15, }) macro('vd', { from: points.cbHips, to: points.cbNeck, - x: points.cbHips.x - sa - 30 + x: points.cbHips.x - sa - 30, }) macro('hd', { from: points.cbNeck, to: points.neck, - y: points.neck.y - sa - 15 + y: points.neck.y - sa - 15, }) macro('hd', { from: points.cbNeck, to: points.shoulder, - y: points.neck.y - sa - 30 + y: points.neck.y - sa - 30, }) } diff --git a/packages/brian/src/base.js b/packages/brian/src/base.js index be37e706a1d..bf4fda36182 100644 --- a/packages/brian/src/base.js +++ b/packages/brian/src/base.js @@ -12,7 +12,7 @@ export default (part) => { Path, paths, utils, - complete + complete, } = part.shorthand() store.set('shoulderEase', (measurements.shoulderToShoulder * options.shoulderEase) / 2) diff --git a/packages/brian/src/front.js b/packages/brian/src/front.js index 18947b0ffe1..cbe54c402e3 100644 --- a/packages/brian/src/front.js +++ b/packages/brian/src/front.js @@ -14,7 +14,7 @@ export default (part) => { measurements, complete, paperless, - macro + macro, } = part.shorthand() // Cut arm a bit deeper at the front @@ -49,7 +49,7 @@ export default (part) => { macro('cutonfold', { from: points.cfNeck, to: points.cfHips, - grainline: true + grainline: true, }) macro('title', { at: points.title, nr: 1, title: 'front' }) snippets.armholePitchNotch = new Snippet('notch', points.armholePitch) @@ -70,27 +70,27 @@ export default (part) => { macro('hd', { from: points.cfHips, to: points.hips, - y: points.hips.y + sa + 15 + y: points.hips.y + sa + 15, }) macro('vd', { from: points.cfHips, to: points.cfWaist, - x: points.cfHips.x - sa - 15 + x: points.cfHips.x - sa - 15, }) macro('vd', { from: points.cfHips, to: points.cfNeck, - x: points.cfHips.x - sa - 30 + x: points.cfHips.x - sa - 30, }) macro('hd', { from: points.cfNeck, to: points.neck, - y: points.neck.y - sa - 15 + y: points.neck.y - sa - 15, }) macro('hd', { from: points.cfNeck, to: points.shoulder, - y: points.neck.y - sa - 30 + y: points.neck.y - sa - 30, }) } diff --git a/packages/brian/src/shared.js b/packages/brian/src/shared.js index 18e7119a5d8..5a096a33fa0 100644 --- a/packages/brian/src/shared.js +++ b/packages/brian/src/shared.js @@ -41,33 +41,33 @@ export function dimensions(macro, points, Path, sa) { .curve(points.armholeCp2, points.armholeHollowCp1, points.armholeHollow) .curve(points.armholeHollowCp2, points.armholePitchCp1, points.armholePitch) .curve(points.armholePitchCp2, points.shoulderCp1, points.shoulder), - d: sa + 15 + d: sa + 15, }) macro('pd', { path: new Path() .move(points.armholePitch) .curve(points.armholePitchCp2, points.shoulderCp1, points.shoulder), - d: -15 + d: -15, }) macro('vd', { from: points.hips, to: points.armhole, - x: points.hips.x + sa + 15 + x: points.hips.x + sa + 15, }) macro('vd', { from: points.hips, to: points.armholePitch, - x: points.hips.x + sa + 30 + x: points.hips.x + sa + 30, }) macro('vd', { from: points.hips, to: points.shoulder, - x: points.hips.x + sa + 45 + x: points.hips.x + sa + 45, }) macro('vd', { from: points.hips, to: points.neck, - x: points.hips.x + sa + 60 + x: points.hips.x + sa + 60, }) macro('ld', { from: points.neck, to: points.shoulder, d: sa + 15 }) } diff --git a/packages/brian/src/sleeve.js b/packages/brian/src/sleeve.js index 1cf3413dd5c..8bf8631aab1 100644 --- a/packages/brian/src/sleeve.js +++ b/packages/brian/src/sleeve.js @@ -12,7 +12,7 @@ export default (part) => { snippets, complete, paperless, - macro + macro, } = part.shorthand() // Wrist @@ -71,26 +71,26 @@ export default (part) => { macro('vd', { from: points.wristLeft, to: points.bicepsLeft, - x: points.bicepsLeft.x - sa - 15 + x: points.bicepsLeft.x - sa - 15, }) macro('vd', { from: points.wristLeft, to: points.sleeveTip, - x: points.bicepsLeft.x - sa - 30 + x: points.bicepsLeft.x - sa - 30, }) macro('hd', { from: points.bicepsLeft, to: points.bicepsRight, - y: points.sleeveTip.y - sa - 30 + y: points.sleeveTip.y - sa - 30, }) macro('hd', { from: points.wristLeft, to: points.wristRight, - y: points.wristLeft.y + sa + 30 + y: points.wristLeft.y + sa + 30, }) macro('pd', { path: paths.sleevecap.reverse(), - d: -1 * sa - 15 + d: -1 * sa - 15, }) } return part diff --git a/packages/bruce/config/index.js b/packages/bruce/config/index.js index 56ff0f49111..47708be2bbd 100644 --- a/packages/bruce/config/index.js +++ b/packages/bruce/config/index.js @@ -11,13 +11,13 @@ export default { tags: ['underwear', 'bottom', 'basics'], optionGroups: { fit: ['bulge', 'stretch', 'legStretch', 'backRise'], - style: ['rise', 'legBonus'] + style: ['rise', 'legBonus'], }, measurements: ['hips', 'upperLeg', 'waistToHips', 'waistToUpperLeg'], dependencies: { side: ['back', 'front'], front: 'inset', - inset: 'back' + inset: 'back', }, options: { // Constants @@ -48,6 +48,6 @@ export default { rise: { pct: 10, min: 0, max: 25 }, stretch: { pct: 15, min: 5, max: 25 }, legStretch: { pct: 40, min: 25, max: 45 }, - backRise: { pct: 5, min: 0, max: 10 } - } + backRise: { pct: 5, min: 0, max: 10 }, + }, } diff --git a/packages/bruce/src/back.js b/packages/bruce/src/back.js index 13e20eaf614..c9a60d33a97 100644 --- a/packages/bruce/src/back.js +++ b/packages/bruce/src/back.js @@ -13,7 +13,7 @@ export default function (part) { complete, paperless, macro, - utils + utils, } = part.shorthand() // Initialize @@ -97,12 +97,12 @@ export default function (part) { macro('title', { at: points.title, nr: 1, - title: 'back' + title: 'back', }) macro('cutonfold', { from: points.center, to: points.gussetTop, - grainline: true + grainline: true, }) snippets.logo = new Snippet('logo', points.title.shift(90, 50)) snippets.backNotch = new Snippet( @@ -116,42 +116,42 @@ export default function (part) { macro('vd', { from: points.gussetTop, to: points.center, - x: points.center.x - 15 + x: points.center.x - 15, }) macro('vd', { from: points.gussetRight, to: points.center, - x: points.center.x - 30 + x: points.center.x - 30, }) macro('vd', { from: points.legRight, to: points.sideRight, - x: points.legRight.x + 15 + sa + x: points.legRight.x + 15 + sa, }) macro('vd', { from: points.legRight, to: points.center, - x: points.legRight.x + 30 + sa + x: points.legRight.x + 30 + sa, }) macro('hd', { from: points.center, to: points.sideRight, - y: points.center.y - 15 - sa + y: points.center.y - 15 - sa, }) macro('hd', { from: points.gussetTop, to: points.gussetRight, - y: points.gussetRight.y + 15 + sa * 2 + y: points.gussetRight.y + 15 + sa * 2, }) macro('hd', { from: points.gussetTop, to: points.legRight, - y: points.gussetRight.y + 30 + sa * 2 + y: points.gussetRight.y + 30 + sa * 2, }) macro('ld', { from: points.gussetRight, to: points.legRight, - d: -15 - sa * 2 + d: -15 - sa * 2, }) } diff --git a/packages/bruce/src/front.js b/packages/bruce/src/front.js index 8531b166e60..01c81bdbd7c 100644 --- a/packages/bruce/src/front.js +++ b/packages/bruce/src/front.js @@ -35,7 +35,7 @@ export default function (part) { paperless, macro, snippets, - Snippet + Snippet, } = part.shorthand() // Initialize @@ -169,11 +169,11 @@ export default function (part) { macro('title', { at: points.midMid, nr: 2, - title: 'front' + title: 'front', }) macro('grainline', { from: points.dartJoin, - to: points.topMid + to: points.topMid, }) snippets.sideNotch = new Snippet('notch', points.midRight) points.curveNotch = new Path() @@ -189,44 +189,44 @@ export default function (part) { macro('hd', { from: points.topLeft, to: points.topRight, - y: points.topLeft.y - 15 - sa + y: points.topLeft.y - 15 - sa, }) macro('hd', { from: points.midLeft, to: points.midRight, - y: points.topLeft.y - 30 - sa + y: points.topLeft.y - 30 - sa, }) macro('vd', { from: points.midLeft, to: points.topMid, - x: points.midLeft.x - 15 - sa + x: points.midLeft.x - 15 - sa, }) macro('vd', { from: points.midLeft, to: points.topLeft, - x: points.midLeft.x - 30 - sa + x: points.midLeft.x - 30 - sa, }) if (options.bulge === 0) { macro('hd', { from: points.leftTuskLeft, to: points.rightTuskRight, - y: points.leftTuskLeft.y + 15 + sa + y: points.leftTuskLeft.y + 15 + sa, }) macro('vd', { from: points.leftTuskLeft, to: points.topLeft, - x: points.midLeft.x - 45 - sa + x: points.midLeft.x - 45 - sa, }) } else { macro('vd', { from: points.leftTuskLeft, to: points.topLeft, - x: points.midLeft.x - 45 - sa + x: points.midLeft.x - 45 - sa, }) macro('vd', { from: points.leftTuskRight, to: points.topLeft, - x: points.midLeft.x - 60 - sa + x: points.midLeft.x - 60 - sa, }) points.narrowRight = new Path() .move(points.midRight) @@ -240,32 +240,32 @@ export default function (part) { macro('hd', { from: points.narrowLeft, to: points.narrowRight, - y: points.narrowLeft.y + y: points.narrowLeft.y, }) macro('hd', { from: points.leftTuskRight, to: points.rightTuskLeft, - y: points.rightTuskLeft.y + 15 + sa + y: points.rightTuskLeft.y + 15 + sa, }) macro('hd', { from: points.leftTuskLeft, to: points.rightTuskRight, - y: points.rightTuskLeft.y + 30 + sa + y: points.rightTuskLeft.y + 30 + sa, }) macro('ld', { from: points.rightTuskLeft, to: points.rightTuskRight, - d: -15 - sa + d: -15 - sa, }) macro('vd', { from: points.narrowRight, to: points.topRight, - x: points.topRight.x + 15 + sa + x: points.topRight.x + 15 + sa, }) macro('vd', { from: points.dartJoin, to: points.topRight, - x: points.topRight.x + 30 + sa + x: points.topRight.x + 30 + sa, }) } } diff --git a/packages/bruce/src/inset.js b/packages/bruce/src/inset.js index c2eb80fb40b..cd62594eec5 100644 --- a/packages/bruce/src/inset.js +++ b/packages/bruce/src/inset.js @@ -12,7 +12,7 @@ export default function (part) { paperless, macro, Snippet, - snippets + snippets, } = part.shorthand() // Initialize @@ -62,11 +62,11 @@ export default function (part) { macro('title', { at: points.title.shift(-90, 15), nr: 4, - title: 'inset' + title: 'inset', }) macro('grainline', { from: points.bottomLeft.shift(0, 15), - to: points.topLeft.shift(0, 15) + to: points.topLeft.shift(0, 15), }) snippets.notch = new Snippet( 'notch', @@ -82,22 +82,22 @@ export default function (part) { macro('vd', { from: points.bottomLeft, to: points.topLeft, - x: points.topLeft.x - 15 - sa + x: points.topLeft.x - 15 - sa, }) macro('vd', { from: points.bottomRight, to: points.tip, - x: points.tip.x + 15 + sa + x: points.tip.x + 15 + sa, }) macro('hd', { from: points.bottomLeft, to: points.bottomRight, - y: points.bottomRight.y + 15 + sa + y: points.bottomRight.y + 15 + sa, }) macro('hd', { from: points.bottomLeft, to: points.tip, - y: points.bottomRight.y + 30 + sa + y: points.bottomRight.y + 30 + sa, }) } diff --git a/packages/bruce/src/side.js b/packages/bruce/src/side.js index 813fcaa540a..94a0c2238b1 100644 --- a/packages/bruce/src/side.js +++ b/packages/bruce/src/side.js @@ -13,7 +13,7 @@ export default function (part) { macro, utils, snippets, - Snippet + Snippet, } = part.shorthand() // Initialize @@ -65,7 +65,7 @@ export default function (part) { macro('title', { at: points.title.shift(90, 30), nr: 3, - title: 'side' + title: 'side', }) macro('scalebox', { at: points.title.shift(-90, 40) }) if (sa) { @@ -77,7 +77,7 @@ export default function (part) { } macro('grainline', { from: new Point(points.bottomRight.x / 2, points.bottomRight.y), - to: new Point(points.bottomRight.x / 2, points.topRight.y) + to: new Point(points.bottomRight.x / 2, points.topRight.y), }) snippets.frontNotch = new Snippet( 'notch', @@ -94,22 +94,22 @@ export default function (part) { macro('vd', { from: points.bottomLeft, to: points.topLeft, - x: points.topLeft.x - 15 - sa + x: points.topLeft.x - 15 - sa, }) macro('vd', { from: points.bottomRight, to: points.topRight, - x: points.topRight.x + 15 + sa + x: points.topRight.x + 15 + sa, }) macro('hd', { from: points.topLeft, to: points.topRight, - y: points.topLeft.y - 15 - sa + y: points.topLeft.y - 15 - sa, }) macro('hd', { from: points.bottomLeft, to: points.bottomRight, - y: points.bottomLeft.y + 15 + sa + y: points.bottomLeft.y + 15 + sa, }) } diff --git a/packages/carlita/config/index.js b/packages/carlita/config/index.js index cdaafb99279..bd7668bc9ab 100644 --- a/packages/carlita/config/index.js +++ b/packages/carlita/config/index.js @@ -20,7 +20,7 @@ export default { 'sleeveBend', 'sleeveLengthBonus', 'waistEase', - 'seatEase' + 'seatEase', ], advanced: [ 'backNeckCutout', @@ -30,7 +30,7 @@ export default { 'shoulderSlopeReduction', 'sleevecapHeight', 'sleevecapEase', - 'contour' + 'contour', ], pockets: [ 'pocketPlacementHorizontal', @@ -46,10 +46,10 @@ export default { 'innerPocketPlacement', 'innerPocketWidth', 'innerPocketDepth', - 'innerPocketWeltHeight' + 'innerPocketWeltHeight', ], style: ['beltWidth', 'buttonSpacingHorizontal', 'cuffLength', 'length'], - collar: ['collarHeight', 'collarSpread', 'collarFlare'] + collar: ['collarHeight', 'collarSpread', 'collarFlare'], }, measurements: [ 'biceps', @@ -70,7 +70,7 @@ export default { // For breasts 'highBust', 'bustSpan', - 'hpsToBust' + 'hpsToBust', ], dependencies: { bentBack: 'bentBase', @@ -95,7 +95,7 @@ export default { innerPocketBag: 'carltonFront', innerPocketTab: 'carltonFront', front: 'carltonFront', - side: 'front' + side: 'front', }, inject: { bentBack: 'bentBase', @@ -109,7 +109,7 @@ export default { collar: 'collarStand', pocketLining: 'pocket', front: 'carltonFront', - side: 'front' + side: 'front', }, hide: [ 'bentBase', @@ -118,7 +118,7 @@ export default { 'bentSleeve', 'bentTopSleeve', 'bentUnderSleeve', - 'carltonFront' + 'carltonFront', ], parts: [ 'back', @@ -136,7 +136,7 @@ export default { 'chestPocketBag', 'innerPocketWelt', 'innerPocketBag', - 'innerPocketTab' + 'innerPocketTab', ], options: { // Constants @@ -193,6 +193,6 @@ export default { collarFlare: { pct: 20, min: 0, max: 40 }, // Carlita-specific options - contour: { pct: 50, min: 25, max: 75 } - } + contour: { pct: 50, min: 25, max: 75 }, + }, } diff --git a/packages/carlita/src/front.js b/packages/carlita/src/front.js index 821c872e928..d8b7eb6ea14 100644 --- a/packages/carlita/src/front.js +++ b/packages/carlita/src/front.js @@ -13,7 +13,7 @@ export default function (part) { macro, Point, paths, - Path + Path, } = part.shorthand() /** @@ -82,7 +82,7 @@ export default function (part) { 'armholeHollow', 'armholeHollowCp2', 'armholePitchCp1', - 'armholePitch' + 'armholePitch', ] // Store these, we'll use them in the side part store.set('side', side) @@ -176,7 +176,7 @@ export default function (part) { 'chestPocketTopLeft', 'chestPocketTopRight', 'chestPocketBottomLeft', - 'chestPocketBottomRight' + 'chestPocketBottomRight', ] for (let i of belowBust) { // Round points depend on options, so add a check @@ -349,7 +349,7 @@ export default function (part) { snippets.button3Right = new Snippet('button', points.button3Right).attr('data-scale', 2) macro('sprinkle', { snippet: 'notch', - on: ['cfNeck', 'rollLineStart', 'bustPoint', 'chestPocketTopLeft', 'chestPocketBottomLeft'] + on: ['cfNeck', 'rollLineStart', 'bustPoint', 'chestPocketTopLeft', 'chestPocketBottomLeft'], }) points.logo = points.cfSeat.shiftFractionTowards(points.cfHem, 0.5) snippets.logo = new Snippet('logo', points.logo) @@ -369,122 +369,122 @@ export default function (part) { macro('ld', { from: points.hemEdge, to: points.flbHem, - d: 15 + d: 15, }) macro('hd', { from: points.hemEdge, to: points.psHem, - y: points.psHem.y + 15 + 3 * sa + y: points.psHem.y + 15 + 3 * sa, }) macro('hd', { from: points.rollLineStart, to: points.pocketTopLeft, - y: points.pocketFlapBottomLeft.y + y: points.pocketFlapBottomLeft.y, }) macro('vd', { from: points.pocketFlapTopLeft, to: points.button3Right, - x: points.bustPoint.x + sa + 15 + x: points.bustPoint.x + sa + 15, }) macro('vd', { from: points.pocketTopLeft, to: points.button3Right, - x: points.bustPoint.x + sa + 30 + x: points.bustPoint.x + sa + 30, }) macro('vd', { from: points.chestPocketBottomLeft, to: points.button3Right, - x: points.bustPoint.x - 15 + x: points.bustPoint.x - 15, }) macro('hd', { from: points.rollLineStart, to: points.chestPocketBottomLeft, - y: points.chestPocketBottomLeft.y + 15 + y: points.chestPocketBottomLeft.y + 15, }) macro('hd', { from: points.rollLineStart, to: points.button3Left, - y: points.button3Left.y + 15 + y: points.button3Left.y + 15, }) macro('hd', { from: points.button3Left, to: points.button3Right, - y: points.button3Left.y + 15 + y: points.button3Left.y + 15, }) macro('vd', { from: points.psHem, to: points.bustPoint, - x: points.bustPoint.x + sa + 45 + x: points.bustPoint.x + sa + 45, }) macro('vd', { from: points.psHem, to: points.armholePitch, - x: points.armholePitch.x + sa + 15 + x: points.armholePitch.x + sa + 15, }) macro('vd', { from: points.armholePitch, to: points.shoulder, - x: points.shoulder.x + sa + 15 + x: points.shoulder.x + sa + 15, }) macro('vd', { from: points.armholePitch, to: points.neck, - x: points.shoulder.x + sa + 30 + x: points.shoulder.x + sa + 30, }) macro('vd', { from: points.rollLineStart, to: points.collarTip, - x: points.rollLineStart.x - sa - 15 + x: points.rollLineStart.x - sa - 15, }) macro('vd', { from: points.button2Left, to: points.rollLineStart, - x: points.rollLineStart.x - sa - 15 + x: points.rollLineStart.x - sa - 15, }) macro('vd', { from: points.button1Left, to: points.button2Left, - x: points.rollLineStart.x - sa - 15 + x: points.rollLineStart.x - sa - 15, }) macro('vd', { from: points.hemEdge, to: points.collarTip, - x: points.rollLineStart.x - sa - 30 + x: points.rollLineStart.x - sa - 30, }) macro('hd', { from: points.lapelStraightEnd, to: points.collarTip, - y: points.collarTip.y - sa - 15 + y: points.collarTip.y - sa - 15, }) macro('hd', { from: points.lapelStraightEnd, to: points.cfNeck, - y: points.collarTip.y - sa - 30 + y: points.collarTip.y - sa - 30, }) macro('hd', { from: points.lapelStraightEnd, to: points.rollLineEnd, - y: points.collarTip.y - sa - 45 + y: points.collarTip.y - sa - 45, }) macro('hd', { from: points.lapelStraightEnd, to: points.neck, - y: points.neck.y - sa - 15 + y: points.neck.y - sa - 15, }) macro('hd', { from: points.lapelStraightEnd, to: points.armholePitch, - y: points.neck.y - sa - 30 + y: points.neck.y - sa - 30, }) macro('hd', { from: points.lapelStraightEnd, to: points.shoulder, - y: points.neck.y - sa - 45 + y: points.neck.y - sa - 45, }) macro('hd', { from: points.lapelStraightEnd, to: points.armhole, - y: points.neck.y - sa - 60 + y: points.neck.y - sa - 60, }) } } diff --git a/packages/carlita/src/index.js b/packages/carlita/src/index.js index 6adde977e78..5e189a4d8a4 100644 --- a/packages/carlita/src/index.js +++ b/packages/carlita/src/index.js @@ -38,7 +38,7 @@ for (let m of [ 'draftChestPocketBag', 'draftInnerPocketWelt', 'draftInnerPocketBag', - 'draftInnerPocketTab' + 'draftInnerPocketTab', ]) { Pattern.prototype[m] = function (part) { return new Carlton(this.settings)[m](part) diff --git a/packages/carlita/src/side.js b/packages/carlita/src/side.js index 2de4419384d..7bf375da1e7 100644 --- a/packages/carlita/src/side.js +++ b/packages/carlita/src/side.js @@ -10,7 +10,7 @@ export default function (part) { macro, Point, paths, - Path + Path, } = part.shorthand() // Give points their original names @@ -39,7 +39,7 @@ export default function (part) { macro('title', { at: points.title, nr: '1b', - title: 'side' + title: 'side', }) points.logo = points.psHem.shiftFractionTowards(points.seat, 0.5) @@ -49,7 +49,7 @@ export default function (part) { points.grainlineTo = new Point(points.grainlineFrom.x, points.armholePitchCp1.y) macro('grainline', { from: points.grainlineFrom, - to: points.grainlineTo + to: points.grainlineTo, }) snippets.bust = new Snippet('notch', points.bustPoint) @@ -66,56 +66,56 @@ export default function (part) { macro('vd', { from: points.psHem, to: points.psWaist, - x: points.psWaist.x - sa - 15 + x: points.psWaist.x - sa - 15, }) macro('vd', { from: points.psHem, to: points.bustPoint, - x: points.bustPoint.x - sa - 15 + x: points.bustPoint.x - sa - 15, }) macro('vd', { from: points.hem, to: points.seat, - x: points.hem.x + sa + 15 + x: points.hem.x + sa + 15, }) macro('vd', { from: points.hem, to: points.waist, - x: points.hem.x + sa + 30 + x: points.hem.x + sa + 30, }) macro('vd', { from: points.hem, to: points.armhole, - x: points.hem.x + sa + 45 + x: points.hem.x + sa + 45, }) macro('vd', { from: points.hem, to: points.armholePitch, - x: points.hem.x + sa + 60 + x: points.hem.x + sa + 60, }) macro('hd', { from: points.psWaist, - to: points.waist + to: points.waist, }) macro('hd', { from: points.bustPoint, to: points.waist, - y: points.bustPoint.y + y: points.bustPoint.y, }) macro('hd', { from: points.bustPoint, to: points.armholePitch, - y: points.armholePitch.y - sa - 15 + y: points.armholePitch.y - sa - 15, }) macro('hd', { from: points.bustPoint, to: points.armhole, - y: points.armholePitch.y - sa - 30 + y: points.armholePitch.y - sa - 30, }) macro('hd', { from: points.psHem, to: points.hem, - y: points.hem.y + 3 * sa + 15 + y: points.hem.y + 3 * sa + 15, }) } } diff --git a/packages/carlton/config/index.js b/packages/carlton/config/index.js index d38bb36db1b..3eb97c722db 100644 --- a/packages/carlton/config/index.js +++ b/packages/carlton/config/index.js @@ -20,7 +20,7 @@ export default { 'sleeveBend', 'sleeveLengthBonus', 'waistEase', - 'seatEase' + 'seatEase', ], advanced: [ 'backNeckCutout', @@ -29,7 +29,7 @@ export default { 'lapelReduction', 'shoulderSlopeReduction', 'sleevecapHeight', - 'sleevecapEase' + 'sleevecapEase', ], pockets: [ 'pocketPlacementHorizontal', @@ -45,10 +45,10 @@ export default { 'innerPocketPlacement', 'innerPocketWidth', 'innerPocketDepth', - 'innerPocketWeltHeight' + 'innerPocketWeltHeight', ], style: ['beltWidth', 'buttonSpacingHorizontal', 'cuffLength', 'length'], - collar: ['collarHeight', 'collarSpread', 'collarFlare'] + collar: ['collarHeight', 'collarSpread', 'collarFlare'], }, measurements: [ 'biceps', @@ -65,7 +65,7 @@ export default { 'wrist', 'waistToFloor', 'waistToSeat', - 'seat' + 'seat', ], dependencies: { bentBack: 'bentBase', @@ -88,7 +88,7 @@ export default { chestPocketBag: 'front', innerPocketWelt: 'front', innerPocketBag: 'front', - innerPocketTab: 'front' + innerPocketTab: 'front', }, inject: { bentBack: 'bentBase', @@ -100,7 +100,7 @@ export default { topSleeve: 'bentTopSleeve', underSleeve: 'bentUnderSleeve', collar: 'collarStand', - pocketLining: 'pocket' + pocketLining: 'pocket', }, hide: ['bentBase', 'bentBack', 'bentFront', 'bentSleeve', 'bentTopSleeve', 'bentUnderSleeve'], options: { @@ -155,6 +155,6 @@ export default { cuffLength: { pct: 15, min: 10, max: 20 }, collarHeight: { pct: 9.6, min: 8, max: 11 }, collarSpread: { deg: 4, min: 2, max: 6 }, - collarFlare: { pct: 20, min: 0, max: 40 } - } + collarFlare: { pct: 20, min: 0, max: 40 }, + }, } diff --git a/packages/carlton/src/back.js b/packages/carlton/src/back.js index e6acef5b10d..2697bfb1068 100644 --- a/packages/carlton/src/back.js +++ b/packages/carlton/src/back.js @@ -14,7 +14,7 @@ export default function (part) { macro, Point, paths, - Path + Path, } = part.shorthand() calculateRatios(part) @@ -96,12 +96,12 @@ export default function (part) { if (complete) { macro('sprinkle', { snippet: 'bnotch', - on: ['shoulder', 'bpTriangleTip'] + on: ['shoulder', 'bpTriangleTip'], }) macro('grainline', { from: points.cbWaist, - to: points.bpStart + to: points.bpStart, }) points.logo = new Point(points.armhole.x * 0.7, points.dartTip.y) @@ -122,102 +122,102 @@ export default function (part) { macro('hd', { from: points.bpBottom, to: points.cbWaist, - y: points.cbWaist.y + 15 + sa + y: points.cbWaist.y + 15 + sa, }) macro('hd', { from: points.cbWaist, to: points.dartLeft, - y: points.cbWaist.y + 15 + sa + y: points.cbWaist.y + 15 + sa, }) macro('hd', { from: points.dartLeft, to: points.dartRight, - y: points.cbWaist.y + 15 + sa + y: points.cbWaist.y + 15 + sa, }) macro('hd', { from: points.dartRight, to: points.waist, - y: points.cbWaist.y + 15 + sa + y: points.cbWaist.y + 15 + sa, }) macro('hd', { from: points.cbWaist, to: points.waist, - y: points.cbWaist.y + 30 + sa + y: points.cbWaist.y + 30 + sa, }) macro('hd', { from: points.bpBottom, to: points.waist, - y: points.cbWaist.y + 45 + sa + y: points.cbWaist.y + 45 + sa, }) macro('vd', { from: points.waist, to: points.armhole, - x: points.armhole.x + 15 + sa + x: points.armhole.x + 15 + sa, }) macro('vd', { from: points.armhole, to: points.armholePitch, - x: points.armhole.x + 15 + sa + x: points.armhole.x + 15 + sa, }) macro('vd', { from: points.armhole, to: points.shoulder, - x: points.armhole.x + 30 + sa + x: points.armhole.x + 30 + sa, }) macro('vd', { from: points.waist, to: points.shoulder, - x: points.armhole.x + 45 + sa + x: points.armhole.x + 45 + sa, }) macro('vd', { from: points.dartRight, to: points.dartTip, - x: points.dartRight.x + 15 + x: points.dartRight.x + 15, }) macro('vd', { from: points.bpBottom, to: points.bpTop, - x: points.bpTop.x - 15 - sa + x: points.bpTop.x - 15 - sa, }) macro('vd', { from: points.bpTop, to: points.cbNeck, - x: points.bpTop.x - 15 - sa + x: points.bpTop.x - 15 - sa, }) macro('vd', { from: points.bpBottom, to: points.neck, - x: points.bpTop.x - 30 - sa + x: points.bpTop.x - 30 - sa, }) macro('vd', { from: points.bpStart, to: points.bpTriangleTip, - x: points.bpTriangleEdge.x + 15 + x: points.bpTriangleEdge.x + 15, }) macro('hd', { from: points.bpStart, to: points.bpTriangleEdge, - y: points.bpTriangleEdge.y + 15 + y: points.bpTriangleEdge.y + 15, }) macro('hd', { from: points.cbNeck, to: points.neck, - y: points.neck.y - 15 - sa + y: points.neck.y - 15 - sa, }) macro('hd', { from: points.cbNeck, to: points.armholePitch, - y: points.neck.y - 30 - sa + y: points.neck.y - 30 - sa, }) macro('hd', { from: points.cbNeck, to: points.shoulder, - y: points.neck.y - 45 - sa + y: points.neck.y - 45 - sa, }) macro('hd', { from: points.cbNeck, to: points.armhole, - y: points.neck.y - 60 - sa + y: points.neck.y - 60 - sa, }) } } diff --git a/packages/carlton/src/belt.js b/packages/carlton/src/belt.js index b6f72f1b119..bf749a87618 100644 --- a/packages/carlton/src/belt.js +++ b/packages/carlton/src/belt.js @@ -10,7 +10,7 @@ export default function (part) { macro, Point, paths, - Path + Path, } = part.shorthand() let length = 1.6 * (store.get('cbToDart') + store.get('dartToSide')) @@ -27,7 +27,7 @@ export default function (part) { via: points.topLeft, prefix: 'roundTop', radius: width / 4, - render: true + render: true, }) macro('round', { from: points.topLeft, @@ -35,7 +35,7 @@ export default function (part) { via: points.bottomLeft, prefix: 'roundBottom', radius: width / 4, - render: true + render: true, }) // Paths @@ -56,7 +56,7 @@ export default function (part) { macro('title', { at: points.title, nr: 6, - title: 'belt' + title: 'belt', }) points.logo = new Point(points.bottomRight.x * 0.75, points.bottomRight.y * 0.65) snippets.logo = new Snippet('logo', points.logo) @@ -71,22 +71,22 @@ export default function (part) { macro('hd', { from: points.roundBottomStart, to: points.roundBottomEnd, - y: points.roundBottomEnd.y + sa + 15 + y: points.roundBottomEnd.y + sa + 15, }) macro('hd', { from: points.roundBottomStart, to: points.button, - y: points.roundBottomEnd.y + sa + 30 + y: points.roundBottomEnd.y + sa + 30, }) macro('hd', { from: points.roundBottomStart, to: points.bottomRight, - y: points.roundBottomEnd.y + sa + 45 + y: points.roundBottomEnd.y + sa + 45, }) macro('vd', { from: points.bottomRight, to: points.topRight, - x: points.topRight.x + sa + 15 + x: points.topRight.x + sa + 15, }) } } diff --git a/packages/carlton/src/chestpocketbag.js b/packages/carlton/src/chestpocketbag.js index b38fa2c7af1..5b3a6660100 100644 --- a/packages/carlton/src/chestpocketbag.js +++ b/packages/carlton/src/chestpocketbag.js @@ -9,7 +9,7 @@ export default function (part) { macro, Point, paths, - Path + Path, } = part.shorthand() points.topLeft = new Point(0, 0) @@ -47,12 +47,12 @@ export default function (part) { macro('title', { at: points.title, nr: 17, - title: 'chestPocketBag' + title: 'chestPocketBag', }) macro('grainline', { from: points.bottomLeft.shift(0, 10), - to: points.topLeft.shift(0, 10) + to: points.topLeft.shift(0, 10), }) if (sa) { @@ -61,14 +61,14 @@ export default function (part) { macro('ld', { from: points.bottomRight.shift(180, 15), to: points.topRight.shift(180, 15), - text: units(store.get('chestPocketBagDepth') * 2) + text: units(store.get('chestPocketBagDepth') * 2), }) if (paperless) { macro('hd', { from: points.bottomLeft, to: points.bottomRight, - y: points.bottomLeft.y + sa + 15 + y: points.bottomLeft.y + sa + 15, }) } } diff --git a/packages/carlton/src/chestpocketwelt.js b/packages/carlton/src/chestpocketwelt.js index f377373c848..8530705de44 100644 --- a/packages/carlton/src/chestpocketwelt.js +++ b/packages/carlton/src/chestpocketwelt.js @@ -24,7 +24,7 @@ export default function (part) { macro('title', { at: points.title, nr: 12, - title: 'chestPocketWelt' + title: 'chestPocketWelt', }) if (sa) paths.sa = paths.seam.offset(sa).attr('class', 'fabric sa') @@ -33,12 +33,12 @@ export default function (part) { macro('hd', { from: points.bottomLeft, to: points.bottomRight, - y: points.bottomLeft.y + sa + 15 + y: points.bottomLeft.y + sa + 15, }) macro('vd', { from: points.bottomRight, to: points.topRight, - x: points.topRight.x + sa + 15 + x: points.topRight.x + sa + 15, }) } } diff --git a/packages/carlton/src/collar.js b/packages/carlton/src/collar.js index 08f2e62cccd..90819b728e9 100644 --- a/packages/carlton/src/collar.js +++ b/packages/carlton/src/collar.js @@ -37,20 +37,20 @@ export default function (part) { let rotate = { 1: { pivot: 'cutBottom1', - points: ['cutBottom2', 'cutTop1', 'cutTop2', 'q2Cp1', 'q2Cp2'] + points: ['cutBottom2', 'cutTop1', 'cutTop2', 'q2Cp1', 'q2Cp2'], }, 2: { pivot: 'cutBottom2', - points: ['cutBottom3', 'cutTop2', 'cutTop3', 'q3Cp1', 'q3Cp2'] + points: ['cutBottom3', 'cutTop2', 'cutTop3', 'q3Cp1', 'q3Cp2'], }, 3: { pivot: 'cutBottom3', - points: ['standTip', 'bottomRight', 'cutTop4', 'cutTop3', 'q4Cp1'] + points: ['standTip', 'bottomRight', 'cutTop4', 'cutTop3', 'q4Cp1'], }, 4: { pivot: 'standTip', - points: ['topRight', 'bottomRight', 'cutTop4'] - } + points: ['topRight', 'bottomRight', 'cutTop4'], + }, } let angle = -1 * options.collarSpread @@ -77,7 +77,7 @@ export default function (part) { 'rot2cutTop3', 'rot2cutBottom3', 'rot2q3Cp1', - 'rot2q3Cp2' + 'rot2q3Cp2', ]) points[i] = points[i].shift(angle, distance) @@ -172,7 +172,7 @@ export default function (part) { macro('title', { at: points.title, nr: 8, - title: 'collar' + title: 'collar', }) // Remove grainline from collarstand part @@ -180,7 +180,7 @@ export default function (part) { macro('cutonfold', { from: points.topLeft, to: points.standTop, - grainline: true + grainline: true, }) if (sa) { @@ -196,47 +196,47 @@ export default function (part) { macro('hd', { from: points.standTop, to: points.rot3standTip, - y: points.rot4bottomRight.y + sa + 15 + y: points.rot4bottomRight.y + sa + 15, }) macro('hd', { from: points.standTop, to: points.rot4bottomRight, - y: points.rot4bottomRight.y + sa + 30 + y: points.rot4bottomRight.y + sa + 30, }) macro('hd', { from: points.standTop, to: points.rot4topRight, - y: points.rot4bottomRight.y + sa + 45 + y: points.rot4bottomRight.y + sa + 45, }) macro('vd', { from: points.standTop, to: points.topLeft, - x: points.topLeft.x - 15 + x: points.topLeft.x - 15, }) macro('vd', { from: points.rot3standTip, to: points.topLeft, - x: points.topLeft.x - 30 + x: points.topLeft.x - 30, }) macro('vd', { from: points.rot4topRight, to: points.topLeft, - x: points.rot4topRight.x + sa + 15 + x: points.rot4topRight.x + sa + 15, }) macro('vd', { from: points.rot4bottomRight, to: points.topLeft, - x: points.rot4topRight.x + sa + 30 + x: points.rot4topRight.x + sa + 30, }) macro('ld', { from: points.rot4bottomRight, to: points.rot4topRight, - d: -1 * sa - 15 + d: -1 * sa - 15, }) macro('ld', { from: points.rot3standTip, to: points.rot4bottomRight, - d: -1 * sa - 15 + d: -1 * sa - 15, }) } } diff --git a/packages/carlton/src/collarstand.js b/packages/carlton/src/collarstand.js index 66cd82c0484..326cc128c59 100644 --- a/packages/carlton/src/collarstand.js +++ b/packages/carlton/src/collarstand.js @@ -10,7 +10,7 @@ export default function (part) { macro, Point, paths, - Path + Path, } = part.shorthand() let height = measurements.chest * options.collarHeight @@ -48,12 +48,12 @@ export default function (part) { macro('title', { at: points.title, nr: 7, - title: 'collarStand' + title: 'collarStand', }) macro('grainline', { from: points.bottomLeft, - to: points.standTop + to: points.standTop, }) if (sa) paths.sa = paths.seam.offset(sa).attr('class', 'fabric sa') @@ -62,17 +62,17 @@ export default function (part) { macro('hd', { from: points.standTipLeft, to: points.standTip, - y: points.standTip.y + sa + 15 + y: points.standTip.y + sa + 15, }) macro('vd', { from: points.bottomLeft, to: points.standTop, - x: points.standTip.x + sa + 15 + x: points.standTip.x + sa + 15, }) macro('vd', { from: points.standTip, to: points.standTop, - x: points.standTip.x + sa + 30 + x: points.standTip.x + sa + 30, }) } } diff --git a/packages/carlton/src/cufffacing.js b/packages/carlton/src/cufffacing.js index 3a8762690c7..d77256729ae 100644 --- a/packages/carlton/src/cufffacing.js +++ b/packages/carlton/src/cufffacing.js @@ -13,14 +13,14 @@ export default function (part) { to: points.bottomRight, via: points.bottomLeft, radius: store.get('cuffRadius'), - prefix: 'roundLeft' + prefix: 'roundLeft', }) macro('round', { from: points.bottomLeft, to: points.topRight, via: points.bottomRight, radius: store.get('cuffRadius'), - prefix: 'roundRight' + prefix: 'roundRight', }) paths.seam = new Path() @@ -39,12 +39,12 @@ export default function (part) { macro('title', { at: points.title, nr: 9, - title: 'cuffFacing' + title: 'cuffFacing', }) macro('grainline', { from: points.bottomLeft.shift(0, 10 + store.get('cuffRadius')), - to: points.topLeft.shift(0, 10 + store.get('cuffRadius')) + to: points.topLeft.shift(0, 10 + store.get('cuffRadius')), }) if (sa) paths.sa = paths.seam.offset(sa).attr('class', 'fabric sa') @@ -53,22 +53,22 @@ export default function (part) { macro('vd', { from: points.roundRightStart, to: points.roundRightEnd, - x: points.topRight.x + sa + 15 + x: points.topRight.x + sa + 15, }) macro('vd', { from: points.roundRightStart, to: points.topRight, - x: points.topRight.x + sa + 30 + x: points.topRight.x + sa + 30, }) macro('hd', { from: points.roundRightStart, to: points.roundRightEnd, - y: points.bottomRight.y + sa + 15 + y: points.bottomRight.y + sa + 15, }) macro('hd', { from: points.roundLeftStart, to: points.roundRightEnd, - y: points.bottomRight.y + sa + 30 + y: points.bottomRight.y + sa + 30, }) } } diff --git a/packages/carlton/src/front.js b/packages/carlton/src/front.js index ee1ea71ede2..765c4e94c02 100644 --- a/packages/carlton/src/front.js +++ b/packages/carlton/src/front.js @@ -15,7 +15,7 @@ export default function (part) { macro, Point, paths, - Path + Path, } = part.shorthand() calculateRatios(part) @@ -75,14 +75,14 @@ export default function (part) { to: points.pocketBottomRight, via: points.pocketBottomLeft, prefix: 'pocketRoundLeft', - radius + radius, }) macro('round', { from: points.pocketBottomLeft, to: points.pocketTopRight, via: points.pocketBottomRight, prefix: 'pocketRoundRight', - radius + radius, }) store.set('pocketRadius', radius) } @@ -110,14 +110,14 @@ export default function (part) { to: points.pocketFlapBottomRight, via: points.pocketFlapBottomLeft, prefix: 'pocketFlapRoundLeft', - radius + radius, }) macro('round', { from: points.pocketFlapBottomLeft, to: points.pocketFlapTopRight, via: points.pocketFlapBottomRight, prefix: 'pocketFlapRoundRight', - radius + radius, }) store.set('pocketFlapRadius', radius) } @@ -139,7 +139,7 @@ export default function (part) { 'chestPocketTopLeft', 'chestPocketBottomLeft', 'chestPocketTopRight', - 'chestPocketBottomRight' + 'chestPocketBottomRight', ]) points[i] = points[i].rotate(options.chestPocketAngle, points.chestPocketAnchor) store.set('chestPocketBagDepth', points.button3Left.dx(points.chestPocketBottomLeft)) @@ -306,7 +306,7 @@ export default function (part) { macro('sprinkle', { snippet: 'notch', - on: ['shoulder', 'cfNeck', 'rollLineStart', 'waist', 'seat'] + on: ['shoulder', 'cfNeck', 'rollLineStart', 'waist', 'seat'], }) points.logo = new Point(points.chestPocketTopRight.x, points.armhole.y) @@ -314,7 +314,7 @@ export default function (part) { macro('grainline', { from: points.cfHem, - to: points.cfNeck + to: points.cfNeck, }) if (sa) { @@ -329,142 +329,142 @@ export default function (part) { macro('ld', { from: points.hemEdge, to: points.flbHem, - d: 15 + d: 15, }) macro('ld', { from: points.flbHem, to: points.hem, - d: 15 + d: 15, }) macro('hd', { from: points.hemEdge, to: points.hem, - y: points.hem.y + 15 + 3 * sa + y: points.hem.y + 15 + 3 * sa, }) macro('hd', { from: points.rollLineStart, to: points.pocketTopLeft, - y: points.pocketFlapBottomLeft.y + y: points.pocketFlapBottomLeft.y, }) macro('vd', { from: points.pocketFlapTopRight, to: points.waist, - x: points.pocketTopRight.x - 15 + x: points.pocketTopRight.x - 15, }) macro('vd', { from: points.pocketTopRight, to: points.waist, - x: points.pocketTopRight.x - 30 + x: points.pocketTopRight.x - 30, }) macro('vd', { from: points.chestPocketBottomLeft, to: points.waist, - x: points.chestPocketBottomLeft.x - 15 + x: points.chestPocketBottomLeft.x - 15, }) macro('hd', { from: points.rollLineStart, to: points.chestPocketBottomLeft, - y: points.chestPocketBottomLeft.y + 15 + y: points.chestPocketBottomLeft.y + 15, }) macro('hd', { from: points.rollLineStart, to: points.button3Left, - y: points.button3Left.y + 15 + y: points.button3Left.y + 15, }) macro('hd', { from: points.button3Left, to: points.button3Right, - y: points.button3Left.y + 15 + y: points.button3Left.y + 15, }) macro('vd', { from: points.hem, to: points.seat, - x: points.hem.x + sa + 15 + x: points.hem.x + sa + 15, }) macro('vd', { from: points.hem, to: points.waist, - x: points.hem.x + sa + 30 + x: points.hem.x + sa + 30, }) macro('vd', { from: points.hem, to: points.armhole, - x: points.hem.x + sa + 45 + x: points.hem.x + sa + 45, }) macro('vd', { from: points.armhole, to: points.armholePitch, - x: points.armhole.x + sa + 15 + x: points.armhole.x + sa + 15, }) macro('vd', { from: points.armhole, to: points.shoulder, - x: points.armhole.x + sa + 30 + x: points.armhole.x + sa + 30, }) macro('vd', { from: points.armhole, to: points.neck, - x: points.armhole.x + sa + 45 + x: points.armhole.x + sa + 45, }) macro('vd', { from: points.rollLineStart, to: points.collarTip, - x: points.rollLineStart.x - sa - 15 + x: points.rollLineStart.x - sa - 15, }) macro('vd', { from: points.button2Left, to: points.rollLineStart, - x: points.rollLineStart.x - sa - 15 + x: points.rollLineStart.x - sa - 15, }) macro('vd', { from: points.button1Left, to: points.button2Left, - x: points.rollLineStart.x - sa - 15 + x: points.rollLineStart.x - sa - 15, }) macro('vd', { from: points.hemEdge, to: points.collarTip, - x: points.rollLineStart.x - sa - 30 + x: points.rollLineStart.x - sa - 30, }) macro('vd', { from: points.hemEdge, to: points.neck, - x: points.rollLineStart.x - sa - 45 + x: points.rollLineStart.x - sa - 45, }) macro('hd', { from: points.lapelStraightEnd, to: points.collarTip, - y: points.collarTip.y - sa - 15 + y: points.collarTip.y - sa - 15, }) macro('hd', { from: points.lapelStraightEnd, to: points.cfNeck, - y: points.collarTip.y - sa - 30 + y: points.collarTip.y - sa - 30, }) macro('hd', { from: points.lapelStraightEnd, to: points.rollLineEnd, - y: points.collarTip.y - sa - 45 + y: points.collarTip.y - sa - 45, }) macro('hd', { from: points.lapelStraightEnd, to: points.neck, - y: points.neck.y - sa - 15 + y: points.neck.y - sa - 15, }) macro('hd', { from: points.lapelStraightEnd, to: points.armholePitch, - y: points.neck.y - sa - 30 + y: points.neck.y - sa - 30, }) macro('hd', { from: points.lapelStraightEnd, to: points.shoulder, - y: points.neck.y - sa - 45 + y: points.neck.y - sa - 45, }) macro('hd', { from: points.lapelStraightEnd, to: points.armhole, - y: points.neck.y - sa - 60 + y: points.neck.y - sa - 60, }) } } diff --git a/packages/carlton/src/innerpocketbag.js b/packages/carlton/src/innerpocketbag.js index 8c4d1c53831..aacfa3ceec5 100644 --- a/packages/carlton/src/innerpocketbag.js +++ b/packages/carlton/src/innerpocketbag.js @@ -10,7 +10,7 @@ export default function (part) { macro, Point, paths, - Path + Path, } = part.shorthand() points.topLeft = new Point(0, 0) @@ -48,12 +48,12 @@ export default function (part) { macro('title', { at: points.title, nr: 14, - title: 'innerPocketBag' + title: 'innerPocketBag', }) macro('grainline', { from: points.bottomLeft.shift(0, 10), - to: points.topLeft.shift(0, 10) + to: points.topLeft.shift(0, 10), }) if (sa) { @@ -62,14 +62,14 @@ export default function (part) { macro('ld', { from: points.bottomRight.shift(180, 15), to: points.topRight.shift(180, 15), - text: units(store.get('innerPocketWidth') * options.innerPocketDepth * 2) + text: units(store.get('innerPocketWidth') * options.innerPocketDepth * 2), }) if (paperless) { macro('hd', { from: points.bottomLeft, to: points.bottomRight, - y: points.bottomLeft.y + sa + 15 + y: points.bottomLeft.y + sa + 15, }) } } diff --git a/packages/carlton/src/innerpockettab.js b/packages/carlton/src/innerpockettab.js index 4a34e48066f..b2e8c16cd54 100644 --- a/packages/carlton/src/innerpockettab.js +++ b/packages/carlton/src/innerpockettab.js @@ -24,12 +24,12 @@ export default function (part) { macro('title', { at: points.title, nr: 15, - title: 'innerPocketTab' + title: 'innerPocketTab', }) macro('grainline', { from: points.top, - to: points.top.shift(-45, points.top.x * 0.7) + to: points.top.shift(-45, points.top.x * 0.7), }) if (sa) paths.sa = paths.seam.offset(sa).attr('class', 'lining sa') @@ -38,17 +38,17 @@ export default function (part) { macro('hd', { from: points.topLeft, to: points.top, - y: points.topLeft.y - sa - 15 + y: points.topLeft.y - sa - 15, }) macro('hd', { from: points.topLeft, to: points.topRight, - y: points.topLeft.y - sa - 30 + y: points.topLeft.y - sa - 30, }) macro('vd', { from: points.bottom, to: points.topRight, - x: points.topRight.x + sa + 15 + x: points.topRight.x + sa + 15, }) } } diff --git a/packages/carlton/src/innerpocketwelt.js b/packages/carlton/src/innerpocketwelt.js index c1d713ab6c7..858796fad3a 100644 --- a/packages/carlton/src/innerpocketwelt.js +++ b/packages/carlton/src/innerpocketwelt.js @@ -43,12 +43,12 @@ export default function (part) { macro('title', { at: points.title, nr: 13, - title: 'innerPocketWelt' + title: 'innerPocketWelt', }) macro('grainline', { from: points.bottomLeft.shift(0, 10), - to: points.topLeft.shift(0, 10) + to: points.topLeft.shift(0, 10), }) if (sa) paths.sa = paths.seam.offset(sa).attr('class', 'fabric sa') @@ -57,22 +57,22 @@ export default function (part) { macro('vd', { from: points.realBottomRight, to: points.realTopRight, - x: points.topRight.x + sa + 15 + x: points.topRight.x + sa + 15, }) macro('vd', { from: points.bottomRight, to: points.topRight, - x: points.topRight.x + sa + 30 + x: points.topRight.x + sa + 30, }) macro('hd', { from: points.realBottomLeft, to: points.realBottomRight, - y: points.bottomLeft.y + sa + 15 + y: points.bottomLeft.y + sa + 15, }) macro('hd', { from: points.bottomLeft, to: points.bottomRight, - y: points.bottomLeft.y + sa + 30 + y: points.bottomLeft.y + sa + 30, }) } } diff --git a/packages/carlton/src/pocket.js b/packages/carlton/src/pocket.js index 3da12f5b43a..9baa8b71170 100644 --- a/packages/carlton/src/pocket.js +++ b/packages/carlton/src/pocket.js @@ -9,7 +9,7 @@ export default function (part) { macro, Point, paths, - Path + Path, } = part.shorthand() points.topLeft = new Point(0, 0) @@ -24,14 +24,14 @@ export default function (part) { to: points.bottomRight, via: points.bottomLeft, radius: store.get('pocketRadius'), - prefix: 'roundLeft' + prefix: 'roundLeft', }) macro('round', { from: points.bottomLeft, to: points.topRight, via: points.bottomRight, radius: store.get('pocketRadius'), - prefix: 'roundRight' + prefix: 'roundRight', }) paths.seam = new Path() @@ -57,12 +57,12 @@ export default function (part) { macro('title', { at: points.title, nr: 10, - title: 'pocket' + title: 'pocket', }) macro('grainline', { from: points.bottomLeft.shift(0, 10 + (store.get('pocketRadius') || 0)), - to: points.edgeLeft.shift(0, 10 + (store.get('pocketRadius') || 0)) + to: points.edgeLeft.shift(0, 10 + (store.get('pocketRadius') || 0)), }) if (sa) paths.sa = paths.seam.offset(sa).attr('class', 'fabric sa') @@ -71,23 +71,23 @@ export default function (part) { macro('vd', { from: points.bottomRight, to: points.topRight, - x: points.topRight.x + sa + 15 + x: points.topRight.x + sa + 15, }) macro('vd', { from: points.bottomRight, to: points.edgeRight, - x: points.topRight.x + sa + 30 + x: points.topRight.x + sa + 30, }) macro('hd', { from: points.edgeLeft, to: points.edgeRight, - y: points.edgeRight.y - sa - 15 + y: points.edgeRight.y - sa - 15, }) if (options.pocketRadius > 0) { macro('hd', { from: points.roundRightStart, to: points.roundRightEnd, - y: points.bottomRight.y + sa + 15 + y: points.bottomRight.y + sa + 15, }) } } diff --git a/packages/carlton/src/pocketflap.js b/packages/carlton/src/pocketflap.js index 8962fc4c787..406af8cdf8e 100644 --- a/packages/carlton/src/pocketflap.js +++ b/packages/carlton/src/pocketflap.js @@ -9,7 +9,7 @@ export default function (part) { macro, Point, paths, - Path + Path, } = part.shorthand() points.topLeft = new Point(0, 0) @@ -22,14 +22,14 @@ export default function (part) { to: points.bottomRight, via: points.bottomLeft, radius: store.get('pocketFlapRadius'), - prefix: 'roundLeft' + prefix: 'roundLeft', }) macro('round', { from: points.bottomLeft, to: points.topRight, via: points.bottomRight, radius: store.get('pocketFlapRadius'), - prefix: 'roundRight' + prefix: 'roundRight', }) paths.seam = new Path() @@ -49,12 +49,12 @@ export default function (part) { macro('title', { at: points.title, nr: 11, - title: 'pocketFlap' + title: 'pocketFlap', }) macro('grainline', { from: points.bottomLeft.shift(0, points.topRight.x / 5), - to: points.topLeft.shift(0, points.topRight.x / 5) + to: points.topLeft.shift(0, points.topRight.x / 5), }) if (sa) { @@ -65,24 +65,24 @@ export default function (part) { macro('hd', { from: points.topLeft, to: points.topRight, - y: points.topLeft.y - sa - 15 + y: points.topLeft.y - sa - 15, }) if (options.pocketFlapRadius > 0) { macro('vd', { from: points.roundRightStart, to: points.roundRightEnd, - x: points.topRight.x + sa + 15 + x: points.topRight.x + sa + 15, }) macro('vd', { from: points.roundRightStart, to: points.topRight, - x: points.topRight.x + sa + 30 + x: points.topRight.x + sa + 30, }) } else { macro('vd', { from: points.bottomRight, to: points.topRight, - x: points.topRight.x + sa + 15 + x: points.topRight.x + sa + 15, }) } } diff --git a/packages/carlton/src/pocketlining.js b/packages/carlton/src/pocketlining.js index 8dede4f0996..f531506e04e 100644 --- a/packages/carlton/src/pocketlining.js +++ b/packages/carlton/src/pocketlining.js @@ -9,7 +9,7 @@ export default function (part) { macro, Point, paths, - Path + Path, } = part.shorthand() points.topLeft = points.bottomLeft.shiftFractionTowards(points.topLeft, 0.75) @@ -20,14 +20,14 @@ export default function (part) { to: points.bottomRight, via: points.bottomLeft, radius: store.get('pocketRadius'), - prefix: 'roundLeft' + prefix: 'roundLeft', }) macro('round', { from: points.bottomLeft, to: points.topRight, via: points.bottomRight, radius: store.get('pocketRadius'), - prefix: 'roundRight' + prefix: 'roundRight', }) paths.seam = new Path() @@ -49,12 +49,12 @@ export default function (part) { macro('title', { at: points.title, nr: 16, - title: 'pocketLining' + title: 'pocketLining', }) macro('grainline', { from: points.bottomLeft.shift(0, 10 + (store.get('pocketRadius') || 0)), - to: points.topLeft.shift(0, 10 + (store.get('pocketRadius') || 0)) + to: points.topLeft.shift(0, 10 + (store.get('pocketRadius') || 0)), }) if (sa) paths.sa = paths.seam.offset(sa).attr('class', 'lining sa') @@ -63,18 +63,18 @@ export default function (part) { macro('vd', { from: points.bottomRight, to: points.topRight, - x: points.topRight.x + sa + 15 + x: points.topRight.x + sa + 15, }) macro('hd', { from: points.topLeft, to: points.topRight, - y: points.topRight.y - sa - 15 + y: points.topRight.y - sa - 15, }) if (options.pocketRadius > 0) { macro('hd', { from: points.roundRightStart, to: points.roundRightEnd, - y: points.bottomRight.y + sa + 15 + y: points.bottomRight.y + sa + 15, }) } } diff --git a/packages/carlton/src/tail.js b/packages/carlton/src/tail.js index c053cd61abd..cd845792c8b 100644 --- a/packages/carlton/src/tail.js +++ b/packages/carlton/src/tail.js @@ -9,7 +9,7 @@ export default function (part) { macro, Point, paths, - Path + Path, } = part.shorthand() let length = store.get('waistToHem') - store.get('beltWidth') / 2 @@ -71,56 +71,56 @@ export default function (part) { macro('title', { at: points.title, nr: 5, - title: 'tail' + title: 'tail', }) macro('grainline', { from: points.fold2Bottom.shift(0, 10), - to: points.fold2Top.shift(0, 10) + to: points.fold2Top.shift(0, 10), }) if (sa) paths.sa = paths.seam.offset(sa).close().attr('class', 'fabric sa') macro('vd', { from: points.fold4Bottom.shift(0, 15), to: points.fold4Top.shift(0, 15), - text: units(length) + text: units(length), }) if (paperless) { macro('hd', { from: points.cbBottom, to: points.fold1Bottom, - y: points.cbBottom.y + sa + 15 + y: points.cbBottom.y + sa + 15, }) macro('hd', { from: points.fold1Bottom, to: points.fold2Bottom, - y: points.cbBottom.y + sa + 15 + y: points.cbBottom.y + sa + 15, }) macro('hd', { from: points.fold2Bottom, to: points.fold3Bottom, - y: points.cbBottom.y + sa + 15 + y: points.cbBottom.y + sa + 15, }) macro('hd', { from: points.fold3Bottom, to: points.fold4Bottom, - y: points.cbBottom.y + sa + 15 + y: points.cbBottom.y + sa + 15, }) macro('hd', { from: points.fold4Bottom, to: points.fold5Bottom, - y: points.cbBottom.y + sa + 15 + y: points.cbBottom.y + sa + 15, }) macro('hd', { from: points.fold5Bottom, to: points.waistBottom, - y: points.cbBottom.y + sa + 15 + y: points.cbBottom.y + sa + 15, }) macro('hd', { from: points.cbBottom, to: points.waistBottom, - y: points.cbBottom.y + sa + 30 + y: points.cbBottom.y + sa + 30, }) } } diff --git a/packages/carlton/src/topsleeve.js b/packages/carlton/src/topsleeve.js index bca2772e9e5..e36ee5520f7 100644 --- a/packages/carlton/src/topsleeve.js +++ b/packages/carlton/src/topsleeve.js @@ -11,7 +11,7 @@ export default function (part) { paths, Path, Snippet, - snippets + snippets, } = part.shorthand() // Add cuff @@ -25,7 +25,7 @@ export default function (part) { via: points.cuffBottomRight, radius: length / 3, render: true, - prefix: 'round' + prefix: 'round', }) store.set('topCuffWidth', points.tsWristLeft.dist(points.tsWristRight)) store.set('cuffLength', length) @@ -55,7 +55,7 @@ export default function (part) { if (complete) { macro('grainline', { from: points.boxBottom, - to: points.top + to: points.top, }) macro('scalebox', { at: points.tsWristLeftHelperTop }) delete snippets.logo @@ -68,70 +68,70 @@ export default function (part) { macro('ld', { from: points.tsWristLeft, to: points.tsWristRight, - d: -15 + d: -15, }) macro('vd', { from: points.tsWristLeft, to: points.tsElbowLeft, - x: points.tsLeftEdge.x - sa - 15 + x: points.tsLeftEdge.x - sa - 15, }) macro('vd', { from: points.tsWristLeft, to: points.tsLeftEdge, - x: points.tsLeftEdge.x - sa - 30 + x: points.tsLeftEdge.x - sa - 30, }) macro('ld', { from: points.cuffBottomLeft, to: points.tsWristLeft, - d: 15 + sa + d: 15 + sa, }) macro('vd', { from: points.cuffBottomRight, to: points.usWristRight, - x: points.usWristRight.x + 15 + sa + x: points.usWristRight.x + 15 + sa, }) macro('vd', { from: points.usWristRight, to: points.elbowRight, - x: points.elbowRight.x + 15 + sa + x: points.elbowRight.x + 15 + sa, }) macro('vd', { from: points.usWristRight, to: points.tsRightEdge, - x: points.elbowRight.x + 30 + sa + x: points.elbowRight.x + 30 + sa, }) macro('vd', { from: points.usWristRight, to: points.backPitchPoint, - x: points.elbowRight.x + 45 + sa + x: points.elbowRight.x + 45 + sa, }) macro('vd', { from: points.usWristRight, to: points.top, - x: points.elbowRight.x + 60 + sa + x: points.elbowRight.x + 60 + sa, }) macro('ld', { from: points.tsElbowLeft, - to: points.elbowRight + to: points.elbowRight, }) macro('ld', { from: points.tsLeftEdge, - to: points.tsRightEdge + to: points.tsRightEdge, }) macro('hd', { from: points.tsLeftEdge, to: points.top, - y: points.top.y - sa - 15 + y: points.top.y - sa - 15, }) macro('hd', { from: points.tsLeftEdge, to: points.backPitchPoint, - y: points.top.y - sa - 30 + y: points.top.y - sa - 30, }) macro('hd', { from: points.tsLeftEdge, to: points.tsRightEdge, - y: points.top.y - sa - 45 + y: points.top.y - sa - 45, }) } } diff --git a/packages/carlton/src/undersleeve.js b/packages/carlton/src/undersleeve.js index 502b350c68d..097928c17cc 100644 --- a/packages/carlton/src/undersleeve.js +++ b/packages/carlton/src/undersleeve.js @@ -10,7 +10,7 @@ export default function (part) { macro, Point, paths, - Path + Path, } = part.shorthand() // Add cuff @@ -24,7 +24,7 @@ export default function (part) { via: points.cuffBottomRight, radius: length / 3, render: true, - prefix: 'round' + prefix: 'round', }) store.set('underCuffWidth', points.usWristLeft.dist(points.usWristRight)) @@ -51,7 +51,7 @@ export default function (part) { if (complete) { macro('grainline', { from: points.boxBottom, - to: new Point(points.top.x, points.usLeftEdge.y) + to: new Point(points.top.x, points.usLeftEdge.y), }) if (sa) paths.sa = paths.seam.offset(sa).attr('class', 'fabric sa') @@ -60,56 +60,56 @@ export default function (part) { macro('ld', { from: points.usWristLeft, to: points.usWristRight, - d: -15 + d: -15, }) macro('vd', { from: points.usWristLeft, to: points.usElbowLeft, - x: points.usLeftEdge.x - sa - 15 + x: points.usLeftEdge.x - sa - 15, }) macro('vd', { from: points.usWristLeft, to: points.usLeftEdge, - x: points.usLeftEdge.x - sa - 30 + x: points.usLeftEdge.x - sa - 30, }) macro('ld', { from: points.cuffBottomLeft, to: points.usWristLeft, - d: 15 + sa + d: 15 + sa, }) macro('vd', { from: points.cuffBottomRight, to: points.usWristRight, - x: points.usWristRight.x + 15 + sa + x: points.usWristRight.x + 15 + sa, }) macro('vd', { from: points.usWristRight, to: points.elbowRight, - x: points.elbowRight.x + 15 + sa + x: points.elbowRight.x + 15 + sa, }) macro('vd', { from: points.usWristRight, to: points.usTip, - x: points.elbowRight.x + 30 + sa + x: points.elbowRight.x + 30 + sa, }) macro('ld', { from: points.usElbowLeft, - to: points.elbowRight + to: points.elbowRight, }) macro('ld', { from: points.usLeftEdge, to: points.usRightEdge, - d: -15 + d: -15, }) macro('hd', { from: points.usLeftEdge, to: points.usTip, - y: points.usTip.y - sa - 15 + y: points.usTip.y - sa - 15, }) macro('vd', { from: points.usLeftEdge, to: points.usTip, - x: points.usLeftEdge.x - sa - 15 + x: points.usLeftEdge.x - sa - 15, }) } } diff --git a/packages/cathrin/config/index.js b/packages/cathrin/config/index.js index 51bbe263fcf..d0fd7927b67 100644 --- a/packages/cathrin/config/index.js +++ b/packages/cathrin/config/index.js @@ -11,7 +11,7 @@ export default { tags: ['underwear', 'top'], optionGroups: { fit: ['waistReduction', 'panels'], - style: ['backOpening', 'backRise', 'backDrop', 'frontRise', 'frontDrop', 'hipRise'] + style: ['backOpening', 'backRise', 'backDrop', 'frontRise', 'frontDrop', 'hipRise'], }, measurements: ['underbust', 'waist', 'hips', 'waistToUnderbust', 'waistToHips'], dependencies: { @@ -21,7 +21,7 @@ export default { panel4: 'panels', panel5: 'panels', panel6: 'panels', - panels: 'base' + panels: 'base', }, inject: { panel1: 'panels', @@ -30,14 +30,14 @@ export default { panel4: 'panels', panel5: 'panels', panel6: 'panels', - panels: 'base' + panels: 'base', }, hide: ['panels', 'base'], options: { // Lists panels: { list: ['11', '13'], - dflt: '13' + dflt: '13', }, // Percentages @@ -47,6 +47,6 @@ export default { backDrop: { pct: 2, min: 0, max: 5 }, frontRise: { pct: 4, min: 0.1, max: 8 }, frontDrop: { pct: 5, min: 0, max: 10 }, - hipRise: { pct: 5, min: 0, max: 15 } - } + hipRise: { pct: 5, min: 0, max: 15 }, + }, } diff --git a/packages/cathrin/src/panel1.js b/packages/cathrin/src/panel1.js index 46f92c05beb..fa919dedba8 100644 --- a/packages/cathrin/src/panel1.js +++ b/packages/cathrin/src/panel1.js @@ -19,13 +19,13 @@ export default function (part) { macro('cutonfold', { to: points.bottomCF, from: points.topCF, - grainline: true + grainline: true, }) points.title = points.waistCF.shiftFractionTowards(points.underbustGap1Left, 0.5) macro('title', { nr: 1, title: '', - at: points.title + at: points.title, }) if (sa) paths.sa = paths.panel1.offset(sa).attr('class', 'fabric sa') } @@ -35,36 +35,36 @@ export default function (part) { macro('vd', { from: points.bottomCF, to: points.waistCF, - x: points.topCF.x - sa - 15 + x: points.topCF.x - sa - 15, }) macro('vd', { from: points.waistCF, to: points.topCF, - x: points.topCF.x - sa - 15 + x: points.topCF.x - sa - 15, }) macro('vd', { from: points.hipsGap1, to: points.waistGap1Left, - x: points.hipsGap1.x + sa + 15 + x: points.hipsGap1.x + sa + 15, }) macro('vd', { from: points.waistGap1Left, to: points.underbustGap1Left, - x: points.hipsGap1.x + sa + 15 + x: points.hipsGap1.x + sa + 15, }) macro('hd', { from: points.bottomCF, to: points.hipsGap1, - y: points.bottomCF.y + sa + 15 + y: points.bottomCF.y + sa + 15, }) macro('hd', { from: points.topCF, to: points.underbustGap1Left, - y: points.topCF.y - sa - 15 + y: points.topCF.y - sa - 15, }) macro('ld', { from: points.waistCF, - to: points.waistGap1Left + to: points.waistGap1Left, }) } diff --git a/packages/cathrin/src/panel1ab.js b/packages/cathrin/src/panel1ab.js index 85004efad95..10a3925bf3e 100644 --- a/packages/cathrin/src/panel1ab.js +++ b/packages/cathrin/src/panel1ab.js @@ -41,21 +41,21 @@ export default function (part) { macro('cutonfold', { to: points.bottomCF, from: points.topCF, - grainline: true + grainline: true, }) macro('grainline', { to: points.topABsplit.translate(translation, 0), from: new Point( points.topABsplit.translate(translation, 0).x, points.hipsGap1.translate(translation, 0).y - ) + ), }) points.midwayAB = points.topABsplit.shiftFractionTowards(points.bottomABsplit, 0.5) points.titleA = points.underbustCF.shiftFractionTowards(points.midwayAB, 0.5) macro('title', { nr: '1a', prefix: 'panel1a', - at: points.titleA + at: points.titleA, }) points.titleB = points.hipsGap1 .translate(translation, 0) @@ -63,7 +63,7 @@ export default function (part) { macro('title', { nr: '1b', prefix: 'panel1b', - at: points.titleB + at: points.titleB, }) } @@ -73,12 +73,12 @@ export default function (part) { macro('vd', { from: points.bottomCF, to: points.waistCF, - x: points.topCF.x - sa - 30 + x: points.topCF.x - sa - 30, }) macro('vd', { from: points.waistCF, to: points.topCF, - x: points.topCF.x - sa - 30 + x: points.topCF.x - sa - 30, }) points.waistAB = utils.beamsIntersect( points.topABsplit, @@ -89,61 +89,61 @@ export default function (part) { macro('vd', { from: points.bottomABsplit, to: points.waistAB, - x: points.topCF.x - sa - 15 + x: points.topCF.x - sa - 15, }) macro('vd', { from: points.waistAB, to: points.topABsplit, - x: points.topCF.x - sa - 15 + x: points.topCF.x - sa - 15, }) macro('hd', { from: points.bottomCF, to: points.bottomABsplit, - y: points.bottomCF.y + sa + 15 + y: points.bottomCF.y + sa + 15, }) macro('ld', { from: points.waistCF, - to: points.waistAB + to: points.waistAB, }) macro('hd', { from: points.topCF, to: points.topABsplit, - y: points.topCF.y - sa - 15 + y: points.topCF.y - sa - 15, }) // 1b macro('vd', { from: points.hipsGap1.translate(translation, 0), to: points.waistGap1Left.translate(translation, 0), - x: points.underbustGap1Left.translate(translation, 0).x + sa + 15 + x: points.underbustGap1Left.translate(translation, 0).x + sa + 15, }) macro('vd', { from: points.waistGap1Left.translate(translation, 0), to: points.underbustGap1Left.translate(translation, 0), - x: points.underbustGap1Left.translate(translation, 0).x + sa + 15 + x: points.underbustGap1Left.translate(translation, 0).x + sa + 15, }) macro('vd', { from: points.bottomABsplit.translate(translation, 0), to: points.waistAB.translate(translation, 0), - x: points.underbustGap1Left.translate(translation, 0).x + sa + 30 + x: points.underbustGap1Left.translate(translation, 0).x + sa + 30, }) macro('vd', { from: points.waistAB.translate(translation, 0), to: points.topABsplit.translate(translation, 0), - x: points.underbustGap1Left.translate(translation, 0).x + sa + 30 + x: points.underbustGap1Left.translate(translation, 0).x + sa + 30, }) macro('hd', { from: points.bottomABsplit.translate(translation, 0), to: points.hipsGap1.translate(translation, 0), - y: points.bottomABsplit.y + sa + 15 + y: points.bottomABsplit.y + sa + 15, }) macro('ld', { from: points.waistAB.translate(translation, 0), - to: points.waistGap1Left.translate(translation, 0) + to: points.waistGap1Left.translate(translation, 0), }) macro('hd', { from: points.topABsplit.translate(translation, 0), to: points.underbustGap1Left.translate(translation, 0), - y: points.topABsplit.y - sa - 15 + y: points.topABsplit.y - sa - 15, }) } diff --git a/packages/cathrin/src/panel2.js b/packages/cathrin/src/panel2.js index 0579411a7c7..7d710aa3149 100644 --- a/packages/cathrin/src/panel2.js +++ b/packages/cathrin/src/panel2.js @@ -19,13 +19,13 @@ export default function (part) { points.grainlineBottom = new Point(points.grainlineTop.x, points.hipsGap2.y) macro('grainline', { from: points.grainlineBottom, - to: points.grainlineTop + to: points.grainlineTop, }) points.title = points.grainlineTop.shift(-90, points.grainlineTop.dy(points.waistGap2Left) / 2) macro('title', { nr: 2, title: '', - at: points.title + at: points.title, }) if (sa) paths.sa = paths.panel2.offset(sa).attr('class', 'fabric sa') } @@ -35,36 +35,36 @@ export default function (part) { macro('hd', { from: points.hipsGap1, to: points.hipsGap2, - y: points.hipsGap1.y + sa + 15 + y: points.hipsGap1.y + sa + 15, }) macro('ld', { from: points.waistGap1Right, - to: points.waistGap2Left + to: points.waistGap2Left, }) macro('hd', { from: points.underbustGap1Right, to: points.underbustGap2Left, - y: points.underbustGap1Right.y - sa - 15 + y: points.underbustGap1Right.y - sa - 15, }) macro('vd', { from: points.hipsGap1, to: points.waistGap1Right, - x: points.hipsGap1.x - sa - 15 + x: points.hipsGap1.x - sa - 15, }) macro('vd', { from: points.waistGap1Right, to: points.underbustGap1Right, - x: points.hipsGap1.x - sa - 15 + x: points.hipsGap1.x - sa - 15, }) macro('vd', { from: points.hipsGap2, to: points.waistGap1Right, - x: points.hipsGap2.x + sa + 15 + x: points.hipsGap2.x + sa + 15, }) macro('vd', { from: points.waistGap1Right, to: points.underbustGap2Left, - x: points.hipsGap2.x + sa + 15 + x: points.hipsGap2.x + sa + 15, }) } diff --git a/packages/cathrin/src/panel3.js b/packages/cathrin/src/panel3.js index 2dbcc5c96f5..8a1857b1133 100644 --- a/packages/cathrin/src/panel3.js +++ b/packages/cathrin/src/panel3.js @@ -19,13 +19,13 @@ export default function (part) { points.grainlineBottom = new Point(points.grainlineTop.x, points.hipsGap3.y) macro('grainline', { from: points.grainlineBottom, - to: points.grainlineTop + to: points.grainlineTop, }) points.title = points.grainlineTop.shift(-90, points.grainlineTop.dy(points.waistGap3Left) / 2) macro('title', { nr: 3, title: '', - at: points.title + at: points.title, }) if (sa) paths.sa = paths.panel3.offset(sa).attr('class', 'fabric sa') } @@ -35,36 +35,36 @@ export default function (part) { macro('hd', { from: points.hipsGap2, to: points.hipsGap3, - y: points.hipsGap2.y + sa + 15 + y: points.hipsGap2.y + sa + 15, }) macro('ld', { from: points.waistGap2Right, - to: points.waistGap3Left + to: points.waistGap3Left, }) macro('hd', { from: points.underbustGap2Right, to: points.underbustGap3Left, - y: points.underbustGap2Right.y - sa - 15 + y: points.underbustGap2Right.y - sa - 15, }) macro('vd', { from: points.hipsGap2, to: points.waistGap2Right, - x: points.hipsGap2.x - sa - 15 + x: points.hipsGap2.x - sa - 15, }) macro('vd', { from: points.waistGap2Right, to: points.underbustGap2Right, - x: points.hipsGap2.x - sa - 15 + x: points.hipsGap2.x - sa - 15, }) macro('vd', { from: points.hipsGap3, to: points.waistGap2Right, - x: points.hipsGap3.x + sa + 15 + x: points.hipsGap3.x + sa + 15, }) macro('vd', { from: points.waistGap2Right, to: points.underbustGap3Left, - x: points.hipsGap3.x + sa + 15 + x: points.hipsGap3.x + sa + 15, }) } diff --git a/packages/cathrin/src/panel4.js b/packages/cathrin/src/panel4.js index 35c63141cc1..3970f59ab20 100644 --- a/packages/cathrin/src/panel4.js +++ b/packages/cathrin/src/panel4.js @@ -19,13 +19,13 @@ export default function (part) { points.grainlineBottom = new Point(points.grainlineTop.x, points.hipsGap4.y) macro('grainline', { from: points.grainlineBottom, - to: points.grainlineTop + to: points.grainlineTop, }) points.title = points.grainlineTop.shift(-90, points.grainlineTop.dy(points.waistGap4Left) / 2) macro('title', { nr: 4, title: '', - at: points.title + at: points.title, }) points.logo = points.grainlineTop.shiftFractionTowards(points.grainlineBottom, 0.8) snippets.logo = new Snippet('logo', points.logo).attr('data-scale', 0.8) @@ -38,36 +38,36 @@ export default function (part) { macro('hd', { from: points.hipsGap3, to: points.hipsGap4, - y: points.hipsGap3.y + sa + 15 + y: points.hipsGap3.y + sa + 15, }) macro('ld', { from: points.waistGap3Right, - to: points.waistGap4Left + to: points.waistGap4Left, }) macro('hd', { from: points.underbustGap3Right, to: points.underbustGap4Left, - y: points.underbustGap4Left.y - sa - 15 + y: points.underbustGap4Left.y - sa - 15, }) macro('vd', { from: points.hipsGap3, to: points.waistGap3Right, - x: points.hipsGap3.x - sa - 15 + x: points.hipsGap3.x - sa - 15, }) macro('vd', { from: points.waistGap3Right, to: points.underbustGap3Right, - x: points.hipsGap3.x - sa - 15 + x: points.hipsGap3.x - sa - 15, }) macro('vd', { from: points.hipsGap4, to: points.waistGap3Right, - x: points.hipsGap4.x + sa + 15 + x: points.hipsGap4.x + sa + 15, }) macro('vd', { from: points.waistGap3Right, to: points.underbustGap4Left, - x: points.hipsGap4.x + sa + 15 + x: points.hipsGap4.x + sa + 15, }) } diff --git a/packages/cathrin/src/panel5.js b/packages/cathrin/src/panel5.js index 08e6b92928c..31d92772cf4 100644 --- a/packages/cathrin/src/panel5.js +++ b/packages/cathrin/src/panel5.js @@ -19,13 +19,13 @@ export default function (part) { points.grainlineBottom = new Point(points.grainlineTop.x, points.hipsGap5.y) macro('grainline', { from: points.grainlineBottom, - to: points.grainlineTop + to: points.grainlineTop, }) points.title = points.grainlineTop.shift(-90, points.grainlineTop.dy(points.waistGap5Left) / 2) macro('title', { nr: 5, title: '', - at: points.title + at: points.title, }) if (sa) paths.sa = paths.panel5.offset(sa).attr('class', 'fabric sa') } @@ -35,36 +35,36 @@ export default function (part) { macro('hd', { from: points.hipsGap4, to: points.hipsGap5, - y: points.hipsGap4.y + sa + 15 + y: points.hipsGap4.y + sa + 15, }) macro('ld', { from: points.waistGap4Right, - to: points.waistGap5Left + to: points.waistGap5Left, }) macro('hd', { from: points.underbustGap4Right, to: points.underbustGap5Left, - y: points.underbustGap5Left.y - sa - 15 + y: points.underbustGap5Left.y - sa - 15, }) macro('vd', { from: points.hipsGap4, to: points.waistGap4Right, - x: points.hipsGap4.x - sa - 15 + x: points.hipsGap4.x - sa - 15, }) macro('vd', { from: points.waistGap4Right, to: points.underbustGap4Right, - x: points.hipsGap4.x - sa - 15 + x: points.hipsGap4.x - sa - 15, }) macro('vd', { from: points.hipsGap5, to: points.waistGap4Right, - x: points.hipsGap5.x + sa + 15 + x: points.hipsGap5.x + sa + 15, }) macro('vd', { from: points.waistGap4Right, to: points.underbustGap5Left, - x: points.hipsGap5.x + sa + 15 + x: points.hipsGap5.x + sa + 15, }) } diff --git a/packages/cathrin/src/panel6.js b/packages/cathrin/src/panel6.js index bb93aa418fc..1b3b30b3fa4 100644 --- a/packages/cathrin/src/panel6.js +++ b/packages/cathrin/src/panel6.js @@ -19,18 +19,18 @@ export default function (part) { points.grainlineBottom = new Point(points.grainlineTop.x, points.hipsGap5.y) macro('grainline', { from: points.grainlineBottom, - to: points.grainlineTop + to: points.grainlineTop, }) points.title = points.grainlineTop.shift(-90, points.grainlineTop.dy(points.waistGap5Right) / 2) macro('title', { nr: 6, title: '', - at: points.title + at: points.title, }) points.scalebox = new Point(points.grainlineTop.x, points.hipsGap5.y - 55) macro('scalebox', { at: points.scalebox, - rotate: 90 + rotate: 90, }) if (sa) paths.sa = paths.panel6.offset(sa).attr('class', 'fabric sa') } @@ -40,36 +40,36 @@ export default function (part) { macro('hd', { from: points.hipsGap5, to: points.backDrop, - y: points.backDrop.y + sa + 15 + y: points.backDrop.y + sa + 15, }) macro('ld', { from: points.waistGap5Right, - to: points.waistCB + to: points.waistCB, }) macro('hd', { from: points.underbustGap5Right, to: points.backRise, - y: points.backRise.y - sa - 15 + y: points.backRise.y - sa - 15, }) macro('vd', { from: points.hipsGap5, to: points.waistGap5Right, - x: points.hipsGap5.x - sa - 15 + x: points.hipsGap5.x - sa - 15, }) macro('vd', { from: points.waistGap5Right, to: points.underbustGap5Right, - x: points.hipsGap5.x - sa - 15 + x: points.hipsGap5.x - sa - 15, }) macro('vd', { from: points.backDrop, to: points.waistCB, - x: points.backDrop.x + sa + 15 + x: points.backDrop.x + sa + 15, }) macro('vd', { from: points.waistCB, to: points.backRise, - x: points.backDrop.x + sa + 15 + x: points.backDrop.x + sa + 15, }) } diff --git a/packages/charlie/config/index.js b/packages/charlie/config/index.js index 3a8835f7562..72ca94eb876 100644 --- a/packages/charlie/config/index.js +++ b/packages/charlie/config/index.js @@ -18,7 +18,7 @@ export default { 'backPocketHorizontalPlacement', 'backPocketVerticalPlacement', 'backPocketWidth', - 'backPocketDepth' + 'backPocketDepth', ], frontPockets: [ 'frontPocketSlantDepth', @@ -27,9 +27,9 @@ export default { 'frontPocketSlantBend', 'frontPocketWidth', 'frontPocketDepth', - 'frontPocketFacing' - ] - } + 'frontPocketFacing', + ], + }, ], advanced: [ 'crossSeamCurveStart', @@ -43,9 +43,9 @@ export default { 'waistBalance', 'beltLoops', { - fly: ['flyCurve', 'flyLength', 'flyWidth'] - } - ] + fly: ['flyCurve', 'flyLength', 'flyWidth'], + }, + ], }, measurements: [ 'crossSeam', @@ -59,7 +59,7 @@ export default { 'waistToKnee', 'waistToHips', 'waistToSeat', - 'waistToUpperLeg' + 'waistToUpperLeg', ], hide: ['titanBack', 'titanFront'], inject: { @@ -71,7 +71,7 @@ export default { backPocketInterfacing: 'backPocket', backPocketJet: 'backPocketFacing', flyFacing: 'front', - flyExtension: 'flyFacing' + flyExtension: 'flyFacing', }, parts: ['beltLoops'], dependencies: { @@ -79,7 +79,7 @@ export default { titanFront: 'titanBack', back: ['titanBack', 'titanFront', 'front'], waistband: ['titanBack', 'titanFront', 'front', 'back'], - waistbandCurved: ['titanBack', 'titanFront', 'front', 'back'] + waistbandCurved: ['titanBack', 'titanFront', 'front', 'back'], }, options: { // Constants (from Titan) @@ -141,6 +141,6 @@ export default { flyWidth: { pct: 15, min: 10, max: 20 }, // Waistband - beltLoops: { count: 8, min: 6, max: 12 } - } + beltLoops: { count: 8, min: 6, max: 12 }, + }, } diff --git a/packages/charlie/src/back-pocket-facing.js b/packages/charlie/src/back-pocket-facing.js index 49a9f899135..f52aed12541 100644 --- a/packages/charlie/src/back-pocket-facing.js +++ b/packages/charlie/src/back-pocket-facing.js @@ -28,13 +28,13 @@ export default (part) => { macro('title', { at: points.titleAnchor, nr: 6, - title: 'backPocketBagFacing' + title: 'backPocketBagFacing', }) points.grainlineTop = points.waistbandLeft.shiftFractionTowards(points.waistbandRight, 0.15) points.grainlineBottom = new Point(points.grainlineTop.x, points.bottomLeft.y) macro('grainline', { from: points.grainlineTop, - to: points.grainlineBottom + to: points.grainlineBottom, }) if (sa) paths.sa = paths.seam.offset(sa).attr('class', 'fabric sa') @@ -43,22 +43,22 @@ export default (part) => { macro('hd', { from: points.bottomLeft, to: points.bottomRight, - y: points.bottomLeft.y + 15 + y: points.bottomLeft.y + 15, }) macro('hd', { from: points.waistbandLeft, to: points.waistbandRight, - y: points.waistbandLeft.y - sa - 15 + y: points.waistbandLeft.y - sa - 15, }) macro('vd', { from: points.bottomRight, to: points.rightNotch, - x: points.bottomRight.x + sa + 15 + x: points.bottomRight.x + sa + 15, }) macro('vd', { from: points.bottomRight, to: points.waistbandRight, - x: points.bottomRight.x + sa + 30 + x: points.bottomRight.x + sa + 30, }) } } diff --git a/packages/charlie/src/back-pocket-interfacing.js b/packages/charlie/src/back-pocket-interfacing.js index c480d7a2eb2..19f15c8f952 100644 --- a/packages/charlie/src/back-pocket-interfacing.js +++ b/packages/charlie/src/back-pocket-interfacing.js @@ -34,19 +34,19 @@ export default (part) => { macro('title', { at: points.titleAnchor, nr: 3, - title: 'backPocketInterfacing' + title: 'backPocketInterfacing', }) if (paperless) { macro('hd', { from: points.bottomLeft, to: points.bottomRight, - y: points.bottomLeft.y + 15 + y: points.bottomLeft.y + 15, }) macro('vd', { from: points.bottomRight, to: points.topRight, - x: points.topRight.x + 15 + x: points.topRight.x + 15, }) } } diff --git a/packages/charlie/src/back-pocket-jet.js b/packages/charlie/src/back-pocket-jet.js index 04ef7fcf607..bb4db86fb6a 100644 --- a/packages/charlie/src/back-pocket-jet.js +++ b/packages/charlie/src/back-pocket-jet.js @@ -32,25 +32,25 @@ export default (part) => { at: points.titleAnchor, nr: 4, title: 'backPocketJet', - scale: 0.5 + scale: 0.5, }) points.grainlineTop = points.topLeft.shiftFractionTowards(points.topRight, 0.15) points.grainlineBottom = new Point(points.grainlineTop.x, points.bottomLeft.y) macro('grainline', { from: points.grainlineTop, - to: points.grainlineBottom + to: points.grainlineBottom, }) if (paperless) { macro('hd', { from: points.bottomLeft, to: points.bottomRight, - y: points.bottomLeft.y + 15 + y: points.bottomLeft.y + 15, }) macro('vd', { from: points.bottomRight, to: points.topRight, - x: points.topRight.x + 15 + x: points.topRight.x + 15, }) } } diff --git a/packages/charlie/src/back-pocket.js b/packages/charlie/src/back-pocket.js index 9bd6e792c79..b0871999a17 100644 --- a/packages/charlie/src/back-pocket.js +++ b/packages/charlie/src/back-pocket.js @@ -11,7 +11,7 @@ export default (part) => { macro, snippets, Snippet, - sa + sa, } = part.shorthand() points.leftNotch = new Point(store.get('backPocketWidth') / -2, 0) @@ -54,7 +54,7 @@ export default (part) => { macro('title', { at: points.titleAnchor, nr: 5, - title: 'backPocketBag' + title: 'backPocketBag', }) points.logoAnchor = points.foldLeft.shiftFractionTowards(points.bottomRight, 0.5) snippets.logo = new Snippet('logo', points.logoAnchor) @@ -62,7 +62,7 @@ export default (part) => { points.grainlineBottom = new Point(points.grainlineTop.x, points.bottomLeft.y) macro('grainline', { from: points.grainlineTop, - to: points.grainlineBottom + to: points.grainlineBottom, }) if (sa) paths.sa = paths.seam.offset(sa).attr('class', 'lining sa') @@ -71,27 +71,27 @@ export default (part) => { macro('hd', { from: points.bottomLeft, to: points.bottomRight, - y: points.bottomLeft.y + 15 + y: points.bottomLeft.y + 15, }) macro('vd', { from: points.bottomRight, to: points.foldRight, - x: points.foldRight.x + 15 + x: points.foldRight.x + 15, }) macro('vd', { from: points.bottomRight, to: points.rightNotch, - x: points.foldRight.x + 30 + x: points.foldRight.x + 30, }) macro('vd', { from: points.bottomRight, to: points.waistbandRight, - x: points.foldRight.x + 45 + x: points.foldRight.x + 45, }) macro('hd', { from: points.waistbandLeft, to: points.waistbandRight, - y: points.waistbandLeft.y - sa - 15 + y: points.waistbandLeft.y - sa - 15, }) } } diff --git a/packages/charlie/src/back.js b/packages/charlie/src/back.js index 36cf131872e..ab6e6b32639 100644 --- a/packages/charlie/src/back.js +++ b/packages/charlie/src/back.js @@ -41,7 +41,7 @@ export default (part) => { Snippet, sa, raise, - units + units, } = part.shorthand() // Mark back pocket @@ -142,7 +142,7 @@ export default (part) => { macro('title', { at: points.titleAnchor, nr: 1, - title: 'back' + title: 'back', }) snippets.logo = new Snippet('logo', points.titleAnchor.shiftFractionTowards(points.knee, 0.5)) points.slantBottomNotch = new Path() @@ -156,20 +156,20 @@ export default (part) => { ) macro('sprinkle', { snippet: 'bnotch', - on: ['grainlineBottom', 'slantBottomNotch', 'slantTopNotch'] + on: ['grainlineBottom', 'slantBottomNotch', 'slantTopNotch'], }) macro('bartack', { anchor: points.slantTopNotch, angle: points.slantTopNotch.angle(points.slantBottomNotch) - 90, length: sa ? sa / 2 : 5, - suffix: 'slantTop' + suffix: 'slantTop', }) macro('bartack', { anchor: points.slantBottomNotch, length: sa ? sa / 2 : 5, angle: 180, - suffix: 'slantBottom' + suffix: 'slantBottom', }) if (sa) { @@ -198,101 +198,101 @@ export default (part) => { macro('hd', { from: points.floorIn, to: points.grainlineBottom, - y: points.floorIn.y - 15 + y: points.floorIn.y - 15, }) macro('hd', { from: points.grainlineBottom, to: points.floorOut, - y: points.floorIn.y - 15 + y: points.floorIn.y - 15, }) macro('hd', { from: points.floorIn, to: points.floorOut, - y: points.floorIn.y - 30 + y: points.floorIn.y - 30, }) let y = points.floorIn.y + sa * 6 macro('hd', { from: points.fork, to: points.grainlineBottom, - y: y + 15 + y: y + 15, }) macro('hd', { from: points.grainlineBottom, to: points.slantBottomNotch, - y: y + 15 + y: y + 15, }) macro('hd', { from: points.grainlineBottom, to: points.slantOut, - y: y + 30 + y: y + 30, }) y = points.styleWaistIn.y - sa macro('hd', { from: points.styleWaistIn, to: points.grainlineTop, - y: y - 15 + y: y - 15, }) macro('hd', { from: points.fork, to: points.grainlineTop, - y: y - 30 + y: y - 30, }) macro('hd', { from: points.grainlineTop, to: points.waistPocketCenter, - y: y - 15 + y: y - 15, }) macro('hd', { from: points.grainlineTop, to: points.slantOut, - y: y - 30 + y: y - 30, }) macro('ld', { from: points.pocketLeft, to: points.pocketRight, - d: -15 + d: -15, }) macro('ld', { from: points.backDartLeft, to: points.backDartRight, - d: 15 + d: 15, }) macro('ld', { from: points.pocketCenter, to: points.waistPocketCenter, - d: 25 + d: 25, }) let x = points.fork.x - sa macro('vd', { from: points.fork, to: points.pocketCenter, - x: x - 15 + x: x - 15, }) macro('vd', { from: points.fork, to: points.waistPocketCenter, - x: x - 30 + x: x - 30, }) macro('vd', { from: points.fork, to: points.styleWaistIn, - x: x - 45 + x: x - 45, }) x = points.slantOut.x + sa macro('vd', { from: points.floorOut, to: points.slantBottomNotch, - x: x + 15 + x: x + 15, }) macro('vd', { from: points.floorOut, to: points.slantOut, - x: x + 30 + x: x + 30, }) } } diff --git a/packages/charlie/src/beltloops.js b/packages/charlie/src/beltloops.js index 8ccb6781018..94cb1a9b1c6 100644 --- a/packages/charlie/src/beltloops.js +++ b/packages/charlie/src/beltloops.js @@ -40,13 +40,13 @@ export default (part) => { nr: 12, title: 'beltLoops', rotation: 90, - scale: 0.7 + scale: 0.7, }) points.grainlineTop = new Point(points.topRight.x / 2, 0) points.grainlineBottom = new Point(points.topRight.x / 2, length) macro('grainline', { from: points.grainlineTop, - to: points.grainlineBottom + to: points.grainlineBottom, }) for (let i = 1; i < count; i++) { paths[`cut${i}`] = new Path() @@ -59,12 +59,12 @@ export default (part) => { macro('hd', { from: points.bottomLeft, to: points.bottomRight, - y: points.bottomLeft.y + sa + 15 + y: points.bottomLeft.y + sa + 15, }) macro('vd', { from: points.bottomRight, to: points.topRight, - x: points.bottomRight.x + sa + 15 + x: points.bottomRight.x + sa + 15, }) } } diff --git a/packages/charlie/src/fly-extension.js b/packages/charlie/src/fly-extension.js index 97dbaa08375..83e19a390a6 100644 --- a/packages/charlie/src/fly-extension.js +++ b/packages/charlie/src/fly-extension.js @@ -36,13 +36,13 @@ export default (part) => { macro('cutonfold', { from: points.flyTop, to: points.flyCorner, - grainline: true + grainline: true, }) points.titleAnchor = points.flyCurveStart macro('title', { at: points.titleAnchor, nr: 10, - title: 'flyExtention' + title: 'flyExtention', }) if (sa) paths.sa = paths.saBase diff --git a/packages/charlie/src/fly-facing.js b/packages/charlie/src/fly-facing.js index 28074f7099d..7bec0356a41 100644 --- a/packages/charlie/src/fly-facing.js +++ b/packages/charlie/src/fly-facing.js @@ -25,13 +25,13 @@ export default (part) => { points.grainlineBottom = new Point(points.grainlineTop.x, points.flyCurveCp2.y) macro('grainline', { from: points.grainlineTop, - to: points.grainlineBottom + to: points.grainlineBottom, }) points.titleAnchor = points.grainlineTop.shiftFractionTowards(points.grainlineBottom, 0.5) macro('title', { at: points.titleAnchor, nr: 9, - title: 'flyFacing' + title: 'flyFacing', }) if (sa) paths.sa = paths.saBase diff --git a/packages/charlie/src/front-pocket-facing.js b/packages/charlie/src/front-pocket-facing.js index 2814b639d21..4971e15f924 100644 --- a/packages/charlie/src/front-pocket-facing.js +++ b/packages/charlie/src/front-pocket-facing.js @@ -27,11 +27,11 @@ export default (part) => { macro('title', { at: points.titleAnchor, nr: 8, - title: 'frontPocketBagFacing' + title: 'frontPocketBagFacing', }) macro('grainline', { from: points.slantTop, - to: new Point(points.slantTop.x, points.facingDirection.y) + to: new Point(points.slantTop.x, points.facingDirection.y), }) snippets.notch = new Snippet('notch', points.facingDirection) diff --git a/packages/charlie/src/front-pocket.js b/packages/charlie/src/front-pocket.js index 2a6089503b2..08447167d36 100644 --- a/packages/charlie/src/front-pocket.js +++ b/packages/charlie/src/front-pocket.js @@ -34,12 +34,12 @@ export default (part) => { macro('title', { at: points.titleAnchor, nr: 7, - title: 'frontPocketBag' + title: 'frontPocketBag', }) macro('cutonfold', { from: points.pocketbagBottomRight, to: points.pocketbagTopRight, - grainline: true + grainline: true, }) snippets.notch = new Snippet('notch', points.facingDirection) @@ -55,12 +55,12 @@ export default (part) => { macro('ld', { from: points.pocketbagBottomRight, to: points.topPleat, - d: -15 + d: -15, }) macro('hd', { from: points.pocketFacingBottom, to: points.pocketbagBottomRight, - y: points.pocketbagBottomRight.y + sa + 15 + y: points.pocketbagBottomRight.y + sa + 15, }) } } diff --git a/packages/charlie/src/front.js b/packages/charlie/src/front.js index b94e1208082..1aefa7f5d6e 100644 --- a/packages/charlie/src/front.js +++ b/packages/charlie/src/front.js @@ -33,7 +33,7 @@ export default (part) => { utils, snippets, Snippet, - sa + sa, } = part.shorthand() // Helper object holding the Titan side seam path @@ -156,7 +156,7 @@ export default (part) => { macro('title', { at: points.titleAnchor, nr: 2, - title: 'front' + title: 'front', }) snippets.logo = new Snippet('logo', points.titleAnchor.shiftFractionTowards(points.knee, 0.666)) points.topPleat = utils.beamsIntersect( @@ -180,8 +180,8 @@ export default (part) => { 'topPleat', 'grainlineBottom', 'flyBottom', - 'flyExtensionBottom' - ] + 'flyExtensionBottom', + ], }) let Jseam = new Path() .move(points.flyCurveStart) @@ -208,18 +208,18 @@ export default (part) => { anchor: points.slantTopNotch, angle: points.slantTopNotch.angle(points.slantCurveStart) + 90, length: sa ? sa / 1.5 : 7.5, - suffix: 'slantTop' + suffix: 'slantTop', }) macro('bartack', { anchor: points.slantBottomNotch, length: sa ? sa / 2 : 5, - suffix: 'slantBottom' + suffix: 'slantBottom', }) macro('bartackFractionAlong', { path: Jseam.reverse(), start: 0, end: 0.1, - suffix: 'stom' + suffix: 'stom', }) if (sa) { @@ -244,87 +244,87 @@ export default (part) => { macro('hd', { from: points.grainlineBottom, to: points.floorIn, - y: points.floorIn.y - 15 + y: points.floorIn.y - 15, }) macro('hd', { from: points.floorOut, to: points.grainlineBottom, - y: points.floorIn.y - 15 + y: points.floorIn.y - 15, }) macro('hd', { from: points.floorOut, to: points.floorIn, - y: points.floorIn.y - 30 + y: points.floorIn.y - 30, }) let y = points.styleWaistIn.y - sa macro('hd', { from: points.grainlineFrom, to: points.flyTop, - y: y - 15 + y: y - 15, }) macro('hd', { from: points.grainlineFrom, to: points.styleWaistIn, - y: y - 30 + y: y - 30, }) macro('hd', { from: points.grainlineFrom, to: points.flyBottom, - y: y - 45 + y: y - 45, }) macro('hd', { from: points.grainlineFrom, to: points.flyExtensionBottom, - y: y - 60 + y: y - 60, }) macro('hd', { from: points.grainlineFrom, to: points.fork, - y: y - 75 + y: y - 75, }) macro('hd', { from: points.pocketFacingTop, to: points.grainlineFrom, - y: y - 15 + y: y - 15, }) macro('hd', { from: points.slantTop, to: points.grainlineFrom, - y: y - 30 + y: y - 30, }) macro('hd', { from: points.slantBottomNotch, to: points.grainlineFrom, - y: y - 45 + y: y - 45, }) let x = points.fork.x + sa macro('vd', { from: points.floorIn, to: points.fork, - x: x + 15 + x: x + 15, }) macro('vd', { from: points.fork, to: points.flyExtensionBottom, - x: x + 15 + x: x + 15, }) macro('vd', { from: points.fork, to: points.flyBottom, - x: x + 30 + x: x + 30, }) macro('vd', { from: points.fork, to: points.slantTop, - x: x + 45 + x: x + 45, }) macro('vd', { from: points.fork, to: points.styleWaistIn, - x: x + 60 + x: x + 60, }) } } diff --git a/packages/charlie/src/waistband-curved.js b/packages/charlie/src/waistband-curved.js index 19547767a62..c9913cab8c8 100644 --- a/packages/charlie/src/waistband-curved.js +++ b/packages/charlie/src/waistband-curved.js @@ -14,7 +14,7 @@ export default (part) => { snippets, Snippet, sa, - units + units, } = part.shorthand() if (options.waistbandCurve == 0) { @@ -96,8 +96,8 @@ export default (part) => { 'ssLeftBottom', 'ssRightBottom', 'ssLeftTop', - 'ssRightTop' - ] + 'ssRightTop', + ], }) points.titleAnchor = points.cfLeftTop.shiftFractionTowards(points.ssLeftBottom, 0.5) @@ -105,12 +105,12 @@ export default (part) => { at: points.titleAnchor, nr: 11, title: 'waistband', - rotation: 90 + rotation: 90, }) macro('grainline', { from: points.cbTop, - to: points.cbBottom + to: points.cbBottom, }) paths.cf = new Path() @@ -152,129 +152,129 @@ export default (part) => { macro('hd', { from: points.edgeRightBottom, to: points.cfLeftBottom, - y: points.edgeRightBottom.y - sa - 30 + y: points.edgeRightBottom.y - sa - 30, }) macro('vd', { from: points.edgeRightBottom, to: points.cfLeftBottom, - x: points.cfLeftBottom.x + sa + 30 + x: points.cfLeftBottom.x + sa + 30, }) macro('hd', { from: points.edgeRightBottom, to: points.ssRightBottom, - y: points.edgeRightBottom.y - sa - 15 + y: points.edgeRightBottom.y - sa - 15, }) macro('vd', { from: points.edgeRightBottom, to: points.ssRightBottom, - x: points.ssRightBottom.x + sa + 15 + x: points.ssRightBottom.x + sa + 15, }) macro('hd', { from: points.ssRightBottom, to: points.cbBottom, - y: points.ssRightBottom.y - sa - 15 + y: points.ssRightBottom.y - sa - 15, }) macro('vd', { from: points.ssRightBottom, to: points.cbBottom, - x: points.cbBottom.x + sa + 15 + x: points.cbBottom.x + sa + 15, }) macro('hd', { from: points.cbBottom, to: points.ssLeftBottom, - y: points.cbBottom.y - sa - 15 + y: points.cbBottom.y - sa - 15, }) macro('vd', { from: points.cbBottom, to: points.ssLeftBottom, - x: points.ssLeftBottom.x + sa + 15 + x: points.ssLeftBottom.x + sa + 15, }) macro('hd', { from: points.ssLeftBottom, to: points.cfLeftBottom, - y: points.ssLeftBottom.y - sa - 15 + y: points.ssLeftBottom.y - sa - 15, }) macro('vd', { from: points.ssLeftBottom, to: points.cfLeftBottom, - x: points.cfLeftBottom.x + sa + 15 + x: points.cfLeftBottom.x + sa + 15, }) macro('hd', { from: points.cfLeftTop, to: points.cfLeftBottom, - y: points.cfLeftTop.y + sa + 15 + y: points.cfLeftTop.y + sa + 15, }) macro('hd', { from: points.edgeRightBottom, to: points.edgeRightTop, - y: points.edgeRightBottom.y - sa - 15 + y: points.edgeRightBottom.y - sa - 15, }) macro('vd', { from: points.edgeRightBottom, to: points.edgeRightTop, - x: points.edgeRightTop.x - sa - 15 + x: points.edgeRightTop.x - sa - 15, }) // TOP OF WAISTBAND macro('hd', { from: points.edgeRightTop, to: points.cfLeftTop, - y: points.edgeRightTop.y + sa + 30 + y: points.edgeRightTop.y + sa + 30, }) macro('vd', { from: points.edgeRightTop, to: points.cfLeftTop, - x: points.edgeRightTop.x - sa - 30 + x: points.edgeRightTop.x - sa - 30, }) macro('hd', { from: points.edgeRightTop, to: points.ssRightTop, - y: points.edgeRightTop.y + sa + 15 + y: points.edgeRightTop.y + sa + 15, }) macro('vd', { from: points.edgeRightTop, to: points.ssRightTop, - x: points.edgeRightTop.x - sa - 15 + x: points.edgeRightTop.x - sa - 15, }) macro('hd', { from: points.ssRightTop, to: points.cbTop, - y: points.ssRightTop.y + sa + 15 + y: points.ssRightTop.y + sa + 15, }) macro('vd', { from: points.ssRightTop, to: points.cbTop, - x: points.ssRightBottom.x - sa - 15 + x: points.ssRightBottom.x - sa - 15, }) macro('hd', { from: points.cbTop, to: points.ssLeftTop, - y: points.cbTop.y + sa + 15 + y: points.cbTop.y + sa + 15, }) macro('vd', { from: points.cbTop, to: points.ssLeftTop, - x: points.cbTop.x - sa - 15 + x: points.cbTop.x - sa - 15, }) macro('hd', { from: points.ssLeftTop, to: points.cfLeftTop, - y: points.ssLeftTop.y + sa + 15 + y: points.ssLeftTop.y + sa + 15, }) macro('vd', { from: points.ssLeftTop, to: points.cfLeftTop, - x: points.ssLeftTop.x - sa - 15 + x: points.ssLeftTop.x - sa - 15, }) } } diff --git a/packages/charlie/src/waistband.js b/packages/charlie/src/waistband.js index 8a1e668140f..9dc5d226b34 100644 --- a/packages/charlie/src/waistband.js +++ b/packages/charlie/src/waistband.js @@ -12,7 +12,7 @@ export default (part) => { macro, snippets, Snippet, - sa + sa, } = part.shorthand() if (options.waistbandCurve > 0) { @@ -49,7 +49,7 @@ export default (part) => { if (complete) { macro('sprinkle', { snippet: 'notch', - on: ['cfRight', 'cfLeft', 'rsRight', 'rsLeft', 'cbRight', 'cbLeft', 'lsRight', 'lsLeft'] + on: ['cfRight', 'cfLeft', 'rsRight', 'rsLeft', 'cbRight', 'cbLeft', 'lsRight', 'lsLeft'], }) points.titleAnchor = points.top.shiftFractionTowards(points.bottom, 0.4) points.logoAnchor = points.top.shiftFractionTowards(points.bottom, 0.6) @@ -57,11 +57,11 @@ export default (part) => { at: points.titleAnchor, nr: 11, title: 'waistband', - rotation: 90 + rotation: 90, }) macro('grainline', { from: points.rsLeft.shift(90, 30), - to: points.rsRight.shift(90, 30) + to: points.rsRight.shift(90, 30), }) paths.cf = new Path() .move(points.cfLeft) @@ -120,12 +120,12 @@ export default (part) => { macro('hd', { from: points.bottomLeft, to: points.bottomRight, - y: points.bottomLeft.y + sa + 15 + y: points.bottomLeft.y + sa + 15, }) macro('vd', { from: points.bottomRight, to: points.topRight, - x: points.bottomRight.x + sa + 15 + x: points.bottomRight.x + sa + 15, }) } } diff --git a/packages/components/src/index.js b/packages/components/src/index.js index 13f67dc9788..c8264edefcc 100644 --- a/packages/components/src/index.js +++ b/packages/components/src/index.js @@ -13,5 +13,5 @@ export default [ 'withGist', 'withLanguage', 'withStorage', - 'Workbench' + 'Workbench', ] diff --git a/packages/core/src/hooks.js b/packages/core/src/hooks.js index fcbd1fa867d..fb70c4d0a7c 100644 --- a/packages/core/src/hooks.js +++ b/packages/core/src/hooks.js @@ -6,6 +6,6 @@ export default function Hooks() { postSample: [], preRender: [], postRender: [], - insertText: [] + insertText: [], } } diff --git a/packages/core/src/index.js b/packages/core/src/index.js index dde036cae7d..9d3a23c0598 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -15,5 +15,5 @@ export default { Snippet, utils, patterns: {}, - plugins: {} + plugins: {}, } diff --git a/packages/core/src/part.js b/packages/core/src/part.js index ca6451a03d5..77ad8f82267 100644 --- a/packages/core/src/part.js +++ b/packages/core/src/part.js @@ -189,7 +189,7 @@ Part.prototype.shorthand = function () { complete, paperless, events: this.context.events, - raise: this.context.raise + raise: this.context.raise, } if (this.context.settings.debug) { @@ -241,7 +241,7 @@ Part.prototype.shorthand = function () { self.context.raise.warning(`Could not set \`name\` property on \`points.${name}\``) } return (self.points[name] = value) - } + }, } shorthand.points = new Proxy(this.points || {}, pointsProxy) // Proxy the paths object @@ -261,7 +261,7 @@ Part.prototype.shorthand = function () { self.context.raise.warning(`Could not set \`name\` property on \`paths.${name}\``) } return (self.paths[name] = value) - } + }, } shorthand.paths = new Proxy(this.paths || {}, pathsProxy) // Proxy the snippets object @@ -289,7 +289,7 @@ Part.prototype.shorthand = function () { self.context.raise.warning(`Could not set \`name\` property on \`snippets.${name}\``) } return (self.snippets[name] = value) - } + }, } shorthand.snippets = new Proxy(this.snippets || {}, snippetsProxy) // Proxy the measurements object @@ -301,7 +301,7 @@ Part.prototype.shorthand = function () { ) return Reflect.get(...arguments) }, - set: (measurements, name, value) => (self.context.settings.measurements[name] = value) + set: (measurements, name, value) => (self.context.settings.measurements[name] = value), } shorthand.measurements = new Proxy(this.context.settings.measurements || {}, measurementsProxy) // Proxy the options object @@ -311,7 +311,7 @@ Part.prototype.shorthand = function () { self.context.raise.warning(`Tried to access \`options.${name}\` but it is \`undefined\``) return Reflect.get(...arguments) }, - set: (options, name, value) => (self.context.settings.options[name] = value) + set: (options, name, value) => (self.context.settings.options[name] = value), } shorthand.options = new Proxy(this.context.settings.options || {}, optionsProxy) } else { diff --git a/packages/core/src/path.js b/packages/core/src/path.js index 03e829eed66..189547c0fa0 100644 --- a/packages/core/src/path.js +++ b/packages/core/src/path.js @@ -8,7 +8,7 @@ import { pointOnLine, pointOnCurve, curveEdge, - round + round, } from './utils' function Path(debug = false) { @@ -514,18 +514,18 @@ function lineBoundingBox(line) { else return { topLeft: new Point(from.x, to.y), - bottomRight: new Point(to.x, from.y) + bottomRight: new Point(to.x, from.y), } } else if (from.x > to.x) { if (from.y < to.y) return { topLeft: new Point(to.x, from.y), - bottomRight: new Point(from.x, to.y) + bottomRight: new Point(from.x, to.y), } else return { topLeft: new Point(to.x, to.y), - bottomRight: new Point(from.x, from.y) + bottomRight: new Point(from.x, from.y), } } } @@ -535,7 +535,7 @@ function curveBoundingBox(curve) { return { topLeft: new Point(bb.x.min, bb.y.min), - bottomRight: new Point(bb.x.max, bb.y.max) + bottomRight: new Point(bb.x.max, bb.y.max), } } diff --git a/packages/core/src/pattern.js b/packages/core/src/pattern.js index eae49e7bad2..531a2e60001 100644 --- a/packages/core/src/pattern.js +++ b/packages/core/src/pattern.js @@ -16,7 +16,7 @@ export default function Pattern(config = { options: {} }) { info: [], warning: [], error: [], - debug: [] + debug: [], } const events = this.events this.raise = { @@ -31,7 +31,7 @@ export default function Pattern(config = { options: {} }) { }, debug: function (data) { events.debug.push(data) - } + }, } this.raise.debug( `New \`@freesewing/${config.name}:${config.version}\` pattern using \`@freesewing/core:${version}\`` @@ -60,7 +60,7 @@ export default function Pattern(config = { options: {} }) { margin: 2, layout: true, debug: true, - options: {} + options: {}, } if (typeof this.config.dependencies === 'undefined') this.config.dependencies = {} @@ -100,7 +100,7 @@ export default function Pattern(config = { options: {} }) { store: this.store, macros: this.macros, events: this.events, - raise: this.raise + raise: this.raise, } // Part closure @@ -130,7 +130,7 @@ Pattern.prototype.apply = function (settings) { } else if (typeof settings[key] === 'object') { this.settings[key] = { ...this.settings[key], - ...settings[key] + ...settings[key], } } else this.settings[key] = settings[key] } @@ -172,7 +172,7 @@ Pattern.prototype.draft = function () { } catch (err) { this.raise.error([ `Could not inject part \`${this.config.inject[partName]}\` into part \`${partName}\``, - err + err, ]) } } @@ -661,7 +661,7 @@ Pattern.prototype.getRenderProps = function () { debug: this.events.debug, info: this.events.info, warning: this.events.warning, - error: this.events.error + error: this.events.error, } props.parts = {} for (let p in this.parts) { @@ -674,7 +674,7 @@ Pattern.prototype.getRenderProps = function () { height: this.parts[p].height, width: this.parts[p].width, bottomRight: this.parts[p].bottomRight, - topLeft: this.parts[p].topLeft + topLeft: this.parts[p].topLeft, } } } diff --git a/packages/core/src/splitcurve.js b/packages/core/src/splitcurve.js index 4e9873fbce7..68550ba37ce 100644 --- a/packages/core/src/splitcurve.js +++ b/packages/core/src/splitcurve.js @@ -9,13 +9,13 @@ export default function splitCurve(start, cp1, cp2, end, split) { start: c1.ops[0].to, cp1: c1.ops[1].cp1, cp2: c1.ops[1].cp2, - end: c1.ops[1].to + end: c1.ops[1].to, }, { start: c2.ops[0].to, cp1: c2.ops[1].cp1, cp2: c2.ops[1].cp2, - end: c2.ops[1].to - } + end: c2.ops[1].to, + }, ] } diff --git a/packages/core/src/svg.js b/packages/core/src/svg.js index 3e27dfd5f46..b6a0afd2013 100644 --- a/packages/core/src/svg.js +++ b/packages/core/src/svg.js @@ -60,7 +60,7 @@ Svg.prototype.render = function (pattern) { let partSvg = this.renderPart(part) this.layout[partId] = { svg: partSvg, - transform: part.attributes.getAsArray('transform') + transform: part.attributes.getAsArray('transform'), } this.svg += this.openGroup(`${this.idPrefix}part-${partId}`, part.attributes) this.svg += partSvg diff --git a/packages/core/src/utils.js b/packages/core/src/utils.js index 4af54480bed..f2ddf1a7f1d 100644 --- a/packages/core/src/utils.js +++ b/packages/core/src/utils.js @@ -87,13 +87,13 @@ export function pointOnCurve(start, cp1, cp2, end, check) { ) let intersections = curve.intersects({ p1: { x: check.x - 1, y: check.y }, - p2: { x: check.x + 1, y: check.y } + p2: { x: check.x + 1, y: check.y }, }) if (intersections.length === 0) { // Handle edge case of a curve that's a perfect horizontal line intersections = curve.intersects({ p1: { x: check.x, y: check.y - 1 }, - p2: { x: check.x, y: check.y + 1 } + p2: { x: check.x, y: check.y + 1 }, }) } @@ -110,14 +110,14 @@ export function splitCurve(start, cp1, cp2, end, split) { start: c1.ops[0].to, cp1: c1.ops[1].cp1, cp2: c1.ops[1].cp2, - end: c1.ops[1].to + end: c1.ops[1].to, }, { start: c2.ops[0].to, cp1: c2.ops[1].cp1, cp2: c2.ops[1].cp2, - end: c2.ops[1].to - } + end: c2.ops[1].to, + }, ] } @@ -156,7 +156,7 @@ export function lineIntersectsCurve(start, end, from, cp1, cp2, to) { ) let line = { p1: { x: start.x, y: start.y }, - p2: { x: end.x, y: end.y } + p2: { x: end.x, y: end.y }, } for (let t of bz.intersects(line)) { let isect = bz.get(t) diff --git a/packages/cornelius/config/index.js b/packages/cornelius/config/index.js index f22dbc1f803..62cbc5de245 100644 --- a/packages/cornelius/config/index.js +++ b/packages/cornelius/config/index.js @@ -12,7 +12,7 @@ export default { optionGroups: { fit: ['fullness', 'waistReduction'], style: ['waistbandBelowWaist', 'cuffStyle', 'cuffWidth', 'ventLength'], - advanced: ['bandBelowKnee', 'kneeToBelow'] + advanced: ['bandBelowKnee', 'kneeToBelow'], }, parts: [ 'frontpoints', @@ -22,13 +22,13 @@ export default { 'legband', 'legbandkeystone', 'pocket', - 'pocketfacing' + 'pocketfacing', ], inject: { front: 'frontpoints', back: 'frontpoints', pocket: 'frontpoints', - pocketfacing: 'frontpoints' + pocketfacing: 'frontpoints', }, measurements: [ 'waist', @@ -38,13 +38,13 @@ export default { 'waistToKnee', 'waistToHips', 'waistToFloor', - 'knee' + 'knee', ], dependencies: { back: 'front', legband: ['back', 'front'], legbandkeystone: ['back', 'front'], - waistband: ['back', 'front'] + waistband: ['back', 'front'], }, hide: ['frontpoints'], options: { @@ -68,6 +68,6 @@ export default { waistReduction: { pct: 1, min: -2, max: 10 }, cuffWidth: { pct: 0, min: -50, max: 150 }, cuffStyle: { dflt: 'elegant', list: ['traditional', 'elegant', 'keystone'] }, - bandBelowKnee: { pct: 25, min: 15, max: 50 } - } + bandBelowKnee: { pct: 25, min: 15, max: 50 }, + }, } diff --git a/packages/cornelius/src/back.js b/packages/cornelius/src/back.js index 21ccc319579..c38bf404b35 100644 --- a/packages/cornelius/src/back.js +++ b/packages/cornelius/src/back.js @@ -184,7 +184,7 @@ export default function (part) { sa, store, paperless, - macro + macro, } = part.shorthand() let tempP = null @@ -270,7 +270,7 @@ export default function (part) { macro('title', { nr: 77, at: points.title, - title: 'Back' + title: 'Back', }) points.__titleNr.attr('data-text-class', 'center') points.__titleName.attr('data-text-class', 'center') @@ -280,7 +280,7 @@ export default function (part) { let dist = points.p11.dist(points.p4) macro('grainline', { from: points.pA.shift(angle, dist * 0.35), - to: points.pA.shift(angle + 180, dist * 0.35) + to: points.pA.shift(angle + 180, dist * 0.35), }) if (sa) { @@ -292,61 +292,61 @@ export default function (part) { if (paperless) { macro('ld', { from: points.topOfVent, - to: points.p11 + to: points.p11, }) macro('ld', { from: points.p2, to: points.p4, - d: 15 + d: 15, }) tempP = paths.sideSeam.intersectsY(points.p3.y)[0] macro('ld', { from: points.p5, - to: tempP + to: tempP, }) macro('ld', { from: points.p3, - to: tempP + to: tempP, }) macro('hd', { from: points.p2, to: points.p4, - y: points.p2.y + y: points.p2.y, }) macro('hd', { from: points.p10, to: points.p11, - y: points.p10.y - 15 + y: points.p10.y - 15, }) macro('vd', { from: points.p2, to: points.p3, - x: points.p3.x + x: points.p3.x, }) macro('vd', { from: points.p2, to: points.p4, - x: points.p2.x + x: points.p2.x, }) macro('vd', { from: points.p3, to: points.p10, - x: points.p3.x + x: points.p3.x, }) macro('ld', { from: points.p2, to: points.p5, - d: -15 + d: -15, }) macro('ld', { from: points.p4, to: points.p11, - d: -15 + d: -15, }) macro('ld', { from: tempP, to: points.p4, - d: 0 + d: 0, }) } diff --git a/packages/cornelius/src/front.js b/packages/cornelius/src/front.js index 2c42c9308bb..bf5fa3e7542 100644 --- a/packages/cornelius/src/front.js +++ b/packages/cornelius/src/front.js @@ -10,7 +10,7 @@ export default function (part) { sa, store, paperless, - macro + macro, } = part.shorthand() const cc = 0.551915024494 // circle constant @@ -147,7 +147,7 @@ export default function (part) { macro('title', { nr: 76, at: points.title, - title: 'Front' + title: 'Front', }) points.__titleNr.attr('data-text-class', 'center') points.__titleName.attr('data-text-class', 'center') @@ -158,7 +158,7 @@ export default function (part) { macro('grainline', { from: points.pocketBL.shiftFractionTowards(points.pocketTL, -0.9), - to: points.pocketTL + to: points.pocketTL, }) if (sa) { @@ -170,69 +170,69 @@ export default function (part) { if (paperless) { macro('ld', { from: points.topOfVent, - to: points.pJ + to: points.pJ, }) macro('hd', { from: points.pocketSide, to: points.pocketWaist, - y: points.pocketWaist.y + 15 + y: points.pocketWaist.y + 15, }) macro('hd', { from: points.pW, to: points.pocketWaist, - y: points.pocketWaist.y + 15 + y: points.pocketWaist.y + 15, }) macro('hd', { from: points.pocketWaist, to: points.flyTop, - y: points.pocketWaist.y + 15 + y: points.pocketWaist.y + 15, }) macro('hd', { from: points.pAextra, - to: points.pR + to: points.pR, }) macro('hd', { from: points.pK, to: points.pJ, - y: points.pJ.y - 15 + y: points.pJ.y - 15, }) // Keystone original (see above): if (keystone) { macro('hd', { from: points.pSlitBottom, to: points.pJ, - y: points.pJ.y - 30 + y: points.pJ.y - 30, }) macro('vd', { from: points.pSlitTop, to: points.pSlitBottom, - x: points.pSlitTop.x + 15 + x: points.pSlitTop.x + 15, }) } macro('vd', { from: points.pocketSide, to: points.pocketWaist, - x: points.pocketSide.x + x: points.pocketSide.x, }) macro('vd', { from: points.pW, to: points.pR, - x: points.pR.x + x: points.pR.x, }) macro('vd', { from: points.pR, to: points.pK, - x: points.pR.x + x: points.pR.x, }) macro('vd', { from: points.pW, to: points.pZ, - x: points.pW.x + 15 + x: points.pW.x + 15, }) macro('vd', { from: points.pJ, to: points.pocketWaist, - x: points.pocketWaist.x + x: points.pocketWaist.x, }) } diff --git a/packages/cornelius/src/legband.js b/packages/cornelius/src/legband.js index 630d6aca588..1832f933d94 100644 --- a/packages/cornelius/src/legband.js +++ b/packages/cornelius/src/legband.js @@ -35,7 +35,7 @@ export default function (part) { sa, store, paperless, - macro + macro, } = part.shorthand() if (options.cuffStyle == 'keystone') { @@ -138,7 +138,7 @@ export default function (part) { macro('title', { nr: 78, at: points.title, - title: 'LegBand' + title: 'LegBand', }) points.__titleNr.attr('data-text-class', 'center') points.__titleName.attr('data-text-class', 'center') @@ -154,34 +154,34 @@ export default function (part) { macro('hd', { from: points.pA, to: points.pF, - y: points.pA.y + y: points.pA.y, }) if (traditional) { macro('hd', { from: points.pB, to: points.pC, - y: points.pB.y + y: points.pB.y, }) } macro('ld', { from: points.pD, to: points.pC, - d: +sa + 15 + d: +sa + 15, }) macro('ld', { from: points.pA, to: points.pAout, - d: +sa + 15 + d: +sa + 15, }) macro('vd', { from: points.pB, to: points.pA, - x: points.pA.x - sa - 15 + x: points.pA.x - sa - 15, }) macro('vd', { from: points.pC, to: points.pB, - x: points.pC.x - (traditional ? 0 : sa + 15) + x: points.pC.x - (traditional ? 0 : sa + 15), }) } diff --git a/packages/cornelius/src/legbandkeystone.js b/packages/cornelius/src/legbandkeystone.js index e2d24549f92..1aa5a2b8300 100644 --- a/packages/cornelius/src/legbandkeystone.js +++ b/packages/cornelius/src/legbandkeystone.js @@ -12,7 +12,7 @@ export default function (part) { sa, store, paperless, - macro + macro, } = part.shorthand() if (options.cuffStyle != 'keystone') { @@ -107,7 +107,7 @@ export default function (part) { macro('title', { nr: 78, at: points.title, - title: 'LegBand' + title: 'LegBand', }) if (sa) { @@ -120,57 +120,57 @@ export default function (part) { macro('hd', { from: points.pCout, to: points.pF, - y: points.pA.y - sa - 15 + y: points.pA.y - sa - 15, }) macro('hd', { from: points.pF, to: points.pE, - y: points.pA.y - sa - 15 + y: points.pA.y - sa - 15, }) macro('hd', { from: points.pE, to: points.pA, - y: points.pA.y - sa - 15 + y: points.pA.y - sa - 15, }) macro('hd', { from: points.pHout, to: points.pG, - y: points.pG.y + sa + 15 + y: points.pG.y + sa + 15, }) macro('ld', { from: points.pC, to: points.pB1, - d: 15 + d: 15, }) macro('ld', { from: points.pB1, to: points.pB2, - d: 15 + d: 15, }) macro('ld', { from: points.pB2, to: points.pB3, - d: 15 + d: 15, }) macro('ld', { from: points.pB3, to: points.pH, - d: 15 + d: 15, }) macro('ld', { from: points.pA, to: points.pG, - d: 15 + sa + d: 15 + sa, }) macro('vd', { from: points.pE, to: points.pJ, - x: points.pJ.x - 15 + x: points.pJ.x - 15, }) macro('vd', { from: points.pF, to: points.pA, - x: points.pF.x - 15 + x: points.pF.x - 15, }) } diff --git a/packages/cornelius/src/pocket.js b/packages/cornelius/src/pocket.js index e583e7940f4..affe9f12894 100644 --- a/packages/cornelius/src/pocket.js +++ b/packages/cornelius/src/pocket.js @@ -9,7 +9,7 @@ export default function (part) { sa, store, paperless, - macro + macro, } = part.shorthand() let halfInch = store.get('halfInch') @@ -77,7 +77,7 @@ export default function (part) { macro('title', { nr: 2, at: points.title, - title: 'Pocket' + title: 'Pocket', }) points.__titleNr.attr('data-text-class', 'center') points.__titleName.attr('data-text-class', 'center') @@ -93,62 +93,62 @@ export default function (part) { macro('hd', { from: points.mpocketFacingBR, to: points.mpocketWaist, - y: points.pU.y - sa - 15 + y: points.pU.y - sa - 15, }) macro('hd', { from: points.mpocketWaist, to: points.pocketTL, - y: points.pU.y - sa - 15 + y: points.pU.y - sa - 15, }) macro('hd', { from: points.pocketTL, to: points.pocketWaist, - y: points.pU.y - sa - 15 + y: points.pU.y - sa - 15, }) macro('hd', { from: points.pocketWaist, to: points.pU, - y: points.pU.y - sa - 15 + y: points.pU.y - sa - 15, }) macro('hd', { from: points.pU, to: points.pocketFacingBR, - y: points.pU.y - sa - 15 + y: points.pU.y - sa - 15, }) macro('hd', { from: points.pocketWaist, to: points.pocketFacingTL, - y: points.pU.y - sa - 15 + y: points.pU.y - sa - 15, }) macro('vd', { from: points.pU, to: points.pocketSide, - x: points.pocketSide.x + sa + 15 + x: points.pocketSide.x + sa + 15, }) macro('vd', { from: points.pocketTL, to: points.pocketBL, - x: points.pocketTL.x + 15 + x: points.pocketTL.x + 15, }) macro('vd', { from: points.pocketSide, to: points.mpocketWaist, - x: points.pocketSide.x + sa + 15 + x: points.pocketSide.x + sa + 15, }) macro('vd', { from: points.pocketSide, to: points.pocketFacingBR, - x: points.pocketSide.x + sa + 15 + x: points.pocketSide.x + sa + 15, }) macro('vd', { from: points.mpocketWaist, to: points.mpocketSide, - x: points.mpocketSide.x - sa - 15 + x: points.mpocketSide.x - sa - 15, }) macro('vd', { from: points.mpocketSide, to: points.mpocketFacingBR, - x: points.mpocketSide.x - sa - 15 + x: points.mpocketSide.x - sa - 15, }) } diff --git a/packages/cornelius/src/pocketfacing.js b/packages/cornelius/src/pocketfacing.js index 6c79d37f74f..842da126d20 100644 --- a/packages/cornelius/src/pocketfacing.js +++ b/packages/cornelius/src/pocketfacing.js @@ -10,7 +10,7 @@ export default function (part) { sa, store, paperless, - macro + macro, } = part.shorthand() let halfInch = store.get('halfInch') @@ -62,14 +62,14 @@ export default function (part) { macro('title', { nr: 3, at: points.title, - title: 'PocketFacing' + title: 'PocketFacing', }) // points.__titleNr.attr('data-text-class', 'center') // points.__titleName.attr('data-text-class', 'center') // points.__titlePattern.attr('data-text-class', 'center') macro('grainline', { from: points.pU, - to: new Point(points.pU.x, points.__titleNr.y) + to: new Point(points.pU.x, points.__titleNr.y), }) if (sa) { @@ -82,27 +82,27 @@ export default function (part) { macro('hd', { from: points.pU, to: points.pocketSide, - y: points.pU.y - sa - 15 + y: points.pU.y - sa - 15, }) macro('hd', { from: points.pU, to: points.pocketWaist, - y: points.pU.y - sa - 15 + y: points.pU.y - sa - 15, }) macro('hd', { from: points.pocketWaist, to: points.pocketFacingTL, - y: points.pU.y - sa - 15 + y: points.pU.y - sa - 15, }) macro('vd', { from: points.pU, to: points.pocketSide, - x: points.pocketSide.x + sa + 15 + x: points.pocketSide.x + sa + 15, }) macro('vd', { from: points.pocketSide, to: points.pocketFacingBR, - x: points.pocketSide.x + sa + 15 + x: points.pocketSide.x + sa + 15, }) } diff --git a/packages/cornelius/src/waistband.js b/packages/cornelius/src/waistband.js index a3e8c0fb7f8..6bce03b9b11 100644 --- a/packages/cornelius/src/waistband.js +++ b/packages/cornelius/src/waistband.js @@ -10,7 +10,7 @@ export default function (part) { sa, store, paperless, - macro + macro, } = part.shorthand() let halfInch = store.get('halfInch') @@ -41,7 +41,7 @@ export default function (part) { macro('cutonfold', { from: points.pC, - to: points.pB + to: points.pB, }) points.logo = points.pA.shiftFractionTowards(points.pC, 0.5) @@ -50,7 +50,7 @@ export default function (part) { macro('title', { nr: 1, at: points.title, - title: 'WaistBand' + title: 'WaistBand', }) points.__titleNr.attr('data-text-class', 'center') points.__titleName.attr('data-text-class', 'center') @@ -71,12 +71,12 @@ export default function (part) { macro('hd', { from: points.pD, to: points.pA, - y: points.pA.y - sa - 15 + y: points.pA.y - sa - 15, }) macro('vd', { from: points.pD, to: points.pC, - x: points.pC.x - sa - 15 + x: points.pC.x - sa - 15, }) } diff --git a/packages/create-freesewing-pattern/template/default/config/index.js b/packages/create-freesewing-pattern/template/default/config/index.js index 644dc51cbbb..04cf93b401a 100644 --- a/packages/create-freesewing-pattern/template/default/config/index.js +++ b/packages/create-freesewing-pattern/template/default/config/index.js @@ -19,10 +19,10 @@ export default { 'parametric design', '{{type}}', 'sewing', - 'sewing pattern' + 'sewing pattern', ], optionGroups: { - fit: ['size'] + fit: ['size'], }, measurements: [], dependencies: {}, @@ -30,6 +30,6 @@ export default { hide: [], parts: ['box'], options: { - size: { pct: 50, min: 10, max: 100 } - } + size: { pct: 50, min: 10, max: 100 }, + }, } diff --git a/packages/create-freesewing-pattern/template/default/src/box.js b/packages/create-freesewing-pattern/template/default/src/box.js index ce26efd6995..c125e539df4 100644 --- a/packages/create-freesewing-pattern/template/default/src/box.js +++ b/packages/create-freesewing-pattern/template/default/src/box.js @@ -10,7 +10,7 @@ export default function (part) { complete, sa, paperless, - macro + macro, } = part.shorthand() let w = 500 * options.size @@ -47,12 +47,12 @@ export default function (part) { macro('hd', { from: points.bottomLeft, to: points.bottomRight, - y: points.bottomLeft.y + sa + 15 + y: points.bottomLeft.y + sa + 15, }) macro('vd', { from: points.bottomRight, to: points.topRight, - x: points.topRight.x + sa + 15 + x: points.topRight.x + sa + 15, }) } diff --git a/packages/diana/config/index.js b/packages/diana/config/index.js index 0e6df12e224..8f7333737a4 100644 --- a/packages/diana/config/index.js +++ b/packages/diana/config/index.js @@ -17,7 +17,7 @@ export default { 'waistEase', 'hipsEase', 'lengthBonus', - 'sleeveLengthBonus' + 'sleeveLengthBonus', ], style: ['drapeAngle', 'shoulderSeamLength'], advanced: [ @@ -45,10 +45,10 @@ export default { 'sleevecapQ3Spread1', 'sleevecapQ3Spread2', 'sleevecapQ4Spread1', - 'sleevecapQ4Spread2' - ] - } - ] + 'sleevecapQ4Spread2', + ], + }, + ], }, measurements: [ 'biceps', @@ -61,21 +61,21 @@ export default { 'shoulderSlope', 'shoulderToShoulder', 'shoulderToWrist', - 'wrist' + 'wrist', ], dependencies: { frontBase: 'base', backBase: 'base', front: 'frontBase', back: 'backBase', - sleeve: ['sleeveBase', 'front', 'back'] + sleeve: ['sleeveBase', 'front', 'back'], }, inject: { frontBase: 'base', backBase: 'base', front: 'frontBase', back: 'backBase', - sleeve: 'sleeveBase' + sleeve: 'sleeveBase', }, hide: ['base', 'frontBase', 'backBase', 'sleeveBase'], options: { @@ -126,6 +126,6 @@ export default { sleevecapQ3Spread2: { pct: 8, min: 4, max: 20 }, sleevecapQ4Spread1: { pct: 7, min: 4, max: 20 }, sleevecapQ4Spread2: { pct: 7, min: 4, max: 20 }, - sleeveWidthGuarantee: { pct: 90, min: 25, max: 100 } - } + sleeveWidthGuarantee: { pct: 90, min: 25, max: 100 }, + }, } diff --git a/packages/diana/src/front.js b/packages/diana/src/front.js index 9cd81eed87f..f6c73386b51 100644 --- a/packages/diana/src/front.js +++ b/packages/diana/src/front.js @@ -10,7 +10,7 @@ export default (part) => { macro, options, Snippet, - snippets + snippets, } = part.shorthand() let front = true if (typeof points.cfHem === 'undefined') front = false @@ -36,7 +36,7 @@ export default (part) => { 'armholePitchCp2', 'shoulderCp1', 'shoulder', - 'neck' + 'neck', ] if (front) for (let p of rotateThese) points[p] = points[p].rotate(-options.drapeAngle, points.armhole) @@ -87,7 +87,7 @@ export default (part) => { macro('cutonfold', { from: points.cNeck, to: points.cHem, - grainline: true + grainline: true, }) if (sa) { @@ -106,53 +106,53 @@ export default (part) => { .curve(points.armholeCp2, points.armholeHollowCp1, points.armholeHollow) .curve(points.armholeHollowCp2, points.armholePitchCp1, points.armholePitch) .curve(points.armholePitchCp2, points.shoulderCp1, points.shoulder), - d: sa + 15 + d: sa + 15, }) macro('pd', { path: new Path() .move(points.armholePitch) .curve(points.armholePitchCp2, points.shoulderCp1, points.shoulder), - d: -15 + d: -15, }) macro('vd', { from: points.hips, to: points.waist, - x: points.hips.x + sa + 15 + x: points.hips.x + sa + 15, }) macro('vd', { from: points.hips, to: points.armhole, - x: points.hips.x + sa + 30 + x: points.hips.x + sa + 30, }) macro('vd', { from: points.hips, to: points.armholePitch, - x: points.hips.x + sa + 45 + x: points.hips.x + sa + 45, }) macro('vd', { from: points.hips, to: points.shoulder, - x: points.hips.x + sa + 60 + x: points.hips.x + sa + 60, }) macro('vd', { from: points.hips, to: points.neck, - x: points.hips.x + sa + 75 + x: points.hips.x + sa + 75, }) macro('ld', { from: points.neck, to: points.shoulder, d: sa + 15 }) macro('vd', { from: points.cHem, to: points.cNeck, - x: points.cHem.x - 15 + x: points.cHem.x - 15, }) macro('hd', { from: points.cHem, to: points.hem, - y: points.cHem.y + 3 * sa + 15 + y: points.cHem.y + 3 * sa + 15, }) macro('pd', { path: new Path().move(points.cNeck).curve(points.cfNeckCp1, points.neckCp2, points.neck), - d: -sa - 15 + d: -sa - 15, }) } diff --git a/packages/diana/src/sleeve.js b/packages/diana/src/sleeve.js index 06477ba61a1..8c7242fbf24 100644 --- a/packages/diana/src/sleeve.js +++ b/packages/diana/src/sleeve.js @@ -14,7 +14,7 @@ export default (part) => { if (complete) { macro('grainline', { from: points.centerWrist, - to: points.grainlineTo + to: points.grainlineTo, }) if (sa) { paths.saBase = new Path() @@ -35,26 +35,26 @@ export default (part) => { macro('vd', { from: points.wristLeft, to: points.bicepsLeft, - x: points.bicepsLeft.x - sa - 15 + x: points.bicepsLeft.x - sa - 15, }) macro('vd', { from: points.wristLeft, to: points.sleeveTip, - x: points.bicepsLeft.x - sa - 30 + x: points.bicepsLeft.x - sa - 30, }) macro('hd', { from: points.bicepsLeft, to: points.bicepsRight, - y: points.sleeveTip.y - sa - 30 + y: points.sleeveTip.y - sa - 30, }) macro('hd', { from: points.wristLeft, to: points.wristRight, - y: points.wristLeft.y + sa * 3 + 15 + y: points.wristLeft.y + sa * 3 + 15, }) macro('pd', { path: paths.sleevecap.reverse(), - d: -1 * sa - 15 + d: -1 * sa - 15, }) } diff --git a/packages/examples/config/index.js b/packages/examples/config/index.js index c29908951cd..da15d232d97 100644 --- a/packages/examples/config/index.js +++ b/packages/examples/config/index.js @@ -10,7 +10,7 @@ export default { difficulty: 1, tags: ['example'], optionGroups: { - fit: ['fixme'] + fit: ['fixme'], }, measurements: [], dependencies: { @@ -102,7 +102,7 @@ export default { 'utils_curveintersectsx', 'utils_splitcurve', 'docs_overview', - 'docs_coords' + 'docs_coords', ], options: { focus: '', @@ -110,7 +110,7 @@ export default { fixme: { pct: 50, min: 0, - max: 100 - } - } + max: 100, + }, + }, } diff --git a/packages/examples/src/index.js b/packages/examples/src/index.js index 03817030057..64efb12afdb 100644 --- a/packages/examples/src/index.js +++ b/packages/examples/src/index.js @@ -101,7 +101,7 @@ const Pattern = new freesewing.Design(config, [ pluginBundle, buttonsPlugin, mirrorPlugin, - bartackPlugin + bartackPlugin, ]) // Attach draft methods to prototype @@ -190,7 +190,7 @@ let methods = { draftUtils_curveintersectsy, draftUtils_splitcurve, draftDocs_overview, - draftDocs_coords + draftDocs_coords, } for (let m of Object.keys(methods)) Pattern.prototype[m] = methods[m] diff --git a/packages/examples/src/path_edge.js b/packages/examples/src/path_edge.js index a56e689e89c..b77b1df7e0a 100644 --- a/packages/examples/src/path_edge.js +++ b/packages/examples/src/path_edge.js @@ -24,7 +24,7 @@ export default (part) => { 'top', 'left', 'bottom', - 'right' + 'right', ]) snippets[i] = new Snippet('notch', paths.demo.edge(i)) diff --git a/packages/examples/src/path_length.js b/packages/examples/src/path_length.js index 76fa4acfa5c..103c2b21667 100644 --- a/packages/examples/src/path_length.js +++ b/packages/examples/src/path_length.js @@ -11,17 +11,17 @@ export default (part) => { macro('pd', { path: paths.example, - d: -20 + d: -20, }) macro('pd', { path: new Path().move(points.B).line(points.A), - d: 10 + d: 10, }) macro('pd', { path: new Path().move(points.B).curve(points.BCp2, points.CCp1, points.C), - d: -10 + d: -10, }) return part diff --git a/packages/examples/src/path_translate.js b/packages/examples/src/path_translate.js index 5b1fbb0b79f..2fdfb1068d4 100644 --- a/packages/examples/src/path_translate.js +++ b/packages/examples/src/path_translate.js @@ -16,12 +16,12 @@ export default (part) => { macro('ld', { from: points.B, to: points.step1, - noStartMarker: true + noStartMarker: true, }) macro('ld', { from: points.step1, to: points.step2, - noStartMarker: true + noStartMarker: true, }) return part diff --git a/packages/examples/src/plugin_bartack.js b/packages/examples/src/plugin_bartack.js index c1a1dc5dc4d..e9b39e4b407 100644 --- a/packages/examples/src/plugin_bartack.js +++ b/packages/examples/src/plugin_bartack.js @@ -8,7 +8,7 @@ export default (part) => { macro('bartack', { anchor: points.a, angle: 30, - length: 15 + length: 15, }) return box(part, 60, 30) diff --git a/packages/examples/src/plugin_bartackalong.js b/packages/examples/src/plugin_bartackalong.js index a71181aa22d..0d7d4ce06ff 100644 --- a/packages/examples/src/plugin_bartackalong.js +++ b/packages/examples/src/plugin_bartackalong.js @@ -13,12 +13,12 @@ export default (part) => { paths.a = new Path().move(points.a).curve(points.b, points.c, points.d).setRender(false) macro('bartackAlong', { - path: paths.a + path: paths.a, }) macro('sprinkle', { snippet: 'notch', - on: ['e', 'f'] + on: ['e', 'f'], }) return box(part, 60, 30) diff --git a/packages/examples/src/plugin_bartackfractionalong.js b/packages/examples/src/plugin_bartackfractionalong.js index 8fb2070a36b..0aac511e5c1 100644 --- a/packages/examples/src/plugin_bartackfractionalong.js +++ b/packages/examples/src/plugin_bartackfractionalong.js @@ -15,12 +15,12 @@ export default (part) => { macro('bartackFractionAlong', { path: paths.a, start: 0.2, - end: 0.8 + end: 0.8, }) macro('sprinkle', { snippet: 'notch', - on: ['e', 'f'] + on: ['e', 'f'], }) return box(part, 60, 30) diff --git a/packages/examples/src/plugin_cutonfold.js b/packages/examples/src/plugin_cutonfold.js index 15ef30df083..6b5c13b3ee2 100644 --- a/packages/examples/src/plugin_cutonfold.js +++ b/packages/examples/src/plugin_cutonfold.js @@ -16,7 +16,7 @@ export default (part) => { macro('cutonfold', { from: points.bottomLeft, to: points.bottomRight, - grainline: true + grainline: true, }) return part diff --git a/packages/examples/src/plugin_dimension.js b/packages/examples/src/plugin_dimension.js index c3370e26fb0..435b26aa80f 100644 --- a/packages/examples/src/plugin_dimension.js +++ b/packages/examples/src/plugin_dimension.js @@ -18,31 +18,31 @@ export default (part) => { macro('vd', { from: points.A, to: points.B, - x: points.A.x - 15 + x: points.A.x - 15, }) macro('hd', { from: points.B, to: points.C, - y: points.B.y + 15 + y: points.B.y + 15, }) macro('ld', { from: points.C, to: points.D, - d: -15 + d: -15, }) macro('ld', { from: points.C, to: points.D, d: -30, - text: 'Custom text' + text: 'Custom text', }) macro('pd', { path: new Path().move(points.A).curve(points.A, points.DCp1, points.D), - d: -15 + d: -15, }) return part diff --git a/packages/examples/src/plugin_grainline.js b/packages/examples/src/plugin_grainline.js index 28c2dcaa90e..c660d1141b8 100644 --- a/packages/examples/src/plugin_grainline.js +++ b/packages/examples/src/plugin_grainline.js @@ -8,7 +8,7 @@ export default (part) => { macro('grainline', { from: points.grainlineFrom, - to: points.grainlineTo + to: points.grainlineTo, }) return box(part, 110, 15) diff --git a/packages/examples/src/plugin_mirror.js b/packages/examples/src/plugin_mirror.js index 885ff92b0da..221e0e7a173 100644 --- a/packages/examples/src/plugin_mirror.js +++ b/packages/examples/src/plugin_mirror.js @@ -14,12 +14,12 @@ export default (part) => { macro('mirror', { mirror: [points.b, points.d], points: [points.mid], - paths: [paths.a] + paths: [paths.a], }) macro('sprinkle', { snippet: 'notch', - on: ['mid', 'mirroredMid'] + on: ['mid', 'mirroredMid'], }) return box(part, 100, 40) diff --git a/packages/examples/src/plugin_round.js b/packages/examples/src/plugin_round.js index 4b6871fb228..92bca867ef7 100644 --- a/packages/examples/src/plugin_round.js +++ b/packages/examples/src/plugin_round.js @@ -20,7 +20,7 @@ export default (part) => { via: points.bottomLeft, radius: 10, prefix: 'bl', - render: true + render: true, }) macro('round', { from: points.bottomRight, @@ -28,7 +28,7 @@ export default (part) => { via: points.topRight, radius: 20, prefix: 'tr', - render: true + render: true, }) return part diff --git a/packages/examples/src/plugin_sprinkle.js b/packages/examples/src/plugin_sprinkle.js index cc75ff882e9..1fcf834b7b0 100644 --- a/packages/examples/src/plugin_sprinkle.js +++ b/packages/examples/src/plugin_sprinkle.js @@ -15,7 +15,7 @@ export default (part) => { macro('sprinkle', { snippet: 'button', - on: ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i'] + on: ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i'], }) return box(part, 100, 25) diff --git a/packages/examples/src/plugin_title.js b/packages/examples/src/plugin_title.js index 4448c27c374..18bdecb41a8 100644 --- a/packages/examples/src/plugin_title.js +++ b/packages/examples/src/plugin_title.js @@ -9,7 +9,7 @@ export default (part) => { at: points.title, nr: 4, title: 'sleeve', - prefix: 'test' + prefix: 'test', }) return box(part, 200, 70) diff --git a/packages/examples/src/point_dist.js b/packages/examples/src/point_dist.js index 076ad56a31d..91599ad09ad 100644 --- a/packages/examples/src/point_dist.js +++ b/packages/examples/src/point_dist.js @@ -6,7 +6,7 @@ export default (part) => { macro('ld', { from: points.from, - to: points.to + to: points.to, }) return part diff --git a/packages/examples/src/point_dx.js b/packages/examples/src/point_dx.js index 8d6df632993..bb27f06eebd 100644 --- a/packages/examples/src/point_dx.js +++ b/packages/examples/src/point_dx.js @@ -7,7 +7,7 @@ export default (part) => { macro('hd', { from: points.from, to: points.to, - y: 25 + y: 25, }) return part diff --git a/packages/examples/src/point_dy.js b/packages/examples/src/point_dy.js index f7ca3e92390..dec315dbcbb 100644 --- a/packages/examples/src/point_dy.js +++ b/packages/examples/src/point_dy.js @@ -7,7 +7,7 @@ export default (part) => { macro('vd', { from: points.to, to: points.from, - x: 50 + x: 50, }) return part diff --git a/packages/examples/src/point_shift.js b/packages/examples/src/point_shift.js index d63fc5c5bf3..503962ff107 100644 --- a/packages/examples/src/point_shift.js +++ b/packages/examples/src/point_shift.js @@ -11,7 +11,7 @@ export default (part) => { macro('ld', { from: points.B, to: points.A, - d: -10 + d: -10, }) return box(part, 100, 45) diff --git a/packages/examples/src/point_shiftfractiontowards.js b/packages/examples/src/point_shiftfractiontowards.js index a3990824c51..66838f262c7 100644 --- a/packages/examples/src/point_shiftfractiontowards.js +++ b/packages/examples/src/point_shiftfractiontowards.js @@ -13,13 +13,13 @@ export default (part) => { macro('ld', { from: points.C, to: points.A, - d: -10 + d: -10, }) macro('ld', { from: points.B, to: points.A, - d: 20 + d: 20, }) return part diff --git a/packages/examples/src/point_shiftoutwards.js b/packages/examples/src/point_shiftoutwards.js index 5a718b30994..c430c15d60b 100644 --- a/packages/examples/src/point_shiftoutwards.js +++ b/packages/examples/src/point_shiftoutwards.js @@ -14,7 +14,7 @@ export default (part) => { macro('ld', { from: points.C, to: points.B, - d: -10 + d: -10, }) return box(part, 110, 75) diff --git a/packages/examples/src/point_shifttowards.js b/packages/examples/src/point_shifttowards.js index 6da52de18f7..181b2a272ac 100644 --- a/packages/examples/src/point_shifttowards.js +++ b/packages/examples/src/point_shifttowards.js @@ -15,7 +15,7 @@ export default (part) => { macro('ld', { from: points.C, to: points.A, - d: -10 + d: -10, }) return box(part, 110, 80) diff --git a/packages/examples/src/point_translate.js b/packages/examples/src/point_translate.js index b25fc631459..abed95760b8 100644 --- a/packages/examples/src/point_translate.js +++ b/packages/examples/src/point_translate.js @@ -14,7 +14,7 @@ export default (part) => { from: points.A, to: points.B, text: 'translate(120,60)', - noStartMarker: true + noStartMarker: true, }) return box(part, 150, 85) diff --git a/packages/florence/config/index.js b/packages/florence/config/index.js index 071ff67ec48..f4b7a48779f 100644 --- a/packages/florence/config/index.js +++ b/packages/florence/config/index.js @@ -10,13 +10,13 @@ export default { difficulty: 1, tags: [], optionGroups: { - fit: ['height', 'length', 'curve'] + fit: ['height', 'length', 'curve'], }, measurements: ['head'], parts: ['mask'], options: { length: { pct: 40, min: 35, max: 45 }, height: { pct: 26, min: 23, max: 29 }, - curve: { pct: 12.5, min: 10, max: 15 } - } + curve: { pct: 12.5, min: 10, max: 15 }, + }, } diff --git a/packages/florence/src/mask.js b/packages/florence/src/mask.js index dfc135a81ed..39a86f39809 100644 --- a/packages/florence/src/mask.js +++ b/packages/florence/src/mask.js @@ -12,7 +12,7 @@ export default (part) => { Snippet, snippets, macro, - utils + utils, } = part.shorthand() points.topLeft = new Point(0, 0) @@ -64,7 +64,7 @@ export default (part) => { at: points.title, nr: 1, title: 'mask', - scale: 0.5 + scale: 0.5, }) macro('miniscale', { at: points.logo.shift(-90, 20) }) @@ -94,37 +94,37 @@ export default (part) => { macro('hd', { from: points.bottomEdge, to: points.bottomTip, - y: points.bottomTip.y + sa + 15 + y: points.bottomTip.y + sa + 15, }) macro('hd', { from: points.bottomEdge, to: points.tipCenter, - y: points.bottomTip.y + sa + 30 + y: points.bottomTip.y + sa + 30, }) macro('hd', { from: points.topEdge, to: points.topTip, - y: points.topTip.y - sa - 15 + y: points.topTip.y - sa - 15, }) macro('vd', { from: points.bottomTip, to: points.bottomEdge, - x: points.bottomEdge.x - sa - 15 + x: points.bottomEdge.x - sa - 15, }) macro('vd', { from: points.bottomTip, to: points.topEdge, - x: points.bottomEdge.x - sa - 30 + x: points.bottomEdge.x - sa - 30, }) macro('vd', { from: points.bottomTip, to: points.topTip, - x: points.bottomEdge.x - sa - 45 + x: points.bottomEdge.x - sa - 45, }) macro('vd', { from: points.bottomTip, to: points.tipCenter, - x: points.tipCenter.x + sa + 15 + x: points.tipCenter.x + sa + 15, }) } } diff --git a/packages/florent/config/index.js b/packages/florent/config/index.js index 1592908b8a6..3f7ad2d8484 100644 --- a/packages/florent/config/index.js +++ b/packages/florent/config/index.js @@ -10,24 +10,24 @@ export default { difficulty: 2, tags: ['headwear', 'cap'], optionGroups: { - fit: ['headEase'] + fit: ['headEase'], }, measurements: ['head'], dependencies: { side: 'top', brimTop: 'brimBottom', - brimInterfacing: 'brimBottom' + brimInterfacing: 'brimBottom', }, inject: { side: 'top', brimTop: 'brimBottom', - brimInterfacing: 'brimBottom' + brimInterfacing: 'brimBottom', }, options: { // Constants topSide: 0.8, brim: 0, // Percentages - headEase: { pct: 2, min: 0, max: 5 } - } + headEase: { pct: 2, min: 0, max: 5 }, + }, } diff --git a/packages/florent/src/brimbottom.js b/packages/florent/src/brimbottom.js index 416d9a71b9b..e45453828c1 100644 --- a/packages/florent/src/brimbottom.js +++ b/packages/florent/src/brimbottom.js @@ -10,7 +10,7 @@ export default function (part) { Point, paths, Path, - measurements + measurements, } = part.shorthand() let scale = 1 @@ -52,11 +52,11 @@ export default function (part) { macro('title', { at: points.title, nr: 3, - title: 'brimBottom' + title: 'brimBottom', }) macro('grainline', { from: points.outerMid, - to: points.innerMid + to: points.innerMid, }) if (sa) paths.sa = paths.seam.offset(sa).attr('class', 'fabric sa') @@ -65,22 +65,22 @@ export default function (part) { macro('hd', { from: points.tipLeft, to: points.tipRight, - y: points.tipLeft.y - sa - 15 + y: points.tipLeft.y - sa - 15, }) macro('hd', { from: paths.seam.edge('left'), to: paths.seam.edge('right'), - y: points.tipLeft.y - sa - 30 + y: points.tipLeft.y - sa - 30, }) macro('vd', { from: points.outerMid, to: points.innerMid, - x: points.innerMid.x - 15 + x: points.innerMid.x - 15, }) macro('vd', { from: points.outerMid, to: points.tipRight, - x: points.tipRight.x + sa + 18 + x: points.tipRight.x + sa + 18, }) } } diff --git a/packages/florent/src/briminterfacing.js b/packages/florent/src/briminterfacing.js index 73953dd33af..dc5540828f3 100644 --- a/packages/florent/src/briminterfacing.js +++ b/packages/florent/src/briminterfacing.js @@ -42,28 +42,28 @@ export default function (part) { macro('title', { at: points.title, nr: 5, - title: 'brimInterfacing' + title: 'brimInterfacing', }) macro('grainline', { from: points.outerMid, - to: points.innerMid + to: points.innerMid, }) if (paperless) { macro('hd', { from: paths.seam.edge('left'), to: paths.seam.edge('right'), - y: points.tipLeft.y - sa - 15 + y: points.tipLeft.y - sa - 15, }) macro('vd', { from: paths.outset.edge('bottom'), to: paths.inset.edge('bottom'), - x: points.innerMid.x - 15 + x: points.innerMid.x - 15, }) macro('vd', { from: paths.outset.edge('bottom'), to: paths.inset.edge('topRight'), - x: points.tipRight.x + sa + 18 + x: points.tipRight.x + sa + 18, }) } } diff --git a/packages/florent/src/brimtop.js b/packages/florent/src/brimtop.js index 20296e6583e..90b84a410e6 100644 --- a/packages/florent/src/brimtop.js +++ b/packages/florent/src/brimtop.js @@ -19,11 +19,11 @@ export default function (part) { macro('title', { at: points.title, nr: 4, - title: 'brimTop' + title: 'brimTop', }) macro('grainline', { from: points.outerMid, - to: points.innerMid + to: points.innerMid, }) if (sa) @@ -38,17 +38,17 @@ export default function (part) { macro('hd', { from: paths.seam.edge('left'), to: paths.seam.edge('right'), - y: points.tipLeft.y - sa - 15 + y: points.tipLeft.y - sa - 15, }) macro('vd', { from: bottom, to: points.innerMid, - x: points.innerMid.x - 15 + x: points.innerMid.x - 15, }) macro('vd', { from: bottom, to: points.tipRight, - x: points.tipRight.x + sa + 18 + x: points.tipRight.x + sa + 18, }) } } diff --git a/packages/florent/src/side.js b/packages/florent/src/side.js index c520f87754c..4bd4e1cb9a5 100644 --- a/packages/florent/src/side.js +++ b/packages/florent/src/side.js @@ -14,7 +14,7 @@ export default function (part) { macro('title', { at: points.title, nr: 2, - title: 'side' + title: 'side', }) points.logo = points.tipCp2.shiftFractionTowards(points.outerTopCp1, 0.5) snippets.logo = new Snippet('logo', points.logo).attr('data-scale', 0.75) @@ -22,7 +22,7 @@ export default function (part) { from: points.foldBottom, to: points.foldTop, offset: 15, - grainline: true + grainline: true, }) if (sa) { @@ -38,27 +38,27 @@ export default function (part) { macro('vd', { from: points.tip, to: points.foldBottom, - x: points.tip.x + sa + 15 + x: points.tip.x + sa + 15, }) macro('vd', { from: points.outerTop, to: points.foldBottom, - x: points.tip.x + sa + 30 + x: points.tip.x + sa + 30, }) macro('hd', { from: points.foldTop, to: points.foldBottom, - y: points.foldTop.y - 15 + y: points.foldTop.y - 15, }) macro('hd', { from: points.foldTop, to: points.outerTop, - y: points.outerTop.y + sa + 15 + y: points.outerTop.y + sa + 15, }) macro('hd', { from: points.foldTop, to: points.tip, - y: points.outerTop.y + sa + 30 + y: points.outerTop.y + sa + 30, }) } } diff --git a/packages/florent/src/top.js b/packages/florent/src/top.js index 1b7033eda27..ccdb34157b1 100644 --- a/packages/florent/src/top.js +++ b/packages/florent/src/top.js @@ -9,7 +9,7 @@ export default function (part) { paths, snippets, Snippet, - complete + complete, } = part.shorthand() const fitCap = (part, scale) => { @@ -140,7 +140,7 @@ export default function (part) { macro('title', { at: points.title, nr: 1, - title: 'top' + title: 'top', }) points.logo = new Point(points.title.x / 2, points.title.y) snippets.logo = new Snippet('logo', points.logo).attr('data-scale', 0.75) @@ -148,7 +148,7 @@ export default function (part) { points.grainlineTo = points.midBack.clone() macro('grainline', { from: points.grainlineFrom, - to: points.grainlineTo + to: points.grainlineTo, }) macro('miniscale', { at: new Point(points.title.x * 0.75, points.title.y) }) @@ -158,42 +158,42 @@ export default function (part) { macro('vd', { from: points.midSide, to: points.foldTop, - x: points.foldTop.x - sa - 15 + x: points.foldTop.x - sa - 15, }) macro('vd', { from: points.backHollow, to: points.midMid, - x: points.midMid.x - 15 + x: points.midMid.x - 15, }) macro('vd', { from: points.midBack, to: points.midMid, - x: points.midBack.x + sa + 15 + x: points.midBack.x + sa + 15, }) macro('vd', { from: points.backEdge, to: points.midMid, - x: points.midBack.x + sa + 30 + x: points.midBack.x + sa + 30, }) macro('hd', { from: points.foldTop, to: points.midSide, - y: points.midSide.y + sa + 15 + y: points.midSide.y + sa + 15, }) macro('hd', { from: points.foldTop, to: points.backHollow, - y: points.midSide.y + sa + 30 + y: points.midSide.y + sa + 30, }) macro('hd', { from: points.foldTop, to: points.backEdge, - y: points.midSide.y + sa + 45 + y: points.midSide.y + sa + 45, }) macro('hd', { from: points.foldTop, to: points.midBack, - y: points.midSide.y + sa + 60 + y: points.midSide.y + sa + 60, }) } } diff --git a/packages/holmes/config/index.js b/packages/holmes/config/index.js index 3cd266ee2c8..6e4fc82c547 100644 --- a/packages/holmes/config/index.js +++ b/packages/holmes/config/index.js @@ -12,7 +12,7 @@ export default { difficulty: 3, tags: ['hat'], optionGroups: { - style: ['lengthRatio', 'goreNumber', 'brimAngle', 'brimWidth'] + style: ['lengthRatio', 'goreNumber', 'brimAngle', 'brimWidth'], }, measurements: ['head'], dependencies: {}, @@ -23,6 +23,6 @@ export default { lengthRatio: { pct: 55, min: 40, max: 60 }, goreNumber: { count: 6, min: 4, max: 20 }, brimAngle: { deg: 45, min: 10, max: 90 }, - brimWidth: { mm: 30, min: 5, max: 100 } - } + brimWidth: { mm: 30, min: 5, max: 100 }, + }, } diff --git a/packages/holmes/src/brim.js b/packages/holmes/src/brim.js index a3cd3278a08..52dcff0ccb1 100644 --- a/packages/holmes/src/brim.js +++ b/packages/holmes/src/brim.js @@ -9,7 +9,7 @@ export default function (part) { complete, sa, paperless, - macro + macro, } = part.shorthand() let headRadius = measurements.head / 2 / Math.PI @@ -62,17 +62,17 @@ export default function (part) { macro('hd', { from: points.in2Flipped, to: points.in2, - y: points.ex1.y + 15 + sa + y: points.ex1.y + 15 + sa, }) macro('vd', { from: points.ex1, to: points.in1, - x: points.in2Flipped.x - 15 - sa + x: points.in2Flipped.x - 15 - sa, }) macro('vd', { from: points.ex1, to: points.in2Flipped, - x: points.in2Flipped.x - 30 - sa + x: points.in2Flipped.x - 30 - sa, }) } } diff --git a/packages/holmes/src/ear.js b/packages/holmes/src/ear.js index c416ad18771..0c771b56043 100644 --- a/packages/holmes/src/ear.js +++ b/packages/holmes/src/ear.js @@ -11,7 +11,7 @@ export default function (part) { snippets, Snippet, paperless, - macro + macro, } = part.shorthand() // Design pattern here @@ -49,12 +49,12 @@ export default function (part) { macro('hd', { from: points.bottomFlipped, to: points.bottom, - y: points.bottom.y + 15 + sa + y: points.bottom.y + 15 + sa, }) macro('vd', { from: points.bottomFlipped, to: points.top, - x: points.bottomFlipped.x - 15 - sa + x: points.bottomFlipped.x - 15 - sa, }) } } diff --git a/packages/holmes/src/gore.js b/packages/holmes/src/gore.js index 665db090061..ce5592340aa 100644 --- a/packages/holmes/src/gore.js +++ b/packages/holmes/src/gore.js @@ -9,7 +9,7 @@ export default function (part) { macro, complete, sa, - paperless + paperless, } = part.shorthand() // Design pattern here @@ -25,7 +25,7 @@ export default function (part) { goreNumber: options.goreNumber, extraLength: ((options.lengthRatio - 0.5) * measurements.head) / 2, prefix: 'gore_', - render: true + render: true, }) // Complete? @@ -37,7 +37,7 @@ export default function (part) { from: points.p0, to: points.gore_p1.shift(180, 20), offset: -points.gore_p2.y / 6, - grainline: true + grainline: true, }) if (sa) { @@ -62,12 +62,12 @@ export default function (part) { macro('hd', { from: points.p0, to: points.gore_p1, - y: -points.p0.x + 15 + y: -points.p0.x + 15, }) macro('vd', { from: points.p0, to: points.gore_p3, - x: points.p0.x - 15 - sa + x: points.p0.x - 15 - sa, }) } } diff --git a/packages/hortensia/config/index.js b/packages/hortensia/config/index.js index 243f4309e37..cfe72e9ae50 100644 --- a/packages/hortensia/config/index.js +++ b/packages/hortensia/config/index.js @@ -12,7 +12,7 @@ export default { difficulty: 3, tags: ['handbag', 'accessories'], optionGroups: { - style: ['size', 'zipperSize', 'strapLength', 'handleWidth'] + style: ['size', 'zipperSize', 'strapLength', 'handleWidth'], }, measurements: [], dependencies: { @@ -20,7 +20,7 @@ export default { bottompanel: 'sidepanel', frontpanel: 'sidepanel', sidepanelreinforcement: 'sidepanel', - zipperpanel: 'sidepanel' + zipperpanel: 'sidepanel', }, options: { width: 230, @@ -32,6 +32,6 @@ export default { strapLength: { pct: 160, min: 75, max: 250 }, handleWidth: { mm: 20, min: 7, max: 30 }, size: { pct: 50, min: 20, max: 200 }, - zipperSize: { dflt: '#5', list: ['#3', '#4', '#4.5', '#5', '#6', '#8', '#10', 'Invisible'] } - } + zipperSize: { dflt: '#5', list: ['#3', '#4', '#4.5', '#5', '#6', '#8', '#10', 'Invisible'] }, + }, } diff --git a/packages/hortensia/src/bottompanel.js b/packages/hortensia/src/bottompanel.js index 5786819d6c7..08f1eb07ca7 100644 --- a/packages/hortensia/src/bottompanel.js +++ b/packages/hortensia/src/bottompanel.js @@ -11,7 +11,7 @@ export default function (part) { complete, sa, paperless, - macro + macro, } = part.shorthand() let w = store.get('bottomPanelLength') @@ -40,7 +40,7 @@ export default function (part) { macro('title', { at: points.title, nr: 3, - title: 'BottomPanel' + title: 'BottomPanel', }) points.__titleNr.attr('data-text-class', 'center') points.__titleName.attr('data-text-class', 'center') @@ -51,7 +51,7 @@ export default function (part) { if (scaleBoxMove > 50 && w > 100) { points.scaleBox = points.logo.shift(90, scaleBoxMove) macro('scalebox', { - at: points.scaleBox + at: points.scaleBox, }) } @@ -65,12 +65,12 @@ export default function (part) { macro('hd', { from: points.bottomLeft, to: points.bottomRight, - y: points.bottomLeft.y + sa + 15 + y: points.bottomLeft.y + sa + 15, }) macro('vd', { from: points.bottomRight, to: points.topRight, - x: points.topRight.x + sa + 15 + x: points.topRight.x + sa + 15, }) } diff --git a/packages/hortensia/src/frontpanel.js b/packages/hortensia/src/frontpanel.js index 206dcbaf677..8f9a2c3872a 100644 --- a/packages/hortensia/src/frontpanel.js +++ b/packages/hortensia/src/frontpanel.js @@ -11,7 +11,7 @@ export default function (part) { complete, sa, paperless, - macro + macro, } = part.shorthand() let w = store.get('frontPanelLength') @@ -70,13 +70,13 @@ export default function (part) { macro('crossBox', { from: points.attachPoint1TL, to: points.attachPoint1BR, - text: 'attachment' + text: 'attachment', }) macro('crossBox', { from: points.attachPoint2TL, to: points.attachPoint2BR, - text: 'attachment' + text: 'attachment', }) // Complete? @@ -88,7 +88,7 @@ export default function (part) { macro('title', { at: points.title, nr: 2, - title: 'FrontBackPanel' + title: 'FrontBackPanel', }) points.__titleNr.attr('data-text-class', 'center') points.__titleName.attr('data-text-class', 'center') @@ -104,32 +104,32 @@ export default function (part) { macro('hd', { from: points.bottomLeft, to: points.bottomRight, - y: points.bottomLeft.y + sa + 15 + y: points.bottomLeft.y + sa + 15, }) macro('hd', { from: points.topLeft, to: points.attachPoint1TL, - y: points.attachPoint1TL.y + y: points.attachPoint1TL.y, }) macro('hd', { from: points.topLeft, to: points.attachPoint2TLtemp, - y: points.attachPoint2TLtemp.y + y: points.attachPoint2TLtemp.y, }) macro('vd', { from: points.bottomRight, to: points.topRight, - x: points.topRight.x + sa + 15 + x: points.topRight.x + sa + 15, }) macro('vd', { from: points.topLeft, to: points.attachPoint1TL, - x: points.attachPoint1TL.x + x: points.attachPoint1TL.x, }) macro('vd', { from: points.attachPoint2TLtemp, to: points.bottomLeft, - x: points.attachPoint2TLtemp.x + x: points.attachPoint2TLtemp.x, }) } diff --git a/packages/hortensia/src/sidepanel.js b/packages/hortensia/src/sidepanel.js index da864f7b96a..05afcd2581f 100644 --- a/packages/hortensia/src/sidepanel.js +++ b/packages/hortensia/src/sidepanel.js @@ -13,7 +13,7 @@ export default function (part) { complete, sa, paperless, - macro + macro, } = part.shorthand() const c = 0.551915024494 // circle constant @@ -27,7 +27,7 @@ export default function (part) { ['#5', 6.2], ['#6', 7], ['#8', 8], - ['#10', 10.6] + ['#10', 10.6], ]) const w = options.width * options.size @@ -146,7 +146,7 @@ export default function (part) { macro('title', { at: points.title, nr: 1, - title: 'SidePanel' + title: 'SidePanel', }) points.__titleNr.attr('data-text-class', 'center') @@ -173,37 +173,37 @@ export default function (part) { macro('hd', { from: points.bottomLeftU, to: points.bottomRightU, - y: points.bottomLeft.y + sa + 15 + y: points.bottomLeft.y + sa + 15, }) macro('hd', { from: points.topZipperPanelLeft, to: points.topZipperPanelRight, - y: points.topZipperPanelRight.y + 15 + y: points.topZipperPanelRight.y + 15, }) macro('vd', { from: points.bottomRightL, to: points.topMiddle, - x: points.topRight.x + sa + 15 + x: points.topRight.x + sa + 15, }) macro('vd', { from: points.bottomRightL, to: points.shoulderRight, - x: points.bottomRightL.x + x: points.bottomRightL.x, }) macro('ld', { from: points.topCenter, to: points.topCircleLeft, - noStartMarker: true + noStartMarker: true, }) macro('ld', { from: points.topCenter, to: points.topCircleRight, - noStartMarker: true + noStartMarker: true, }) macro('ld', { from: points.topCenter, to: points.topMiddle, - noStartMarker: true + noStartMarker: true, }) // macro('pd', { // path: pSidesAndTop, diff --git a/packages/hortensia/src/sidepanelreinforcement.js b/packages/hortensia/src/sidepanelreinforcement.js index 9f398c731c7..56aca5eb2bc 100644 --- a/packages/hortensia/src/sidepanelreinforcement.js +++ b/packages/hortensia/src/sidepanelreinforcement.js @@ -34,7 +34,7 @@ export default function (part) { at: points.title, nr: 4, title: 'SidePanelReinforcement', - scale: 0.25 + scale: 0.25, }) points.__titleNr.attr('data-text-class', 'center') points.__titleName.attr('data-text-class', 'center') @@ -50,12 +50,12 @@ export default function (part) { macro('hd', { from: points.bottomLeftU, to: points.bottomRightU, - y: points.bottomLeft.y + sa + 15 + y: points.bottomLeft.y + sa + 15, }) macro('vd', { from: points.bottomRightL, to: points.topRight, - x: points.topRight.x + sa + 15 + x: points.topRight.x + sa + 15, }) } diff --git a/packages/hortensia/src/strap.js b/packages/hortensia/src/strap.js index 0884e98a233..ea3bfc03043 100644 --- a/packages/hortensia/src/strap.js +++ b/packages/hortensia/src/strap.js @@ -9,7 +9,7 @@ export default function (part) { complete, sa, paperless, - macro + macro, } = part.shorthand() let w = options.handleWidth @@ -49,7 +49,7 @@ export default function (part) { nr: 5, title: 'Strap', rotation: 90, - scale: 0.25 + scale: 0.25, }) points.__titleNr.attr('data-text-class', 'center') points.__titleName.attr('data-text-class', 'center') @@ -65,12 +65,12 @@ export default function (part) { macro('hd', { from: points.bottomLeft, to: points.bottomRight, - y: points.bottomLeft.y + sa + 15 + y: points.bottomLeft.y + sa + 15, }) macro('vd', { from: points.bottomRight, to: points.topRight, - x: points.topRight.x + sa + 15 + x: points.topRight.x + sa + 15, }) } diff --git a/packages/hortensia/src/zipperpanel.js b/packages/hortensia/src/zipperpanel.js index fbbb86ffcd8..3ea012f7431 100644 --- a/packages/hortensia/src/zipperpanel.js +++ b/packages/hortensia/src/zipperpanel.js @@ -37,12 +37,12 @@ export default function (part) { macro('hd', { from: points.bottomLeft, to: points.bottomRight, - y: points.bottomLeft.y + sa + 15 + y: points.bottomLeft.y + sa + 15, }) macro('vd', { from: points.bottomRight, to: points.topRight, - x: points.topRight.x + sa + 15 + x: points.topRight.x + sa + 15, }) } diff --git a/packages/huey/config/index.js b/packages/huey/config/index.js index 176e38d1700..c81edd3505c 100644 --- a/packages/huey/config/index.js +++ b/packages/huey/config/index.js @@ -17,7 +17,7 @@ export default { 'collarEase', 'shoulderEase', 'hipsEase', - 'ribbingStretch' + 'ribbingStretch', ], style: [ 'lengthBonus', @@ -31,7 +31,7 @@ export default { 'hoodCutback', 'hoodClosure', 'hoodDepth', - 'hoodAngle' + 'hoodAngle', ], advanced: [ 'acrossBackFactor', @@ -59,10 +59,10 @@ export default { 'sleevecapQ3Spread1', 'sleevecapQ3Spread2', 'sleevecapQ4Spread1', - 'sleevecapQ4Spread2' - ] - } - ] + 'sleevecapQ4Spread2', + ], + }, + ], }, measurements: [ 'biceps', @@ -75,7 +75,7 @@ export default { 'shoulderSlope', 'shoulderToShoulder', 'shoulderToWrist', - 'wrist' + 'wrist', ], dependencies: { backBase: 'base', @@ -85,7 +85,7 @@ export default { back: 'backBase', front: 'frontBase', sleeve: 'sleeveBase', - pocket: 'front' + pocket: 'front', }, inject: { backBase: 'base', @@ -94,7 +94,7 @@ export default { back: 'backBase', front: 'frontBase', sleeve: 'sleeveBase', - pocket: 'front' + pocket: 'front', }, hide: ['base', 'sleevecap', 'backBase', 'frontBase', 'sleeveBase'], parts: ['hood', 'waistband', 'cuff'], @@ -152,6 +152,6 @@ export default { hoodDepth: { pct: 8.5, min: 5, max: 12 }, ribbingStretch: { pct: 15, min: 0, max: 30 }, - hoodAngle: { deg: 5, min: 2, max: 8 } - } + hoodAngle: { deg: 5, min: 2, max: 8 }, + }, } diff --git a/packages/huey/src/back.js b/packages/huey/src/back.js index 14ac9a874ad..d3e67ab9b5b 100644 --- a/packages/huey/src/back.js +++ b/packages/huey/src/back.js @@ -12,7 +12,7 @@ export default function (part) { paperless, sa, options, - measurements + measurements, } = part.shorthand() // Clear paths from Brian @@ -62,7 +62,7 @@ export default function (part) { macro('cutonfold', { from: points.cbNeck, to: points.cbHem, - grainline: true + grainline: true, }) macro('scalebox', { at: new Point(points.armholePitch.x / 2, points.cbWaist.y) }) if (sa) { diff --git a/packages/huey/src/cuff.js b/packages/huey/src/cuff.js index d7f3766304d..f7258f38074 100644 --- a/packages/huey/src/cuff.js +++ b/packages/huey/src/cuff.js @@ -11,7 +11,7 @@ export default (part) => { macro('title', { at: points.title, nr: 7, - title: 'cuff' + title: 'cuff', }) } diff --git a/packages/huey/src/front.js b/packages/huey/src/front.js index 433fa7e154a..6921745c90b 100644 --- a/packages/huey/src/front.js +++ b/packages/huey/src/front.js @@ -12,7 +12,7 @@ export default function (part) { paperless, sa, options, - measurements + measurements, } = part.shorthand() // Clear paths from Brian diff --git a/packages/huey/src/hood.js b/packages/huey/src/hood.js index 97a4c433b0f..8749fe9d518 100644 --- a/packages/huey/src/hood.js +++ b/packages/huey/src/hood.js @@ -12,7 +12,7 @@ export default function (part) { Snippet, sa, options, - measurements + measurements, } = part.shorthand() let base = store.get('frontNeckSeamLength') + store.get('backNeckSeamLength') @@ -51,7 +51,7 @@ export default function (part) { macro('title', { at: points.title, nr: 5, - title: 'hood' + title: 'hood', }) if (sa) paths.sa = paths.seam.offset(sa).attr('class', 'fabric sa') } @@ -61,42 +61,42 @@ export default function (part) { macro('hd', { from: points.cfBottom, to: points.cbBottom, - y: points.cfBottom.y + sa + 15 + y: points.cfBottom.y + sa + 15, }) macro('hd', { from: points.cbBottom, to: points.backPitch, - y: points.cfBottom.y + sa + 15 + y: points.cfBottom.y + sa + 15, }) macro('hd', { from: points.cfTop, to: points.backPitch, - y: points.cfBottom.y + sa + 30 + y: points.cfBottom.y + sa + 30, }) macro('hd', { from: points.frontTop, to: points.backPitch, - y: points.frontTop.y - sa - 15 + y: points.frontTop.y - sa - 15, }) macro('ld', { from: points.cfBottom, to: points.cfTop, - d: -15 + d: -15, }) macro('ld', { from: points.cfBottom, to: points.cbBottom, - d: 15 + d: 15, }) macro('vd', { from: points.cfTop, to: points.frontTop, - x: points.cfBottom.x - sa - 15 + x: points.cfBottom.x - sa - 15, }) macro('vd', { from: points.cfBottom, to: points.frontTop, - x: points.cfBottom.x - sa - 30 + x: points.cfBottom.x - sa - 30, }) } diff --git a/packages/huey/src/pocket.js b/packages/huey/src/pocket.js index f2abeda937b..01844cc841e 100644 --- a/packages/huey/src/pocket.js +++ b/packages/huey/src/pocket.js @@ -9,7 +9,7 @@ export default function (part) { snippets, Snippet, sa, - options + options, } = part.shorthand() if (!options.pocket) return part @@ -37,12 +37,12 @@ export default function (part) { macro('title', { at: points.title, nr: 4, - title: 'pocket' + title: 'pocket', }) macro('cutonfold', { from: points.pocketCfTop, to: points.cfHem, - grainline: true + grainline: true, }) if (sa) { paths.sa = paths.seam.offset(sa).attr('class', 'fabric sa') @@ -54,27 +54,27 @@ export default function (part) { macro('hd', { from: points.cfHem, to: points.pocketHem, - y: points.cfHem.y + sa + 15 + y: points.cfHem.y + sa + 15, }) macro('hd', { from: points.cfHem, to: points.pocketTip, - y: points.cfHem.y + sa + 30 + y: points.cfHem.y + sa + 30, }) macro('hd', { from: points.pocketCfTop, to: points.pocketTopRight, - y: points.pocketCfTop.y - sa - 15 + y: points.pocketCfTop.y - sa - 15, }) macro('vd', { from: points.cfHem, to: points.pocketCfTop, - x: points.cfHem.x - sa - 15 + x: points.cfHem.x - sa - 15, }) macro('vd', { from: points.pocketHem, to: points.pocketTip, - x: points.pocketTip.x + sa + 15 + x: points.pocketTip.x + sa + 15, }) } diff --git a/packages/huey/src/shared.js b/packages/huey/src/shared.js index d9b6cebafb9..531ac33a002 100644 --- a/packages/huey/src/shared.js +++ b/packages/huey/src/shared.js @@ -12,71 +12,71 @@ export const sharedDimensions = function (part, s) { macro('hd', { from: points.cHem, to: points.hem, - y: points.cHem.y + 3 * sa + 15 + y: points.cHem.y + 3 * sa + 15, }) macro('ld', { from: new Point(0, points.armholePitch.y), - to: points.armholePitch + to: points.armholePitch, }) macro('hd', { from: points.cNeck, to: points.neck, - y: points.neck.y - sa - 15 + y: points.neck.y - sa - 15, }) macro('hd', { from: points.cNeck, to: points.shoulder, - y: points.neck.y - sa - 30 + y: points.neck.y - sa - 30, }) macro('hd', { from: points.cNeck, to: points.armhole, - y: points.neck.y - sa - 45 + y: points.neck.y - sa - 45, }) macro('ld', { from: points.neck, to: points.shoulder, - d: -15 + d: -15, }) macro('vd', { from: points.hem, to: points.armhole, - x: points.armhole.x + sa + 15 + x: points.armhole.x + sa + 15, }) macro('vd', { from: points.armhole, to: points.armholePitch, - x: points.armhole.x + sa + 15 + x: points.armhole.x + sa + 15, }) macro('vd', { from: points.armholePitch, to: points.shoulder, - x: points.armhole.x + sa + 15 + x: points.armhole.x + sa + 15, }) macro('vd', { from: points.armhole, to: points.shoulder, - x: points.armhole.x + sa + 30 + x: points.armhole.x + sa + 30, }) macro('vd', { from: points.armhole, to: points.neck, - x: points.armhole.x + sa + 45 + x: points.armhole.x + sa + 45, }) macro('vd', { from: points.cNeck, to: points.neck, - x: points.cNeck.x - 15 + x: points.cNeck.x - 15, }) macro('vd', { from: points.cHem, to: points.cNeck, - x: points.cNeck.x - 15 + x: points.cNeck.x - 15, }) macro('vd', { from: points.cHem, to: points.neck, - x: points.cNeck.x - 30 + x: points.cNeck.x - 30, }) } @@ -93,7 +93,7 @@ export const draftRibbing = function (part, length) { complete, paperless, macro, - units + units, } = part.shorthand() // Don't run this every time, except when sampling if (typeof store.get('ribbingHeight') === 'undefined' || part.context.settings.sample) { @@ -151,7 +151,7 @@ export const draftRibbing = function (part, length) { from: points.bottomRight, to: points.topRight, x: points.topRight.x - 25, - text: units(length) + text: units(length), }) } @@ -159,7 +159,7 @@ export const draftRibbing = function (part, length) { macro('hd', { from: points.topLeft, to: points.topRight, - y: points.topRight.y - sa - 15 + y: points.topRight.y - sa - 15, }) } } diff --git a/packages/huey/src/sleeve.js b/packages/huey/src/sleeve.js index b617b9eabcc..f37cad97c1d 100644 --- a/packages/huey/src/sleeve.js +++ b/packages/huey/src/sleeve.js @@ -9,7 +9,7 @@ export default function (part) { complete, sa, paperless, - macro + macro, } = part.shorthand() // Clear paths from Brian, but keep sleevecap @@ -43,7 +43,7 @@ export default function (part) { if (complete) { macro('grainline', { from: new Point(0, points.wristLeft.y), - to: new Point(0, points.backPitch.y) + to: new Point(0, points.backPitch.y), }) if (sa) { if (options.ribbing) paths.sa = paths.seam.offset(sa) @@ -65,22 +65,22 @@ export default function (part) { macro('hd', { from: points.wristLeft, to: points.wristRight, - y: points.wristLeft.y + hemSa + 15 + y: points.wristLeft.y + hemSa + 15, }) macro('hd', { from: points.bicepsLeft, to: points.bicepsRight, - y: points.sleeveTip.y - sa - 15 + y: points.sleeveTip.y - sa - 15, }) macro('vd', { from: points.wristLeft, to: points.bicepsLeft, - x: points.bicepsLeft.x - sa - 15 + x: points.bicepsLeft.x - sa - 15, }) macro('vd', { from: points.wristLeft, to: points.sleeveTip, - x: points.bicepsLeft.x - sa - 30 + x: points.bicepsLeft.x - sa - 30, }) } diff --git a/packages/huey/src/waistband.js b/packages/huey/src/waistband.js index 37821613128..8fca452afd6 100644 --- a/packages/huey/src/waistband.js +++ b/packages/huey/src/waistband.js @@ -11,7 +11,7 @@ export default function (part) { macro('title', { at: points.title, nr: 6, - title: 'waistband' + title: 'waistband', }) } return part diff --git a/packages/hugo/config/index.js b/packages/hugo/config/index.js index aa5c612d6c4..43b308d95d7 100644 --- a/packages/hugo/config/index.js +++ b/packages/hugo/config/index.js @@ -12,7 +12,7 @@ export default { optionGroups: { fit: ['bicepsEase', 'chestEase', 'cuffEase', 'hipsEase', 'ribbingStretch'], style: ['lengthBonus', 'sleeveLengthBonus', 'ribbingHeight'], - advanced: ['acrossBackFactor', 'backNeckCutout'] + advanced: ['acrossBackFactor', 'backNeckCutout'], }, measurements: [ 'biceps', @@ -25,7 +25,7 @@ export default { 'shoulderSlope', 'shoulderToShoulder', 'shoulderToWrist', - 'wrist' + 'wrist', ], parts: ['waistband', 'cuff'], dependencies: { @@ -39,7 +39,7 @@ export default { pocket: 'front', pocketFacing: 'pocket', hoodCenter: 'hoodSide', - hoodSide: ['front', 'back'] + hoodSide: ['front', 'back'], }, inject: { frontBase: 'base', @@ -49,7 +49,7 @@ export default { sleeveBase: 'sleevecap', sleeve: 'sleeveBase', pocket: 'front', - pocketFacing: 'pocket' + pocketFacing: 'pocket', }, hide: ['base', 'frontBase', 'backBase', 'sleeveBase', 'sleevecap'], options: { @@ -93,6 +93,6 @@ export default { lengthBonus: { pct: 10, min: 0, max: 20 }, sleeveLengthBonus: { pct: 2, min: 0, max: 10 }, ribbingStretch: { pct: 5, min: 0, max: 10 }, - ribbingHeight: { pct: 10, min: 4, max: 20 } - } + ribbingHeight: { pct: 10, min: 4, max: 20 }, + }, } diff --git a/packages/hugo/src/back.js b/packages/hugo/src/back.js index 09b155c1e51..62c1bf7cd55 100644 --- a/packages/hugo/src/back.js +++ b/packages/hugo/src/back.js @@ -17,7 +17,7 @@ export default function (part) { snippets, complete, paperless, - macro + macro, } = part.shorthand() // Remove notch inherited from Brian @@ -57,7 +57,7 @@ export default function (part) { macro('cutonfold', { from: points.cbNeck, to: points.cbRibbing, - grainline: true + grainline: true, }) points.title = new Point(points.armhole.x / 2, points.armhole.y) macro('title', { at: points.title, nr: 2, title: 'back' }) @@ -81,32 +81,32 @@ export default function (part) { macro('vd', { from: points.cbRibbing, to: points.cbNeck, - x: points.cbNeck.x - 15 + x: points.cbNeck.x - 15, }) macro('vd', { from: points.cbRibbing, to: points.raglanTipBack, - x: points.cbNeck.x - 30 + x: points.cbNeck.x - 30, }) macro('vd', { from: points.ribbing, to: points.armhole, - x: points.ribbing.x + 15 + sa + x: points.ribbing.x + 15 + sa, }) macro('hd', { from: points.cbNeck, to: points.raglanTipBack, - y: points.raglanTipBack.y - 15 - sa + y: points.raglanTipBack.y - 15 - sa, }) macro('hd', { from: points.raglanTipBack, to: points.armhole, - y: points.raglanTipBack.y - 15 - sa + y: points.raglanTipBack.y - 15 - sa, }) macro('hd', { from: points.cbRibbing, to: points.ribbing, - y: points.cbRibbing.y + 15 + sa + y: points.cbRibbing.y + 15 + sa, }) } diff --git a/packages/hugo/src/cuff.js b/packages/hugo/src/cuff.js index 0dcd2dc462e..2e02669730d 100644 --- a/packages/hugo/src/cuff.js +++ b/packages/hugo/src/cuff.js @@ -9,7 +9,7 @@ export default function (part) { paths, complete, paperless, - macro + macro, } = part.shorthand() let width = (measurements.hpsToWaistBack + measurements.waistToHips) * options.ribbingHeight * 2 @@ -38,7 +38,7 @@ export default function (part) { macro('title', { at: points.title, nr: 9, title: 'cuff' }) macro('grainline', { from: points.bottomLeft.shift(0, 20), - to: points.topLeft.shift(0, 20) + to: points.topLeft.shift(0, 20), }) } @@ -47,12 +47,12 @@ export default function (part) { macro('vd', { from: points.bottomRight, to: points.topRight, - x: points.topRight.x + sa + 15 + x: points.topRight.x + sa + 15, }) macro('hd', { from: points.bottomLeft, to: points.bottomRight, - y: points.bottomRight.y + sa + 15 + y: points.bottomRight.y + sa + 15, }) } diff --git a/packages/hugo/src/front.js b/packages/hugo/src/front.js index e4cab1777d0..79d9cb0d2d7 100644 --- a/packages/hugo/src/front.js +++ b/packages/hugo/src/front.js @@ -18,7 +18,7 @@ export default function (part) { measurements, complete, paperless, - macro + macro, } = part.shorthand() // Remove notch inherited from Brian @@ -105,7 +105,7 @@ export default function (part) { macro('cutonfold', { from: points.cfNeck, to: points.cfRibbing, - grainline: true + grainline: true, }) points.title = new Point(points.armhole.x / 2, points.armhole.y) macro('title', { at: points.title, nr: 1, title: 'front' }) @@ -129,47 +129,47 @@ export default function (part) { macro('vd', { from: points.cfRibbing, to: points.cfNeck, - x: points.cfNeck.x - 15 + x: points.cfNeck.x - 15, }) macro('vd', { from: points.cfRibbing, to: points.raglanTipFront, - x: points.cfNeck.x - 30 + x: points.cfNeck.x - 30, }) macro('vd', { from: points.ribbing, to: points.armhole, - x: points.ribbing.x + 15 + sa + x: points.ribbing.x + 15 + sa, }) macro('hd', { from: points.cfNeck, to: points.raglanTipFront, - y: points.raglanTipFront.y - 15 - sa + y: points.raglanTipFront.y - 15 - sa, }) macro('hd', { from: points.raglanTipFront, to: points.armhole, - y: points.raglanTipFront.y - 15 - sa + y: points.raglanTipFront.y - 15 - sa, }) macro('hd', { from: points.cfRibbing, to: points.pocketTop, - y: points.cfRibbing.y + 15 + sa + y: points.cfRibbing.y + 15 + sa, }) macro('hd', { from: points.cfRibbing, to: points.pocketTip, - y: points.cfRibbing.y + 30 + sa + y: points.cfRibbing.y + 30 + sa, }) macro('hd', { from: points.cfRibbing, to: points.ribbing, - y: points.cfRibbing.y + 45 + sa + y: points.cfRibbing.y + 45 + sa, }) macro('vd', { from: points.pocketHem, to: points.pocketTop, - x: points.pocketTip.x + 15 + x: points.pocketTip.x + 15, }) } diff --git a/packages/hugo/src/hoodcenter.js b/packages/hugo/src/hoodcenter.js index a6c6391668c..cb05d16fa1f 100644 --- a/packages/hugo/src/hoodcenter.js +++ b/packages/hugo/src/hoodcenter.js @@ -9,7 +9,7 @@ export default function (part) { complete, paperless, macro, - units + units, } = part.shorthand() let width = store.get('hoodCenterWidth') @@ -59,21 +59,21 @@ export default function (part) { macro('title', { at: points.title, nr: 7, title: 'hoodCenter' }) macro('grainline', { from: points.topLeft.shift(-90, width / 2), - to: points.topRight.shift(-90, width / 2) + to: points.topRight.shift(-90, width / 2), }) // Always include this dimension as we don't print the entire part macro('hd', { from: points.bottomLeft, to: points.bottomRight, y: points.bottomRight.y + sa + 15, - text: units(store.get('hoodCenterLength')) + text: units(store.get('hoodCenterLength')), }) // Paperless? if (paperless) { macro('vd', { from: points.bottomRight, to: points.topRight, - x: points.topRight.x + sa + 15 + x: points.topRight.x + sa + 15, }) } } diff --git a/packages/hugo/src/hoodside.js b/packages/hugo/src/hoodside.js index 41c77a71774..536e18d3273 100644 --- a/packages/hugo/src/hoodside.js +++ b/packages/hugo/src/hoodside.js @@ -11,7 +11,7 @@ export default function (part) { measurements, complete, paperless, - macro + macro, } = part.shorthand() let neckOpening = store.get('neckOpeningLenFront') + store.get('neckOpeningLenBack') @@ -86,7 +86,7 @@ export default function (part) { snippets.logo = new Snippet('logo', points.logo) macro('grainline', { from: points.shoulderNotch, - to: points.hoodTop + to: points.hoodTop, }) } @@ -107,41 +107,41 @@ export default function (part) { macro('pd', { path: neckSeam[0], - d: sa + 15 + d: sa + 15, }) macro('pd', { path: neckSeam[1], - d: sa + 15 + d: sa + 15, }) macro('pd', { path: centralSeam, - d: sa * -1 - 15 + d: sa * -1 - 15, }) macro('hd', { from: points.neckEdge, to: points.frontEdge, - y: points.frontEdge.y + sa + 30 + y: points.frontEdge.y + sa + 30, }) macro('hd', { from: centralSeam.edge('left'), to: points.frontEdge, - y: points.frontEdge.y + sa + 45 + y: points.frontEdge.y + sa + 45, }) let openingEdge = openingSeam.edge('left') macro('hd', { from: openingEdge, to: points.frontEdge, - y: openingEdge.y + y: openingEdge.y, }) macro('vd', { from: points.frontEdge, to: points.hoodRim, - x: points.hoodRim.x + sa + 15 + x: points.hoodRim.x + sa + 15, }) macro('vd', { from: points.frontEdge, to: points.hoodTop, - x: points.hoodRim.x + sa + 30 + x: points.hoodRim.x + sa + 30, }) } diff --git a/packages/hugo/src/pocket.js b/packages/hugo/src/pocket.js index 441f9401a12..5c32f7d3508 100644 --- a/packages/hugo/src/pocket.js +++ b/packages/hugo/src/pocket.js @@ -36,7 +36,7 @@ export default function (part) { macro('cutonfold', { from: points.pocketCf, to: points.cfRibbing, - grainline: true + grainline: true, }) points.title = points.cfRibbing.shiftFractionTowards(points.pocketTop, 0.5) macro('title', { at: points.title, nr: 4, title: 'pocket' }) @@ -50,22 +50,22 @@ export default function (part) { macro('hd', { from: points.cfRibbing, to: points.pocketTop, - y: points.cfRibbing.y + 15 + sa + y: points.cfRibbing.y + 15 + sa, }) macro('hd', { from: points.cfRibbing, to: points.pocketTip, - y: points.cfRibbing.y + 30 + sa + y: points.cfRibbing.y + 30 + sa, }) macro('vd', { from: points.pocketHem, to: points.pocketTip, - x: points.pocketTip.x + 15 + sa + x: points.pocketTip.x + 15 + sa, }) macro('vd', { from: points.pocketHem, to: points.pocketTop, - x: points.cfRibbing.x - 15 - sa + x: points.cfRibbing.x - 15 - sa, }) } diff --git a/packages/hugo/src/pocketfacing.js b/packages/hugo/src/pocketfacing.js index d02547f36e5..ff818f71adb 100644 --- a/packages/hugo/src/pocketfacing.js +++ b/packages/hugo/src/pocketfacing.js @@ -35,7 +35,7 @@ export default function (part) { macro('hd', { from: points.saStart, to: points.pocketTop, - y: points.saStart.y - 15 - sa + y: points.saStart.y - 15 - sa, }) } diff --git a/packages/hugo/src/sleeve.js b/packages/hugo/src/sleeve.js index 25a59ee6446..f1ef06902a9 100644 --- a/packages/hugo/src/sleeve.js +++ b/packages/hugo/src/sleeve.js @@ -13,7 +13,7 @@ export default function (part) { measurements, complete, paperless, - macro + macro, } = part.shorthand() // Top of raglan sleeve @@ -105,7 +105,7 @@ export default function (part) { 'raglanTop', 'raglanTopCp1', 'raglanTipBackCp2', - 'raglanTipBack' + 'raglanTipBack', ] for (let pid of tipPoints) points[pid] = points[pid].shift(90, ragDiff) // Fix sleeve length @@ -137,7 +137,7 @@ export default function (part) { if (complete) { macro('grainline', { from: points.centerWrist, - to: points.raglanTop + to: points.raglanTop, }) //points.title = new Point(points.armhole.x/2, points.armhole.y); macro('title', { at: points.gridAnchor, nr: 3, title: 'sleeve' }) @@ -170,47 +170,47 @@ export default function (part) { macro('vd', { from: points.wristLeft, to: points.bicepsLeft, - x: points.bicepsLeft.x - 15 - sa + x: points.bicepsLeft.x - 15 - sa, }) macro('vd', { from: points.bicepsLeft, to: points.raglanTipFront, - x: points.bicepsLeft.x - 15 - sa + x: points.bicepsLeft.x - 15 - sa, }) macro('vd', { from: points.bicepsRight, to: points.raglanTop, - x: points.bicepsRight.x + 15 + sa + x: points.bicepsRight.x + 15 + sa, }) macro('vd', { from: points.bicepsRight, to: points.raglanTipBack, - x: points.bicepsRight.x + 30 + sa + x: points.bicepsRight.x + 30 + sa, }) macro('hd', { from: points.raglanTipFront, to: points.raglanTop, - y: points.raglanTipBack.y - 15 - sa + y: points.raglanTipBack.y - 15 - sa, }) macro('hd', { from: points.raglanTop, to: points.raglanTipBack, - y: points.raglanTipBack.y - 15 - sa + y: points.raglanTipBack.y - 15 - sa, }) macro('hd', { from: points.bicepsLeft, to: points.raglanTop, - y: points.raglanTipBack.y - 30 - sa + y: points.raglanTipBack.y - 30 - sa, }) macro('hd', { from: points.bicepsLeft, to: points.bicepsRight, - y: points.raglanTipBack.y - 45 - sa + y: points.raglanTipBack.y - 45 - sa, }) macro('hd', { from: points.wristLeft, to: points.wristRight, - y: points.wristLeft.y + 15 + sa + y: points.wristLeft.y + 15 + sa, }) } return part diff --git a/packages/hugo/src/waistband.js b/packages/hugo/src/waistband.js index 585d2fd333e..71106447cd2 100644 --- a/packages/hugo/src/waistband.js +++ b/packages/hugo/src/waistband.js @@ -10,7 +10,7 @@ export default function (part) { complete, paperless, macro, - units + units, } = part.shorthand() let width = (measurements.hpsToWaistBack + measurements.waistToHips) * options.ribbingHeight * 2 @@ -63,7 +63,7 @@ export default function (part) { macro('title', { at: points.title, nr: 8, title: 'waistband' }) macro('grainline', { from: points.bottomMidLeft, - to: points.topMidLeft + to: points.topMidLeft, }) // Always include this dimension as we don't print the entire part @@ -71,7 +71,7 @@ export default function (part) { from: points.bottomLeft, to: points.bottomRight, y: points.bottomRight.y + sa + 15, - text: units(measurements.chest * (1 + options.chestEase) * (1 - options.ribbingStretch)) + text: units(measurements.chest * (1 + options.chestEase) * (1 - options.ribbingStretch)), }) } @@ -80,7 +80,7 @@ export default function (part) { macro('vd', { from: points.bottomRight, to: points.topRight, - x: points.topRight.x + sa + 15 + x: points.topRight.x + sa + 15, }) } diff --git a/packages/i18n/src/locales/de/index.js b/packages/i18n/src/locales/de/index.js index 28de2ab1649..bf6112b6202 100644 --- a/packages/i18n/src/locales/de/index.js +++ b/packages/i18n/src/locales/de/index.js @@ -37,7 +37,7 @@ const topics = { patterns, plugin, settings, - welcome + welcome, } const strings = {} @@ -78,5 +78,5 @@ for (let entry in jargonFile) { export default { strings, plugin, - jargon + jargon, } diff --git a/packages/i18n/src/locales/en/index.js b/packages/i18n/src/locales/en/index.js index 28de2ab1649..bf6112b6202 100644 --- a/packages/i18n/src/locales/en/index.js +++ b/packages/i18n/src/locales/en/index.js @@ -37,7 +37,7 @@ const topics = { patterns, plugin, settings, - welcome + welcome, } const strings = {} @@ -78,5 +78,5 @@ for (let entry in jargonFile) { export default { strings, plugin, - jargon + jargon, } diff --git a/packages/i18n/src/locales/en/options/index.js b/packages/i18n/src/locales/en/options/index.js index 293bbdb2754..d7cba2b1e5e 100644 --- a/packages/i18n/src/locales/en/options/index.js +++ b/packages/i18n/src/locales/en/options/index.js @@ -71,7 +71,7 @@ let patterns = { albert, hortensia, cornelius, - charlie + charlie, } let options = {} diff --git a/packages/i18n/src/locales/en/plugin/index.js b/packages/i18n/src/locales/en/plugin/index.js index dc738fe6a7b..76a0f4751cf 100644 --- a/packages/i18n/src/locales/en/plugin/index.js +++ b/packages/i18n/src/locales/en/plugin/index.js @@ -21,7 +21,7 @@ let files = { cutonfold, grainline, scalebox, - title + title, } let messages = {} diff --git a/packages/i18n/src/locales/es/index.js b/packages/i18n/src/locales/es/index.js index 28de2ab1649..bf6112b6202 100644 --- a/packages/i18n/src/locales/es/index.js +++ b/packages/i18n/src/locales/es/index.js @@ -37,7 +37,7 @@ const topics = { patterns, plugin, settings, - welcome + welcome, } const strings = {} @@ -78,5 +78,5 @@ for (let entry in jargonFile) { export default { strings, plugin, - jargon + jargon, } diff --git a/packages/i18n/src/locales/fr/index.js b/packages/i18n/src/locales/fr/index.js index 28de2ab1649..bf6112b6202 100644 --- a/packages/i18n/src/locales/fr/index.js +++ b/packages/i18n/src/locales/fr/index.js @@ -37,7 +37,7 @@ const topics = { patterns, plugin, settings, - welcome + welcome, } const strings = {} @@ -78,5 +78,5 @@ for (let entry in jargonFile) { export default { strings, plugin, - jargon + jargon, } diff --git a/packages/i18n/src/locales/nl/index.js b/packages/i18n/src/locales/nl/index.js index 28de2ab1649..bf6112b6202 100644 --- a/packages/i18n/src/locales/nl/index.js +++ b/packages/i18n/src/locales/nl/index.js @@ -37,7 +37,7 @@ const topics = { patterns, plugin, settings, - welcome + welcome, } const strings = {} @@ -78,5 +78,5 @@ for (let entry in jargonFile) { export default { strings, plugin, - jargon + jargon, } diff --git a/packages/jaeger/config/index.js b/packages/jaeger/config/index.js index af7d5fea19e..4e40b714439 100644 --- a/packages/jaeger/config/index.js +++ b/packages/jaeger/config/index.js @@ -21,7 +21,7 @@ export default { 'hipsEase', 'lengthBonus', 'shoulderEase', - 'waistEase' + 'waistEase', ], sleeves: ['sleeveBend', 'sleeveLengthBonus', 'sleeveVentLength', 'sleeveVentWidth'], advanced: [ @@ -33,7 +33,7 @@ export default { 'sideFrontPlacement', 'shoulderSlopeReduction', 'sleevecapHeight', - 'sleevecapEase' + 'sleevecapEase', ], pockets: [ 'chestPocketDepth', @@ -49,7 +49,7 @@ export default { 'innerPocketWidth', 'innerPocketDepth', 'innerPocketWeltHeight', - 'pocketFoldover' + 'pocketFoldover', ], style: [ 'centerFrontHemDrop', @@ -62,7 +62,7 @@ export default { 'frontCutawayEnd', 'hemRadius', 'lapelStart', - 'lapelReduction' + 'lapelReduction', ], collar: [ 'collarSpread', @@ -71,8 +71,8 @@ export default { 'collarNotchAngle', 'collarNotchReturn', 'collarRoll', - 'rollLineCollarHeight' - ] + 'rollLineCollarHeight', + ], }, measurements: [ 'biceps', @@ -86,7 +86,7 @@ export default { 'shoulderToElbow', 'shoulderToShoulder', 'shoulderToWrist', - 'wrist' + 'wrist', ], dependencies: { bentBack: 'bentBase', @@ -108,7 +108,7 @@ export default { innerPocketWelt: 'front', innerPocketBag: 'front', topSleeve: 'bentTopSleeve', - underSleeve: 'bentUnderSleeve' + underSleeve: 'bentUnderSleeve', }, inject: { bentBack: 'bentBase', @@ -125,7 +125,7 @@ export default { underCollar: 'collarStand', topSleeve: 'bentTopSleeve', underSleeve: 'bentUnderSleeve', - pocketLining: 'pocket' + pocketLining: 'pocket', }, hide: [ 'bentBase', @@ -135,7 +135,7 @@ export default { 'bentTopSleeve', 'bentUnderSleeve', 'frontBase', - 'backBase' + 'backBase', ], options: { // Constants @@ -231,6 +231,6 @@ export default { shoulderSlopeReduction: { pct: 30, min: 0, max: 50 }, buttonLength: { pct: 30, min: 30, max: 60 }, - buttons: { count: 2, min: 1, max: 3 } - } + buttons: { count: 2, min: 1, max: 3 }, + }, } diff --git a/packages/jaeger/src/back.js b/packages/jaeger/src/back.js index 9d80219f6c8..5e954867928 100644 --- a/packages/jaeger/src/back.js +++ b/packages/jaeger/src/back.js @@ -13,7 +13,7 @@ export default function (part) { macro, Point, paths, - Path + Path, } = part.shorthand() // Back vent(s) @@ -141,12 +141,12 @@ export default function (part) { // Notches macro('sprinkle', { snippet: 'notch', - on: ['neck', 'shoulder', 'armholePitch', 'cbWaist', 'waist'] + on: ['neck', 'shoulder', 'armholePitch', 'cbWaist', 'waist'], }) // Grainline macro('grainline', { from: new Point(points.neck.x, points.hips.y), - to: points.neck + to: points.neck, }) if (sa) { @@ -161,101 +161,101 @@ export default function (part) { macro('hd', { from: points.cbNeck, to: points.neck, - y: points.neck.y - 15 - sa + y: points.neck.y - 15 - sa, }) macro('hd', { from: points.cbChest, to: points.neck, - y: points.neck.y - 30 - sa + y: points.neck.y - 30 - sa, }) macro('hd', { from: points.cbChest, to: points.armholePitch, - y: points.neck.y - 45 - sa + y: points.neck.y - 45 - sa, }) macro('hd', { from: points.cbChest, to: points.shoulder, - y: points.neck.y - 60 - sa + y: points.neck.y - 60 - sa, }) macro('hd', { from: points.cbChest, to: points.bsArmholeHollow, - y: points.neck.y - 75 - sa + y: points.neck.y - 75 - sa, }) macro('vd', { from: points.bsArmholeHollow, to: points.armholePitch, - x: points.bsArmholeHollow.x + sa + 15 + x: points.bsArmholeHollow.x + sa + 15, }) macro('vd', { from: points.bsArmholeHollow, to: points.shoulder, - x: points.bsArmholeHollow.x + sa + 30 + x: points.bsArmholeHollow.x + sa + 30, }) macro('vd', { from: points.hem, to: points.hips, - x: points.hem.x + sa + 15 + x: points.hem.x + sa + 15, }) macro('vd', { from: points.hem, to: points.waist, - x: points.hem.x + sa + 30 + x: points.hem.x + sa + 30, }) macro('vd', { from: points.hem, to: points.bsArmholeHollow, - x: points.hem.x + sa + 45 + x: points.hem.x + sa + 45, }) macro('hd', { from: paths.vent.start(), to: points.ventSlopeStart, - y: points.ventSlopeStart.y + 25 + y: points.ventSlopeStart.y + 25, }) macro('hd', { from: paths.vent.end(), to: points.hem, - y: points.hem.y + 3 * sa + 15 + y: points.hem.y + 3 * sa + 15, }) macro('vd', { from: paths.vent.end(), to: paths.vent.start(), - x: paths.vent.end().x - sa - 15 + x: paths.vent.end().x - sa - 15, }) macro('vd', { from: paths.vent.end(), to: points.ventSlopeStart, - x: paths.vent.end().x - sa - 30 + x: paths.vent.end().x - sa - 30, }) macro('vd', { from: paths.vent.end(), to: points.cbWaist, - x: paths.vent.end().x - sa - 45 + x: paths.vent.end().x - sa - 45, }) macro('vd', { from: paths.vent.end(), to: points.cbChest, - x: paths.vent.end().x - sa - 60 + x: paths.vent.end().x - sa - 60, }) macro('vd', { from: paths.vent.end(), to: points.cbNeck, - x: paths.vent.end().x - sa - 75 + x: paths.vent.end().x - sa - 75, }) macro('vd', { from: paths.vent.end(), to: points.neck, - x: paths.vent.end().x - sa - 90 + x: paths.vent.end().x - sa - 90, }) macro('ld', { from: points.cbWaist, - to: points.waist + to: points.waist, }) macro('ld', { from: points.neck, to: points.shoulder, - d: -15 + d: -15, }) } } diff --git a/packages/jaeger/src/chestpocketbag.js b/packages/jaeger/src/chestpocketbag.js index 86f134c056b..b9d05faffa8 100644 --- a/packages/jaeger/src/chestpocketbag.js +++ b/packages/jaeger/src/chestpocketbag.js @@ -9,7 +9,7 @@ export default function (part) { macro, Point, paths, - Path + Path, } = part.shorthand() let width = store.get('chestPocketWidth') @@ -45,13 +45,13 @@ export default function (part) { macro('title', { at: points.title, nr: 12, - title: 'chestPocketBag' + title: 'chestPocketBag', }) // Grainline macro('grainline', { from: points.bottomLeft.shift(0, 10), - to: points.topLeft.shift(0, 10) + to: points.topLeft.shift(0, 10), }) // Instructions @@ -63,32 +63,32 @@ export default function (part) { macro('hd', { from: points.topLeft, to: points.topRight, - y: points.topRight.y - sa - 15 + y: points.topRight.y - sa - 15, }) macro('vd', { from: points.bottomRight, to: points.foldRight, - x: points.topRight.x + sa + 15 + x: points.topRight.x + sa + 15, }) macro('vd', { from: points.foldRight, to: points.topRight, - x: points.topRight.x + sa + 15 + x: points.topRight.x + sa + 15, }) macro('vd', { from: points.bottomRight, to: points.topRight, - x: points.topRight.x + sa + 30 + x: points.topRight.x + sa + 30, }) macro('vd', { from: points.bottomLeft, to: points.foldLeft, - x: points.topLeft.x - sa - 15 + x: points.topLeft.x - sa - 15, }) macro('vd', { from: points.foldLeft, to: points.topLeft, - x: points.topLeft.x - sa - 15 + x: points.topLeft.x - sa - 15, }) } } diff --git a/packages/jaeger/src/chestpocketwelt.js b/packages/jaeger/src/chestpocketwelt.js index a61292d886b..1a09fe9188c 100644 --- a/packages/jaeger/src/chestpocketwelt.js +++ b/packages/jaeger/src/chestpocketwelt.js @@ -9,7 +9,7 @@ export default function (part) { macro, Point, paths, - Path + Path, } = part.shorthand() let width = store.get('chestPocketWidth') @@ -48,13 +48,13 @@ export default function (part) { macro('title', { at: points.top, nr: 11, - title: 'chestPocketWelt' + title: 'chestPocketWelt', }) // Grainline macro('grainline', { from: points.bottomLeft.shift(0, 10), - to: points.bottomLeft.shiftFractionTowards(points.topLeft, 2).shift(0, 10) + to: points.bottomLeft.shiftFractionTowards(points.topLeft, 2).shift(0, 10), }) if (sa) paths.sa = paths.seam.offset(sa).attr('class', 'fabric sa') @@ -63,12 +63,12 @@ export default function (part) { macro('hd', { from: points.foldLeft, to: points.foldRight, - y: points.foldLeft.y - sa - 15 + y: points.foldLeft.y - sa - 15, }) macro('vd', { from: points.bottomRight, to: points.foldRight, - x: points.bottomRight.x + sa + 15 + x: points.bottomRight.x + sa + 15, }) } } diff --git a/packages/jaeger/src/collar.js b/packages/jaeger/src/collar.js index a4f574d846f..5814f29624a 100644 --- a/packages/jaeger/src/collar.js +++ b/packages/jaeger/src/collar.js @@ -21,7 +21,7 @@ export default function (part) { 'notchTip', 'collarCbTopCp', 'notchTipRoll', - 'collarCbTopCpRoll' + 'collarCbTopCpRoll', ] for (let i of mirror) points[i + 'Left'] = points[i].flipX(points.collarCbTop) @@ -53,20 +53,20 @@ export default function (part) { // Notches macro('sprinkle', { snippet: 'notch', - on: ['collarstandCbTop', 'notchTip', 'notchTipLeft'] + on: ['collarstandCbTop', 'notchTip', 'notchTipLeft'], }) // Title points.title = points.collarstandCbTopCp.shiftFractionTowards(points.collarCbTopCpRoll, 0.5) macro('title', { at: points.title, nr: 7, - title: 'collar' + title: 'collar', }) // Grainline macro('grainline', { from: points.collarCbTopRoll, - to: points.collarstandCbTop + to: points.collarstandCbTop, }) if (sa) paths.sa = paths.seam.offset(sa).attr('class', 'fabric sa') @@ -75,47 +75,47 @@ export default function (part) { macro('hd', { from: points.collarstandTipLeft, to: points.collarstandTip, - y: points.collarstandCbTop.y - sa - 15 + y: points.collarstandCbTop.y - sa - 15, }) macro('hd', { from: points.notchLeft, to: points.notch, - y: points.collarstandCbTop.y - sa - 30 + y: points.collarstandCbTop.y - sa - 30, }) macro('hd', { from: points.notchTipRollLeft, to: points.notchTipRoll, - y: points.notchTipRoll.y + sa + 15 + y: points.notchTipRoll.y + sa + 15, }) macro('hd', { from: points.notchTipLeft, to: points.notchTip, - y: points.notchTipRoll.y + sa + 30 + y: points.notchTipRoll.y + sa + 30, }) macro('vd', { from: points.collarCbTopRoll, to: points.collarstandCbTop, - x: points.collarCbTopRoll.x + 15 + x: points.collarCbTopRoll.x + 15, }) macro('ld', { from: points.collarstandTip, to: points.notch, - d: sa + 15 + d: sa + 15, }) macro('ld', { from: points.notchTip, to: points.notch, - d: -15 - sa + d: -15 - sa, }) macro('ld', { from: points.notchTipRoll, to: points.notch, - d: -30 - sa + d: -30 - sa, }) macro('vd', { from: points.notchTipRoll, to: points.collarstandCbTop, - x: points.notch.x + sa + 40 + x: points.notch.x + sa + 40, }) } } diff --git a/packages/jaeger/src/collarstand.js b/packages/jaeger/src/collarstand.js index aae5ed8ade3..2bf8fef7e28 100644 --- a/packages/jaeger/src/collarstand.js +++ b/packages/jaeger/src/collarstand.js @@ -17,7 +17,7 @@ export default function (part) { macro, snippets, paths, - Path + Path, } = part.shorthand() // Only keep what's relevant from the front part @@ -31,7 +31,7 @@ export default function (part) { 'collarCbTop', 'collarCbHelp', 'collarCbBottom', - 'lapelBreakPoint' + 'lapelBreakPoint', ] for (let i of Object.keys(points)) { if (collarPoints.indexOf(i) === -1) delete points[i] @@ -121,20 +121,20 @@ export default function (part) { // Notches macro('sprinkle', { snippet: 'notch', - on: ['collarstandCbBottom', 'collarstandCbTop'] + on: ['collarstandCbBottom', 'collarstandCbTop'], }) // Title points.title = points.collarstandCbTop.shiftFractionTowards(points.collarCbBottom, 0.5) macro('title', { at: points.title, nr: 8, - title: 'collarstand' + title: 'collarstand', }) // Grainline macro('grainline', { from: points.collarstandCbTop, - to: points.collarstandCbBottom + to: points.collarstandCbBottom, }) if (sa) paths.sa = paths.seam.offset(sa).attr('class', 'fabric sa') @@ -143,22 +143,22 @@ export default function (part) { macro('hd', { from: points.leftCollarCorner, to: points.collarCorner, - y: points.collarstandCbBottom.y - sa - 15 + y: points.collarstandCbBottom.y - sa - 15, }) macro('hd', { from: points.leftCollarstandTip, to: points.collarstandTip, - y: points.collarstandTip.y + sa + 15 + y: points.collarstandTip.y + sa + 15, }) macro('vd', { from: points.collarstandTip, to: points.collarCorner, - x: points.collarstandTip.x + sa + 15 + x: points.collarstandTip.x + sa + 15, }) macro('vd', { from: points.collarstandCbTop, to: points.collarstandCbBottom, - x: points.collarstandCbTop.x + 15 + x: points.collarstandCbTop.x + 15, }) } } diff --git a/packages/jaeger/src/front.js b/packages/jaeger/src/front.js index b468af5efd8..c27045eebff 100644 --- a/packages/jaeger/src/front.js +++ b/packages/jaeger/src/front.js @@ -13,7 +13,7 @@ export default function (part) { macro, Point, paths, - Path + Path, } = part.shorthand() // Front closure overlap @@ -77,7 +77,7 @@ export default function (part) { 'armholeHollow', 'armholeHollowCp1', 'splitCp2', - 'frontNeckCpEdge' + 'frontNeckCpEdge', ] for (let p of rotate) { points[p] = points[p].rotate(options.chestShapingMax * options.chestShaping * -1, points.split) @@ -200,14 +200,14 @@ export default function (part) { to: points.ipfeEdge, via: points.ipfeViaBottomRight, radius: ipfeHeight / 2, - prefix: 'ipfeBottomRight' + prefix: 'ipfeBottomRight', }) macro('round', { from: points.ipfeTopRight, to: points.ipfeEdge, via: points.ipfeViaTopRight, radius: ipfeHeight / 2, - prefix: 'ipfeTopRight' + prefix: 'ipfeTopRight', }) points.ipfeStart = utils.beamIntersectsY( points.facingTop, @@ -234,14 +234,14 @@ export default function (part) { to: points.ipfeStartEnd, via: points.ipfeStartVia, radius: ipfeHeight / 2, - prefix: 'ipfeStart' + prefix: 'ipfeStart', }) macro('round', { from: points.ipfeEnd, to: points.ipfeEndEnd, via: points.ipfeEndVia, radius: ipfeHeight / 2, - prefix: 'ipfeEnd' + prefix: 'ipfeEnd', }) // Rotate control points to smooth out curve angle = points.facingTop.angle(points.facingBottom) + 90 @@ -394,8 +394,8 @@ export default function (part) { 'frontPocketTopLeft', 'frontPocketBottomLeft', 'armholeHollow', - 'waist' - ] + 'waist', + ], }) // Buttons points.button1 = new Point(points.cfWaist.x, points.lapelBreakPoint.y) @@ -414,7 +414,7 @@ export default function (part) { // Grainline macro('grainline', { from: points.cfHips, - to: new Point(points.cfArmhole.x, points.collarCorner.y) + to: new Point(points.cfArmhole.x, points.collarCorner.y), }) if (sa) { paths.sa = paths.saBase @@ -427,191 +427,191 @@ export default function (part) { macro('vd', { from: points.notchEdge, to: points.neck, - x: points.lapelBreakPoint.x - 15 - sa + x: points.lapelBreakPoint.x - 15 - sa, }) macro('vd', { from: points.lapelBreakPoint, to: points.notchEdge, - x: points.lapelBreakPoint.x - 15 - sa + x: points.lapelBreakPoint.x - 15 - sa, }) macro('vd', { from: points.cutawayPoint, to: points.lapelBreakPoint, - x: points.lapelBreakPoint.x - 15 - sa + x: points.lapelBreakPoint.x - 15 - sa, }) macro('vd', { from: points.facingBottom, to: points.cutawayPoint, - x: points.lapelBreakPoint.x - 15 - sa + x: points.lapelBreakPoint.x - 15 - sa, }) macro('vd', { from: points.facingBottom, to: points.notchEdge, - x: points.lapelBreakPoint.x - 30 - sa + x: points.lapelBreakPoint.x - 30 - sa, }) macro('vd', { from: points.facingBottom, to: points.neck, - x: points.lapelBreakPoint.x - 45 - sa + x: points.lapelBreakPoint.x - 45 - sa, }) macro('hd', { from: points.notchEdge, to: points.notchMax, - y: points.notchEdge.y - 15 - sa + y: points.notchEdge.y - 15 - sa, }) macro('hd', { from: points.notchEdge, to: points.collarCorner, - y: points.notchEdge.y - 30 - sa + y: points.notchEdge.y - 30 - sa, }) macro('hd', { from: points.notchEdge, to: points.neck, - y: points.neck.y - 15 - sa + y: points.neck.y - 15 - sa, }) macro('hd', { from: points.lapelStraightEnd, to: points.neck, - y: points.neck.y - 30 - sa + y: points.neck.y - 30 - sa, }) macro('hd', { from: points.lapelStraightEnd, to: points.armholePitch, - y: points.neck.y - 45 - sa + y: points.neck.y - 45 - sa, }) macro('hd', { from: points.lapelStraightEnd, to: points.shoulder, - y: points.neck.y - 60 - sa + y: points.neck.y - 60 - sa, }) macro('hd', { from: points.lapelStraightEnd, to: points.fsArmhole, - y: points.neck.y - 75 - sa + y: points.neck.y - 75 - sa, }) macro('ld', { from: points.neck, to: points.shoulder, - d: -15 + d: -15, }) macro('ld', { from: points.collarCorner, to: points.neck, - d: -15 + d: -15, }) macro('ld', { from: points.lapelBreakPoint, to: points.button1, - d: -15 + d: -15, }) macro('hd', { from: points.lapelBreakPoint, to: points.innerPocketTopLeft, - y: points.innerPocketTopLeft.y - 35 + y: points.innerPocketTopLeft.y - 35, }) macro('hd', { from: points.innerPocketTopLeft, to: points.innerPocketTopRight, - y: points.innerPocketTopLeft.y - 35 + y: points.innerPocketTopLeft.y - 35, }) macro('hd', { from: points.lapelBreakPoint, to: points.ipfeTopRightEnd, - y: points.innerPocketTopLeft.y - 50 + y: points.innerPocketTopLeft.y - 50, }) macro('vd', { from: points.ipfeBottomRightStart, to: points.ipfeTopRightStart, - x: points.ipfeTopRightEnd.x + 15 + x: points.ipfeTopRightEnd.x + 15, }) macro('vd', { from: points.innerPocketBottomRight, to: points.innerPocketTopRight, - x: points.innerPocketTopRight.x - 15 + x: points.innerPocketTopRight.x - 15, }) macro('hd', { from: points.lapelBreakPoint, to: points.dartTop, - y: points.dartTop.y + 15 + y: points.dartTop.y + 15, }) macro('ld', { from: points.dartLeft, - to: points.dartRight + to: points.dartRight, }) macro('vd', { from: points.dartBottom, to: points.dartTop, - x: points.dartRight.x + 15 + x: points.dartRight.x + 15, }) macro('hd', { from: points.lapelBreakPoint, to: points.facingBottom, - y: points.facingBottom.y + 15 + sa + y: points.facingBottom.y + 15 + sa, }) macro('hd', { from: points.lapelBreakPoint, to: points.roundEnd, - y: points.facingBottom.y + 15 + 3 * sa + y: points.facingBottom.y + 15 + 3 * sa, }) macro('hd', { from: points.lapelBreakPoint, to: points.hem, - y: points.facingBottom.y + 30 + 3 * sa + y: points.facingBottom.y + 30 + 3 * sa, }) macro('vd', { from: points.hem, to: points.hips, - x: points.hem.x + 15 + sa + x: points.hem.x + 15 + sa, }) macro('vd', { from: points.hem, to: points.dartBottom, - x: points.hem.x + 30 + sa + x: points.hem.x + 30 + sa, }) macro('vd', { from: points.hem, to: points.waist, - x: points.hem.x + 45 + sa + x: points.hem.x + 45 + sa, }) macro('vd', { from: points.hem, to: points.innerPocketRight, - x: points.hem.x + 60 + sa + x: points.hem.x + 60 + sa, }) macro('vd', { from: points.hem, to: points.fsArmhole, - x: points.hem.x + 75 + sa + x: points.hem.x + 75 + sa, }) macro('vd', { from: points.fsArmhole, to: points.armholePitch, - x: points.fsArmhole.x + 15 + sa + x: points.fsArmhole.x + 15 + sa, }) macro('vd', { from: points.fsArmhole, to: points.shoulder, - x: points.fsArmhole.x + 30 + sa + x: points.fsArmhole.x + 30 + sa, }) macro('vd', { from: points.fsArmhole, to: points.neck, - x: points.fsArmhole.x + 45 + sa + x: points.fsArmhole.x + 45 + sa, }) macro('hd', { from: points.cutawayPoint, to: points.frontPocketTopLeft, - y: points.frontPocketTopLeft.y - 15 + y: points.frontPocketTopLeft.y - 15, }) macro('vd', { from: points.frontPocketBottomLeft, to: points.frontPocketTopLeft, - x: points.frontPocketTopLeft.x - 15 + x: points.frontPocketTopLeft.x - 15, }) macro('vd', { from: points.fsArmhole, to: points.chestPocketBottomLeft, - x: points.chestPocketBottomLeft.x - 15 + x: points.chestPocketBottomLeft.x - 15, }) points.cfWaist = new Point(points.button1.x, points.waist.y) macro('ld', { from: points.cfWaist, to: points.dartLeft }) diff --git a/packages/jaeger/src/innerpocketbag.js b/packages/jaeger/src/innerpocketbag.js index bc3e4e84f59..668fb8d8f2c 100644 --- a/packages/jaeger/src/innerpocketbag.js +++ b/packages/jaeger/src/innerpocketbag.js @@ -9,7 +9,7 @@ export default function (part) { macro, Point, paths, - Path + Path, } = part.shorthand() let width = store.get('innerPocketWidth') @@ -44,13 +44,13 @@ export default function (part) { macro('title', { at: points.title, nr: 14, - title: 'innerPocketBag' + title: 'innerPocketBag', }) // Grainline macro('grainline', { from: points.bottomLeft.shift(0, 10), - to: points.topLeft.shift(0, 10) + to: points.topLeft.shift(0, 10), }) // Instructions @@ -62,32 +62,32 @@ export default function (part) { macro('hd', { from: points.topLeft, to: points.topRight, - y: points.topRight.y - sa - 15 + y: points.topRight.y - sa - 15, }) macro('vd', { from: points.bottomRight, to: points.foldRight, - x: points.topRight.x + sa + 15 + x: points.topRight.x + sa + 15, }) macro('vd', { from: points.foldRight, to: points.topRight, - x: points.topRight.x + sa + 15 + x: points.topRight.x + sa + 15, }) macro('vd', { from: points.bottomRight, to: points.topRight, - x: points.topRight.x + sa + 30 + x: points.topRight.x + sa + 30, }) macro('vd', { from: points.bottomLeft, to: points.foldLeft, - x: points.topLeft.x - sa - 15 + x: points.topLeft.x - sa - 15, }) macro('vd', { from: points.foldLeft, to: points.topLeft, - x: points.topLeft.x - sa - 15 + x: points.topLeft.x - sa - 15, }) } } diff --git a/packages/jaeger/src/innerpocketwelt.js b/packages/jaeger/src/innerpocketwelt.js index f2c7e6cc856..8675cea678e 100644 --- a/packages/jaeger/src/innerpocketwelt.js +++ b/packages/jaeger/src/innerpocketwelt.js @@ -32,7 +32,7 @@ export default function (part) { macro('title', { at: points.title, nr: 13, - title: 'innerPocketWelt' + title: 'innerPocketWelt', }) if (sa) paths.sa = paths.seam.offset(sa).attr('class', 'fabric sa') @@ -41,12 +41,12 @@ export default function (part) { macro('hd', { from: points.topLeft, to: points.topRight, - y: points.topRight.y - sa - 15 + y: points.topRight.y - sa - 15, }) macro('vd', { from: points.bottomRight, to: points.topRight, - x: points.topRight.x + sa + 15 + x: points.topRight.x + sa + 15, }) } } diff --git a/packages/jaeger/src/pocket.js b/packages/jaeger/src/pocket.js index e5626debf31..41d81aa08c6 100644 --- a/packages/jaeger/src/pocket.js +++ b/packages/jaeger/src/pocket.js @@ -9,7 +9,7 @@ export default function (part) { macro, Point, paths, - Path + Path, } = part.shorthand() let width = store.get('pocketWidth') @@ -33,14 +33,14 @@ export default function (part) { to: points.bottomRight, via: points.bottomLeft, radius: width * options.frontPocketRadius, - prefix: 'left' + prefix: 'left', }) macro('round', { from: points.bottomLeft, to: points.topRight, via: points.bottomRight, radius: width * options.frontPocketRadius, - prefix: 'right' + prefix: 'right', }) } @@ -74,7 +74,7 @@ export default function (part) { macro('title', { at: points.title, nr: 9, - title: 'pocket' + title: 'pocket', }) // Instructions @@ -83,7 +83,7 @@ export default function (part) { // Grainline macro('grainline', { from: points.bottomLeft.shift(0, 10), - to: points.edgeLeft.shift(0, 10) + to: points.edgeLeft.shift(0, 10), }) if (sa) paths.sa = paths.seam.offset(sa).attr('class', 'fabric sa') @@ -92,19 +92,19 @@ export default function (part) { macro('hd', { from: points.edgeLeft, to: points.edgeRight, - y: points.edgeLeft.y - sa - 15 + y: points.edgeLeft.y - sa - 15, }) let corner = points.bottomRight if (options.frontPocketRadius > 0) corner = points.rightStart macro('vd', { from: corner, to: points.topRight, - x: points.edgeRight.x + sa + 15 + x: points.edgeRight.x + sa + 15, }) macro('vd', { from: corner, to: points.edgeRight, - x: points.edgeRight.x + sa + 30 + x: points.edgeRight.x + sa + 30, }) } } diff --git a/packages/jaeger/src/pocketlining.js b/packages/jaeger/src/pocketlining.js index 4eee3199fe0..8961f4da942 100644 --- a/packages/jaeger/src/pocketlining.js +++ b/packages/jaeger/src/pocketlining.js @@ -38,13 +38,13 @@ export default function (part) { macro('title', { at: points.title, nr: 10, - title: 'pocketLining' + title: 'pocketLining', }) // Grainline macro('grainline', { from: points.bottomLeft.shift(0, 10), - to: points.topLeft.shift(0, 10) + to: points.topLeft.shift(0, 10), }) if (sa) paths.sa = paths.seam.offset(sa).attr('class', 'lining sa') @@ -53,14 +53,14 @@ export default function (part) { macro('hd', { from: points.topLeft, to: points.topRight, - y: points.topLeft.y - sa - 15 + y: points.topLeft.y - sa - 15, }) let corner = points.bottomRight if (options.frontPocketRadius > 0) corner = points.rightStart macro('vd', { from: corner, to: points.topRight, - x: points.topRight.x + sa + 15 + x: points.topRight.x + sa + 15, }) } } diff --git a/packages/jaeger/src/shared.js b/packages/jaeger/src/shared.js index ac22d5cfbc2..aec55d309dc 100644 --- a/packages/jaeger/src/shared.js +++ b/packages/jaeger/src/shared.js @@ -47,7 +47,7 @@ export const backSideBoundary = (part, flip = false) => { 'bsHips', 'bsHem', 'bsArmholeHollowCp1', - 'bsArmholeCp2' + 'bsArmholeCp2', ]) { points[p] = points[p].flipX(points.armhole) } diff --git a/packages/jaeger/src/side.js b/packages/jaeger/src/side.js index 8a31b03b2e4..1b644d4ce52 100644 --- a/packages/jaeger/src/side.js +++ b/packages/jaeger/src/side.js @@ -11,7 +11,7 @@ export default function (part) { options, macro, paths, - Path + Path, } = part.shorthand() // Double back vent @@ -92,13 +92,13 @@ export default function (part) { // Notches macro('sprinkle', { snippet: 'notch', - on: ['sideWaist', 'bsWaist'] + on: ['sideWaist', 'bsWaist'], }) points.title = points.sideWaistCp2.shiftFractionTowards(points.bsWaistCp2, 0.5) macro('title', { at: points.title, nr: 3, - title: 'side' + title: 'side', }) if (sa) { @@ -113,47 +113,47 @@ export default function (part) { if (paperless) { macro('ld', { from: points.sideWaist, - to: points.bsWaist + to: points.bsWaist, }) macro('hd', { from: points.sideHem, to: points.bsHem, - y: points.sideHem.y + 3 * sa + 15 + y: points.sideHem.y + 3 * sa + 15, }) macro('hd', { from: points.fsArmhole, to: points.bsArmholeHollow, - y: points.bsArmholeHollow.y - sa - 15 + y: points.bsArmholeHollow.y - sa - 15, }) macro('vd', { from: points.bsHem, to: points.bsHips, - x: points.bsHips.x + sa + 15 + x: points.bsHips.x + sa + 15, }) macro('vd', { from: points.bsHem, to: points.bsWaist, - x: points.bsHips.x + sa + 30 + x: points.bsHips.x + sa + 30, }) macro('vd', { from: points.bsHem, to: points.bsArmholeHollow, - x: points.bsHips.x + sa + 45 + x: points.bsHips.x + sa + 45, }) macro('vd', { from: points.sideHem, to: points.bsArmholeHollow, - x: points.bsHips.x + sa + 60 + x: points.bsHips.x + sa + 60, }) macro('vd', { from: points.sideHem, to: points.sideWaist, - x: points.sideHem.x - sa - 15 + x: points.sideHem.x - sa - 15, }) macro('vd', { from: points.sideWaist, to: points.fsArmhole, - x: points.sideHem.x - sa - 15 + x: points.sideHem.x - sa - 15, }) } } diff --git a/packages/jaeger/src/topsleeve.js b/packages/jaeger/src/topsleeve.js index ed64a31fee9..5aa2efe7b30 100644 --- a/packages/jaeger/src/topsleeve.js +++ b/packages/jaeger/src/topsleeve.js @@ -9,7 +9,7 @@ export default function (part) { options, macro, paths, - Path + Path, } = part.shorthand() // Vent @@ -106,20 +106,20 @@ export default function (part) { // Notches macro('sprinkle', { snippet: 'notch', - on: ['top', 'tsElbowLeft', 'elbowRight'] + on: ['top', 'tsElbowLeft', 'elbowRight'], }) // Title points.title = points.tsLeftEdge.shiftFractionTowards(points.tsRightEdge, 0.5) macro('title', { at: points.title, nr: 4, - title: 'topSleeve' + title: 'topSleeve', }) // Grainline macro('grainline', { from: points.boxBottom, - to: points.top + to: points.top, }) if (sa) paths.sa = paths.seam.offset(sa).attr('class', 'fabric sa') @@ -128,85 +128,85 @@ export default function (part) { macro('ld', { from: points.tsWristLeft, to: points.tsWristRight, - d: 15 + d: 15, }) macro('ld', { from: points.tsWristLeft, to: points.ventFoldRight, - d: 30 + d: 30, }) macro('ld', { from: points.hemLeft, to: points.ventRight, - d: -15 - sa + d: -15 - sa, }) macro('ld', { from: points.hemLeft, to: points.tsWristLeft, - d: 15 + sa + d: 15 + sa, }) macro('ld', { from: points.tsWristRight, to: points.ventSlopeStart, - d: 15 + d: 15, }) macro('ld', { from: points.ventFoldRight, to: points.ventSlopeEnd, - d: 15 + d: 15, }) macro('ld', { from: points.tsWristRight, to: points.ventFoldRight, - d: -15 + d: -15, }) macro('vd', { from: points.ventRight, to: points.top, - x: points.ventSlopeEnd.x + sa + 15 + x: points.ventSlopeEnd.x + sa + 15, }) macro('vd', { from: points.tsWristLeft, to: points.tsElbowLeft, - x: points.tsLeftEdge.x - sa - 15 + x: points.tsLeftEdge.x - sa - 15, }) macro('vd', { from: points.tsWristLeft, to: points.tsLeftEdge, - x: points.tsLeftEdge.x - sa - 30 + x: points.tsLeftEdge.x - sa - 30, }) macro('vd', { from: points.tsLeftEdge, to: points.top, - x: points.tsLeftEdge.x - sa - 30 + x: points.tsLeftEdge.x - sa - 30, }) macro('vd', { from: points.tsWristLeft, to: points.top, - x: points.tsLeftEdge.x - sa - 45 + x: points.tsLeftEdge.x - sa - 45, }) macro('ld', { from: points.tsLeftEdge, - to: points.tsRightEdge + to: points.tsRightEdge, }) macro('ld', { from: points.tsElbowLeft, - to: points.elbowRight + to: points.elbowRight, }) macro('hd', { from: points.tsLeftEdge, to: points.top, - y: points.top.y - sa - 15 + y: points.top.y - sa - 15, }) macro('hd', { from: points.tsLeftEdge, to: points.backPitchPoint, - y: points.top.y - sa - 30 + y: points.top.y - sa - 30, }) macro('hd', { from: points.tsLeftEdge, to: points.tsRightEdge, - y: points.top.y - sa - 45 + y: points.top.y - sa - 45, }) } } diff --git a/packages/jaeger/src/undercollar.js b/packages/jaeger/src/undercollar.js index 0c70704384f..888e1ee1d3d 100644 --- a/packages/jaeger/src/undercollar.js +++ b/packages/jaeger/src/undercollar.js @@ -28,7 +28,7 @@ export default function (part) { macro('title', { at: points.title, nr: 6, - title: 'underCollar' + title: 'underCollar', }) if (sa) { @@ -56,37 +56,37 @@ export default function (part) { macro('hd', { from: points.collarstandCbTop, to: points.collarstandTip, - y: points.collarstandCbTop.y - 15 + y: points.collarstandCbTop.y - 15, }) macro('hd', { from: points.collarstandCbTop, to: points.notch, - y: points.collarstandCbTop.y - 30 + y: points.collarstandCbTop.y - 30, }) macro('hd', { from: points.collarCbTop, to: points.notchTip, - y: points.notchTip.y + 15 + y: points.notchTip.y + 15, }) macro('vd', { from: points.collarCbTop, to: points.collarstandCbTop, - x: points.collarCbTop.x - sa - 15 + x: points.collarCbTop.x - sa - 15, }) macro('ld', { from: points.collarstandTip, to: points.notch, - d: sa + 15 + d: sa + 15, }) macro('ld', { from: points.notchTip, to: points.notch, - d: -15 - sa + d: -15 - sa, }) macro('vd', { from: points.notchTip, to: points.collarstandCbTop, - x: points.notch.x + sa + 40 + x: points.notch.x + sa + 40, }) } } diff --git a/packages/jaeger/src/undersleeve.js b/packages/jaeger/src/undersleeve.js index f931b159e4b..9b8ec1a1ac3 100644 --- a/packages/jaeger/src/undersleeve.js +++ b/packages/jaeger/src/undersleeve.js @@ -9,7 +9,7 @@ export default function (part) { options, macro, paths, - Path + Path, } = part.shorthand() // Vent @@ -104,20 +104,20 @@ export default function (part) { // Notches macro('sprinkle', { snippet: 'notch', - on: ['top', 'usElbowLeft', 'elbowRight'] + on: ['top', 'usElbowLeft', 'elbowRight'], }) // Title points.title = points.tsLeftEdge.shiftFractionTowards(points.tsRightEdge, 0.5) macro('title', { at: points.title, nr: 5, - title: 'underSleeve' + title: 'underSleeve', }) // Grainline macro('grainline', { from: points.boxBottom, - to: points.armCenter + to: points.armCenter, }) if (sa) paths.sa = paths.seam.offset(sa).attr('class', 'fabric sa') @@ -126,71 +126,71 @@ export default function (part) { macro('ld', { from: points.usWristLeft, to: points.usWristRight, - d: 15 + d: 15, }) macro('ld', { from: points.usWristLeft, to: points.ventFoldRight, - d: 30 + d: 30, }) macro('ld', { from: points.hemLeft, to: points.ventRight, - d: -15 - sa + d: -15 - sa, }) macro('ld', { from: points.hemLeft, to: points.usWristLeft, - d: 15 + sa + d: 15 + sa, }) macro('ld', { from: points.usWristRight, to: points.ventSlopeStart, - d: 15 + d: 15, }) macro('ld', { from: points.ventFoldRight, to: points.ventSlopeEnd, - d: 15 + d: 15, }) macro('ld', { from: points.usWristRight, to: points.ventFoldRight, - d: -15 + d: -15, }) macro('vd', { from: points.usWristLeft, to: points.usElbowLeft, - x: points.usLeftEdge.x - sa - 15 + x: points.usLeftEdge.x - sa - 15, }) macro('vd', { from: points.usWristLeft, to: points.usLeftEdge, - x: points.usLeftEdge.x - sa - 30 + x: points.usLeftEdge.x - sa - 30, }) macro('vd', { from: points.usLeftEdge, to: points.usTip, - x: points.usLeftEdge.x - sa - 30 + x: points.usLeftEdge.x - sa - 30, }) macro('vd', { from: points.usWristLeft, to: points.usTip, - x: points.usLeftEdge.x - sa - 45 + x: points.usLeftEdge.x - sa - 45, }) macro('ld', { from: points.usElbowLeft, - to: points.elbowRight + to: points.elbowRight, }) macro('hd', { from: points.usLeftEdge, to: points.usTip, - y: points.usTip.y - sa - 15 + y: points.usTip.y - sa - 15, }) macro('hd', { from: points.usLeftEdge, to: points.elbowRight, - y: points.usTip.y - sa - 30 + y: points.usTip.y - sa - 30, }) } } diff --git a/packages/legend/config/index.js b/packages/legend/config/index.js index 7529e7f2f81..f19e868fc31 100644 --- a/packages/legend/config/index.js +++ b/packages/legend/config/index.js @@ -10,7 +10,7 @@ export default { difficulty: 1, tags: ['documentation'], optionGroups: { - fit: ['fixme'] + fit: ['fixme'], }, measurements: [], parts: [ @@ -29,7 +29,7 @@ export default { 'scalebox', 'lineWidths', 'lineStrokes', - 'sizes' + 'sizes', ], options: { focus: '', @@ -37,7 +37,7 @@ export default { fixme: { pct: 50, min: 0, - max: 100 - } - } + max: 100, + }, + }, } diff --git a/packages/legend/src/cutonfold.js b/packages/legend/src/cutonfold.js index 7b5f6cda96f..b75d2e3d30c 100644 --- a/packages/legend/src/cutonfold.js +++ b/packages/legend/src/cutonfold.js @@ -8,7 +8,7 @@ export default (part) => { macro('cutonfold', { from: points.a, - to: points.b + to: points.b, }) return box(part, 100, 25) diff --git a/packages/legend/src/dimension.js b/packages/legend/src/dimension.js index 0c66979c4c6..4630e4ad1fc 100644 --- a/packages/legend/src/dimension.js +++ b/packages/legend/src/dimension.js @@ -8,7 +8,7 @@ export default (part) => { macro('ld', { from: points.a, - to: points.b + to: points.b, }) return box(part, 100, 25) diff --git a/packages/legend/src/grainline.js b/packages/legend/src/grainline.js index 575efec2ba0..54485b6a377 100644 --- a/packages/legend/src/grainline.js +++ b/packages/legend/src/grainline.js @@ -8,7 +8,7 @@ export default (part) => { macro('grainline', { from: points.a, - to: points.b + to: points.b, }) return box(part, 100, 25) diff --git a/packages/legend/src/index.js b/packages/legend/src/index.js index 3e88edb83df..e98fa8d89a4 100644 --- a/packages/legend/src/index.js +++ b/packages/legend/src/index.js @@ -40,7 +40,7 @@ let methods = { draftScalebox, draftLineWidths, draftLineStrokes, - draftSizes + draftSizes, } for (let m of Object.keys(methods)) Pattern.prototype[m] = methods[m] diff --git a/packages/legend/src/styles.js b/packages/legend/src/styles.js index 34e0827126e..fcd033ea763 100644 --- a/packages/legend/src/styles.js +++ b/packages/legend/src/styles.js @@ -8,7 +8,7 @@ export const lineWidths = [ 'default', 'stroke-lg', 'stroke-xl', - 'stroke-xxl' + 'stroke-xxl', ] export const lineStrokes = ['dotted', 'dashed', 'lashed'] diff --git a/packages/legend/src/title.js b/packages/legend/src/title.js index 9080a14379e..b6c2b50cd8a 100644 --- a/packages/legend/src/title.js +++ b/packages/legend/src/title.js @@ -8,7 +8,7 @@ export default (part) => { macro('title', { at: points.a, nr: 1, - title: 'Part name' + title: 'Part name', }) return box(part, 100, 65) diff --git a/packages/models/src/measurements.js b/packages/models/src/measurements.js index cecc634beac..6befb867b5d 100644 --- a/packages/models/src/measurements.js +++ b/packages/models/src/measurements.js @@ -28,7 +28,7 @@ export default { 'waistToKnee', 'waistToSeat', 'waistToUpperLeg', - 'wrist' + 'wrist', ], womenswear: [ 'ankle', @@ -66,6 +66,6 @@ export default { 'waistToSeat', 'waistToUnderbust', 'waistToUpperLeg', - 'wrist' - ] + 'wrist', + ], } diff --git a/packages/models/src/sizes.js b/packages/models/src/sizes.js index 226237dc837..7f33fb385cd 100644 --- a/packages/models/src/sizes.js +++ b/packages/models/src/sizes.js @@ -1,4 +1,4 @@ export default { menswear: [32, 34, 36, 38, 40, 42, 44, 46, 48, 50], - womenswear: [28, 30, 32, 34, 36, 38, 40, 42, 44, 46] + womenswear: [28, 30, 32, 34, 36, 38, 40, 42, 44, 46], } diff --git a/packages/mui-theme/src/index.js b/packages/mui-theme/src/index.js index ce5416cef8f..b3e25e05527 100644 --- a/packages/mui-theme/src/index.js +++ b/packages/mui-theme/src/index.js @@ -5,18 +5,18 @@ const colors = { primary: darkBg, secondary: lightBg, link: '#74c0fc', - paper: '#FFF' + paper: '#FFF', }, dark: { primary: lightBg, secondary: darkBg, link: '#74c0fc', - paper: '#000' - } + paper: '#000', + }, } const asTitle = { fontFamily: 'Ubuntu', - fontWeight: '700' + fontWeight: '700', } const important = '!important' @@ -24,8 +24,8 @@ const getTheme = (mode) => { let c = colors[mode] let forceColor = { root: { - color: c.primary + important - } + color: c.primary + important, + }, } return { overrides: { @@ -37,28 +37,28 @@ const getTheme = (mode) => { MuiSlider: { container: { padding: '25px 0' }, track: { height: '4px' }, - thumb: { width: '16px', height: '16px' } + thumb: { width: '16px', height: '16px' }, }, MuiToolbar: { root: { maxWidth: '1600px', margin: 'auto', - width: '100%' - } - } + width: '100%', + }, + }, }, palette: { primary: { - main: c.primary + main: c.primary, }, secondary: { - main: c.secondary + main: c.secondary, }, type: mode, background: { paper: c.paper, - default: c.secondary - } + default: c.secondary, + }, }, typography: { fontFamily: [ @@ -72,10 +72,10 @@ const getTheme = (mode) => { 'sans-serif', '"Apple Color Emoji"', '"Segoe UI Emoji"', - '"Segoe UI Symbol"' - ].join(',') + '"Segoe UI Symbol"', + ].join(','), }, - themeName: mode + themeName: mode, } } diff --git a/packages/paco/config/index.js b/packages/paco/config/index.js index c8f437673fe..16f4e8cf6f1 100644 --- a/packages/paco/config/index.js +++ b/packages/paco/config/index.js @@ -23,8 +23,8 @@ export default { 'crotchSeamCurveAngle', 'grainlinePosition', 'legBalance', - 'waistBalance' - ] + 'waistBalance', + ], }, measurements: [ 'crossSeam', @@ -39,7 +39,7 @@ export default { 'waistToKnee', 'waistToHips', 'waistToSeat', - 'waistToUpperLeg' + 'waistToUpperLeg', ], parts: [ 'back', @@ -49,7 +49,7 @@ export default { 'pocketBagFront', 'pocketBagBack', 'pocketWelt', - 'pocketWeltInterfacing' + 'pocketWeltInterfacing', ], inject: { back: 'titanBack', @@ -57,14 +57,14 @@ export default { pocketBagFront: 'front', pocketBagBack: 'back', pocketWelt: 'pocketBagBack', - pocketWeltInterfacing: 'pocketWelt' + pocketWeltInterfacing: 'pocketWelt', }, dependencies: { front: 'back', pocketBagFront: 'front', pocketBagBack: 'back', pocketWelt: 'pocketBagBack', - pocketWeltInterfacing: 'pocketWelt' + pocketWeltInterfacing: 'pocketWelt', }, hide: ['titanBack', 'titanFront'], options: { @@ -113,6 +113,6 @@ export default { crotchSeamCurveBend: { pct: 80, min: 45, max: 100 }, crotchSeamCurveAngle: { deg: 25, min: 0, max: 35 }, waistBalance: { pct: 60, min: 30, max: 90 }, - grainlinePosition: { pct: 45, min: 30, max: 60 } - } + grainlinePosition: { pct: 45, min: 30, max: 60 }, + }, } diff --git a/packages/paco/src/back.js b/packages/paco/src/back.js index b2ec1ac841c..1b4f4d67983 100644 --- a/packages/paco/src/back.js +++ b/packages/paco/src/back.js @@ -52,7 +52,7 @@ export default function (part) { measurements, complete, paperless, - macro + macro, } = part.shorthand() // Adapt bottom leg width based on heel & heel ease @@ -153,7 +153,7 @@ export default function (part) { .attr('class', 'lining lashed') macro('sprinkle', { snippet: 'bnotch', - on: ['pocketLeft', 'pocketRight', 'pocketBagWaistLeft', 'pocketBagWaistRight'] + on: ['pocketLeft', 'pocketRight', 'pocketBagWaistLeft', 'pocketBagWaistRight'], }) } @@ -186,17 +186,17 @@ export default function (part) { macro('hd', { from: points.floorIn, to: points.floorOut, - y: points.floorIn.y - 30 + y: points.floorIn.y - 30, }) macro('hd', { from: points.floorIn, to: points.floor, - y: points.floorIn.y - 15 + y: points.floorIn.y - 15, }) macro('hd', { from: points.floor, to: points.floorOut, - y: points.floorIn.y - 15 + y: points.floorIn.y - 15, }) macro('vd', { from: points.floorOut, @@ -204,97 +204,97 @@ export default function (part) { x: (points.seatOut.x > points.styleWaistOut.x ? points.seatOut.x : points.styleWaistOut.x) + sa + - 15 + 15, }) macro('vd', { from: points.floorIn, to: points.fork, - x: points.fork.x - sa - 15 + x: points.fork.x - sa - 15, }) macro('vd', { from: points.fork, to: points.styleWaistIn, - x: points.fork.x - sa - 15 + x: points.fork.x - sa - 15, }) macro('vd', { from: points.floorIn, to: points.styleWaistIn, - x: points.fork.x - sa - 30 + x: points.fork.x - sa - 30, }) macro('vd', { from: points.crossSeamCurveStart, to: points.styleWaistIn, - x: points.crossSeamCurveStart.x - sa - 15 + x: points.crossSeamCurveStart.x - sa - 15, }) macro('hd', { from: points.styleWaistIn, to: points.grainlineTop, - y: points.styleWaistIn.y - sa - 15 + y: points.styleWaistIn.y - sa - 15, }) macro('hd', { from: points.crossSeamCurveStart, to: points.grainlineTop, - y: points.styleWaistIn.y - sa - 30 + y: points.styleWaistIn.y - sa - 30, }) macro('hd', { from: points.crossSeamCurveMax, to: points.grainlineTop, - y: points.styleWaistIn.y - sa - 45 + y: points.styleWaistIn.y - sa - 45, }) macro('hd', { from: points.fork, to: points.grainlineTop, - y: points.styleWaistIn.y - sa - 60 + y: points.styleWaistIn.y - sa - 60, }) macro('hd', { from: points.grainlineTop, to: points.styleWaistOut, - y: points.styleWaistIn.y - sa - 15 + y: points.styleWaistIn.y - sa - 15, }) if (points.seatOut.x > points.styleWaistOut.x) { macro('hd', { from: points.grainlineTop, to: points.seatOut, - y: points.styleWaistIn.y - sa - 30 + y: points.styleWaistIn.y - sa - 30, }) } if (options.frontPockets) { macro('ld', { from: points.styleWaistOut, to: points.pocketFlapTopIn, - d: -15 + d: -15, }) macro('ld', { from: points.pocketFlapTopIn, to: points.pocketFlapBottomIn, - d: -15 + d: -15, }) macro('ld', { from: points.pocketFlapTopIn, to: points.pocketFlapTopOut, - d: -15 + d: -15, }) } if (options.backPockets) { macro('ld', { from: points.styleWaistIn, to: points.pocketBagWaistLeft, - d: -15 - sa + d: -15 - sa, }) macro('ld', { from: points.styleWaistIn, to: points.pocketWaistCenter, - d: -30 - sa + d: -30 - sa, }) macro('ld', { from: points.pocketCenter, to: points.pocketWaistCenter, - d: -15 + d: -15, }) macro('ld', { from: points.pocketBagBottomRight, to: points.pocketBagWaistRight, - d: -15 + d: -15, }) } } diff --git a/packages/paco/src/cuff.js b/packages/paco/src/cuff.js index 6de175a77cf..6fd5cd544d0 100644 --- a/packages/paco/src/cuff.js +++ b/packages/paco/src/cuff.js @@ -9,7 +9,7 @@ export default function (part) { options, complete, paperless, - macro + macro, } = part.shorthand() let len = store.get('frontAnkle') + store.get('backAnkle') @@ -37,11 +37,11 @@ export default function (part) { macro('title', { at: points.title, nr: 4, - title: 'cuff' + title: 'cuff', }) macro('grainline', { from: points.topLeft.shift(0, 15), - to: points.bottomLeft.shift(0, 15) + to: points.bottomLeft.shift(0, 15), }) if (sa) { @@ -64,12 +64,12 @@ export default function (part) { macro('vd', { from: points.bottomRight, to: points.topRight, - x: points.topRight.x + 15 + sa + x: points.topRight.x + 15 + sa, }) macro('hd', { from: points.bottomLeft, to: points.bottomRight, - y: points.bottomRight.y + 15 + sa + y: points.bottomRight.y + 15 + sa, }) } } diff --git a/packages/paco/src/front.js b/packages/paco/src/front.js index fbe2cb32760..ec8ebad8909 100644 --- a/packages/paco/src/front.js +++ b/packages/paco/src/front.js @@ -63,7 +63,7 @@ export default function (part) { measurements, complete, paperless, - macro + macro, } = part.shorthand() // Adapt bottom leg based on heel and heel ease @@ -181,7 +181,7 @@ export default function (part) { .attr('class', 'fabric lashed') macro('sprinkle', { snippet: 'notch', - on: ['flapTopLeft', 'flapBottomLeft', 'topLeft', 'topRight'] + on: ['flapTopLeft', 'flapBottomLeft', 'topLeft', 'topRight'], }) } @@ -220,27 +220,27 @@ export default function (part) { macro('hd', { from: points.floorOut, to: points.floor, - y: points.floorIn.y - 15 + y: points.floorIn.y - 15, }) macro('hd', { from: points.floor, to: points.floorIn, - y: points.floorIn.y - 15 + y: points.floorIn.y - 15, }) macro('hd', { from: points.floorOut, to: points.floorIn, - y: points.floorIn.y - 30 + y: points.floorIn.y - 30, }) macro('vd', { from: points.floorOut, to: points.fork, - x: points.fork.x + sa + 15 + x: points.fork.x + sa + 15, }) macro('vd', { from: points.fork, to: points.styleWaistIn, - x: points.fork.x + sa + 15 + x: points.fork.x + sa + 15, }) macro('vd', { from: points.floorIn, @@ -248,70 +248,70 @@ export default function (part) { x: (points.seatOut.x < points.styleWaistOut.x ? points.seatOut.x : points.styleWaistOut.x) - sa - - 15 + 15, }) macro('vd', { from: points.crotchSeamCurveStart, to: points.styleWaistIn, - x: points.crotchSeamCurveStart.x + sa + 15 + x: points.crotchSeamCurveStart.x + sa + 15, }) macro('hd', { from: points.styleWaistOut, to: points.grainlineTop, - y: points.styleWaistIn.y - sa - 15 + y: points.styleWaistIn.y - sa - 15, }) if (points.styleWaistOut.x < points.seatOut.x) { macro('hd', { from: points.styleWaistOut, to: points.grainlineTop, - y: points.styleWaistIn.y - sa - 30 + y: points.styleWaistIn.y - sa - 30, }) } macro('hd', { from: points.grainlineTop, to: points.styleWaistIn, - y: points.styleWaistIn.y - sa - 15 + y: points.styleWaistIn.y - sa - 15, }) macro('hd', { from: points.grainlineTop, to: points.crotchSeamCurveStart, - y: points.styleWaistIn.y - sa - 30 + y: points.styleWaistIn.y - sa - 30, }) macro('hd', { from: points.grainlineTop, to: points.crotchSeamCurveMax, - y: points.styleWaistIn.y - sa - 45 + y: points.styleWaistIn.y - sa - 45, }) macro('hd', { from: points.grainlineTop, to: points.fork, - y: points.styleWaistIn.y - sa - 60 + y: points.styleWaistIn.y - sa - 60, }) if (options.frontPockets) { macro('ld', { from: points.pocketFlapTopIn, to: points.styleWaistOut, - d: -15 + d: -15, }) macro('ld', { from: points.pocketFlapTopIn, to: points.pocketFlapBottomIn, - d: -15 + d: -15, }) macro('ld', { from: points.pocketFlapTopOut, to: points.pocketFlapTopIn, - d: 15 + d: 15, }) macro('ld', { from: points.styleWaistOut || points.waistOut, to: points.topLeft, - d: 10 + sa + d: 10 + sa, }) macro('ld', { from: points.topLeft, to: points.topRight, - d: 10 + sa + d: 10 + sa, }) } } diff --git a/packages/paco/src/pocketbagback.js b/packages/paco/src/pocketbagback.js index 145054d3716..c09eb6c4fb6 100644 --- a/packages/paco/src/pocketbagback.js +++ b/packages/paco/src/pocketbagback.js @@ -18,7 +18,7 @@ export default function (part) { 'pocketBagBottomLeft', 'pocketBagBottomRight', 'pocketLeft', - 'pocketRight' + 'pocketRight', ] const angle = -1 * points.pocketLeft.angle(points.pocketRight) for (const point in points) { @@ -40,15 +40,15 @@ export default function (part) { macro('title', { at: points.title, nr: 6, - title: 'backPocketBag' + title: 'backPocketBag', }) macro('cutonfold', { to: points.pocketBagBottomRight, - from: points.pocketBagBottomLeft + from: points.pocketBagBottomLeft, }) macro('grainline', { from: points.pocketBagBottomLeft.shift(0, 15), - to: points.pocketBagWaistLeft.shift(0, 15) + to: points.pocketBagWaistLeft.shift(0, 15), }) macro('scalebox', false) paths.cut = new Path() @@ -57,7 +57,7 @@ export default function (part) { .attr('class', 'lining lashed') macro('sprinkle', { snippet: 'bnotch', - on: ['pocketLeft', 'pocketRight', 'pocketBagWaistLeft', 'pocketBagWaistRight'] + on: ['pocketLeft', 'pocketRight', 'pocketBagWaistLeft', 'pocketBagWaistRight'], }) if (sa) { @@ -78,22 +78,22 @@ export default function (part) { macro('hd', { from: points.pocketBagBottomLeft, to: points.pocketBagBottomRight, - y: points.pocketBagBottomLeft.y + 15 + sa + y: points.pocketBagBottomLeft.y + 15 + sa, }) macro('hd', { from: points.pocketLeft, to: points.pocketRight, - y: points.pocketLeft.y + 15 + sa + y: points.pocketLeft.y + 15 + sa, }) macro('vd', { from: points.pocketRight, to: points.pocketBagWaistRight, - x: points.pocketBagBottomRight.x + 15 + sa + x: points.pocketBagBottomRight.x + 15 + sa, }) macro('vd', { from: points.pocketBagBottomRight, to: points.pocketBagWaistRight, - x: points.pocketBagBottomRight.x + 30 + sa + x: points.pocketBagBottomRight.x + 30 + sa, }) } } diff --git a/packages/paco/src/pocketbagfront.js b/packages/paco/src/pocketbagfront.js index 2f650616ef0..583c21565d3 100644 --- a/packages/paco/src/pocketbagfront.js +++ b/packages/paco/src/pocketbagfront.js @@ -33,16 +33,16 @@ export default function (part) { macro('title', { at: points.title, nr: 5, - title: 'pocketBag' + title: 'pocketBag', }) macro('cutonfold', { from: points.bottomRight, to: points.topRight, - grainline: true + grainline: true, }) macro('sprinkle', { snippet: 'notch', - on: ['flapTopLeft', 'flapBottomLeft'] + on: ['flapTopLeft', 'flapBottomLeft'], }) if (sa) { @@ -64,32 +64,32 @@ export default function (part) { macro('hd', { from: points.flapBottomLeft, to: points.bottomRight, - y: points.bottomRight.y + 15 + sa + y: points.bottomRight.y + 15 + sa, }) macro('hd', { from: points.topLeft, to: points.topRight, - y: points.topLeft.y - 15 - sa + y: points.topLeft.y - 15 - sa, }) macro('vd', { from: points.bottomRight, to: points.topRight, - x: points.topRight.x + 15 + sa + x: points.topRight.x + 15 + sa, }) macro('vd', { from: points.bottomRight, to: points.topLeft, - x: points.topRight.x + 30 + sa + x: points.topRight.x + 30 + sa, }) macro('ld', { from: points.flapTopLeft, to: points.topLeft, - d: 15 + sa + d: 15 + sa, }) macro('ld', { from: points.flapBottomLeft, to: points.flapTopLeft, - d: 15 + sa + d: 15 + sa, }) } } diff --git a/packages/paco/src/pocketwelt.js b/packages/paco/src/pocketwelt.js index db03763393d..5fb1e170bfc 100644 --- a/packages/paco/src/pocketwelt.js +++ b/packages/paco/src/pocketwelt.js @@ -9,7 +9,7 @@ export default function (part) { options, complete, paperless, - macro + macro, } = part.shorthand() // Don't bother of we're not drafting back pockets @@ -42,15 +42,15 @@ export default function (part) { macro('title', { at: points.title, nr: 7, - title: 'pocketWelt' + title: 'pocketWelt', }) macro('grainline', { from: points.topLeft.shift(0, 15), - to: points.bottomLeft.shift(0, 15) + to: points.bottomLeft.shift(0, 15), }) macro('sprinkle', { snippet: 'bnotch', - on: ['pocketLeft', 'pocketRight', 'pocketBagWaistLeft', 'pocketBagWaistRight'] + on: ['pocketLeft', 'pocketRight', 'pocketBagWaistLeft', 'pocketBagWaistRight'], }) if (sa) { @@ -61,17 +61,17 @@ export default function (part) { macro('hd', { from: points.bottomLeft, to: points.bottomRight, - y: points.bottomLeft.y + 15 + sa + y: points.bottomLeft.y + 15 + sa, }) macro('hd', { from: points.pocketLeft, to: points.pocketRight, - y: points.topLeft.y - 15 - sa + y: points.topLeft.y - 15 - sa, }) macro('vd', { from: points.bottomRight, to: points.topLeft, - x: points.topRight.x + 15 + sa + x: points.topRight.x + 15 + sa, }) } } diff --git a/packages/paco/src/pocketweltinterfacing.js b/packages/paco/src/pocketweltinterfacing.js index a7f1cbc266b..3850d018676 100644 --- a/packages/paco/src/pocketweltinterfacing.js +++ b/packages/paco/src/pocketweltinterfacing.js @@ -25,28 +25,28 @@ export default function (part) { macro('title', { at: points.title, nr: 8, - title: 'pocketWeltInterfacing' + title: 'pocketWeltInterfacing', }) macro('sprinkle', { snippet: 'bnotch', - on: ['pocketLeft', 'pocketRight', 'pocketBagWaistLeft', 'pocketBagWaistRight'] + on: ['pocketLeft', 'pocketRight', 'pocketBagWaistLeft', 'pocketBagWaistRight'], }) if (paperless) { macro('hd', { from: points.bottomLeft, to: points.bottomRight, - y: points.bottomLeft.y + 15 + y: points.bottomLeft.y + 15, }) macro('hd', { from: points.pocketLeft, to: points.pocketRight, - y: points.topLeft.y - 15 + y: points.topLeft.y - 15, }) macro('vd', { from: points.bottomRight, to: points.topRight, - x: points.topRight.x + 15 + x: points.topRight.x + 15, }) } } diff --git a/packages/paco/src/waistband.js b/packages/paco/src/waistband.js index 150589601a0..23420ed7831 100644 --- a/packages/paco/src/waistband.js +++ b/packages/paco/src/waistband.js @@ -10,7 +10,7 @@ export default function (part) { options, complete, paperless, - macro + macro, } = part.shorthand() points.topLeft = new Point(0, 0) @@ -50,7 +50,7 @@ export default function (part) { from: points.midLeft, to: points.midRight, y: points.midRight.y + 25, - text: utils.units(store.get('frontWaist') + store.get('backWaist')) + text: utils.units(store.get('frontWaist') + store.get('backWaist')), }) if (complete) { @@ -60,11 +60,11 @@ export default function (part) { macro('title', { at: points.title, nr: 3, - title: 'waistband' + title: 'waistband', }) macro('grainline', { from: points.topLeft.shift(0, 15), - to: points.bottomLeft.shift(0, 15) + to: points.bottomLeft.shift(0, 15), }) macro('sprinkle', { snippet: 'eyelet', on: ['eyeletLeft', 'eyeletRight'] }) macro('sprinkle', { snippet: 'notch', on: ['midLeft', 'midRight'] }) @@ -89,7 +89,7 @@ export default function (part) { macro('vd', { from: points.bottomRight, to: points.topRight, - x: points.topRight.x + 15 + sa + x: points.topRight.x + 15 + sa, }) } } diff --git a/packages/pattern-info/src/index.js b/packages/pattern-info/src/index.js index ecfec038c35..c1232267097 100644 --- a/packages/pattern-info/src/index.js +++ b/packages/pattern-info/src/index.js @@ -41,7 +41,7 @@ export const list = [ 'titan', 'trayvon', 'wahid', - 'waralee' + 'waralee', ] export const withoutBreasts = [ @@ -73,7 +73,7 @@ export const withoutBreasts = [ 'titan', 'trayvon', 'wahid', - 'waralee' + 'waralee', ] export const withBreasts = ['bella', 'breanna', 'cathrin', 'carlita', 'diana', 'simone'] diff --git a/packages/pattern-info/src/prebuild.js b/packages/pattern-info/src/prebuild.js index 5a44f05185b..48902ece492 100644 --- a/packages/pattern-info/src/prebuild.js +++ b/packages/pattern-info/src/prebuild.js @@ -71,7 +71,7 @@ const patterns = { titan, trayvon, wahid, - waralee + waralee, } const patternOptions = (config) => { let all = [] @@ -139,7 +139,7 @@ for (let pattern of Object.keys(patterns)) { type: patterns[pattern].type, difficulty: patterns[pattern].difficulty, tags: patterns[pattern].tags, - deprecated: patterns[pattern].deprecated || false + deprecated: patterns[pattern].deprecated || false, } } diff --git a/packages/penelope/config/index.js b/packages/penelope/config/index.js index 549dc87e270..44355ac1b97 100644 --- a/packages/penelope/config/index.js +++ b/packages/penelope/config/index.js @@ -22,15 +22,15 @@ export default { 'waistBandWidth', 'zipperLocation', 'nrOfDarts', - 'hemBonus' + 'hemBonus', ], advanced: [ 'seatEase', 'waistEase', 'backDartDepthFactor', 'frontDartDepthFactor', - 'dartToSideSeamFactor' - ] + 'dartToSideSeamFactor', + ], }, measurements: ['waist', 'seat', 'waistToHips', 'waistToSeat', 'waistToKnee'], dependencies: {}, @@ -68,6 +68,6 @@ export default { waistEase: { mm: 5, min: 0, max: 15 }, backDartDepthFactor: { pct: 50, min: 35, max: 70 }, frontDartDepthFactor: { pct: 45, min: 30, max: 65 }, - dartToSideSeamFactor: { pct: 50, min: 30, max: 70 } - } + dartToSideSeamFactor: { pct: 50, min: 30, max: 70 }, + }, } diff --git a/packages/penelope/src/back.js b/packages/penelope/src/back.js index ab0df26b10d..75a15d0c8c5 100644 --- a/packages/penelope/src/back.js +++ b/packages/penelope/src/back.js @@ -14,7 +14,7 @@ export default function (part) { complete, sa, paperless, - macro + macro, } = part.shorthand() BuildMainShape(part, false) @@ -58,7 +58,7 @@ export default function (part) { if (complete) { macro('grainline', { from: points.grainlineTop, - to: points.grainlineBottom + to: points.grainlineBottom, }) snippets.logo = new Snippet('logo', points.logoAnchor) @@ -68,13 +68,13 @@ export default function (part) { from: points.lWaist, to: points.lLeg, margin: 5, - offset: 10 + offset: 10, }) } macro('title', { nr: 2, at: points.titleAnchor, - title: 'back' + title: 'back', }) if (sa) { @@ -103,29 +103,29 @@ export default function (part) { macro('hd', { from: points.vHem, to: points.rHem, - y: points.rHem.y - options.paperlessOffset - sa + y: points.rHem.y - options.paperlessOffset - sa, }) macro('hd', { from: points.vTop, to: points.lVent, - y: points.vTop.y + y: points.vTop.y, }) macro('vd', { from: points.lSeat, to: points.lVent, - x: points.lWaist.x - options.paperlessOffset - sa + x: points.lWaist.x - options.paperlessOffset - sa, }) macro('vd', { from: points.lVent, to: points.vTop, - x: points.lVent.x + x: points.lVent.x, }) } else { macro('hd', { from: points.lHem, to: points.rHem, - y: points.rHem.y - options.paperlessOffset - sa + y: points.rHem.y - options.paperlessOffset - sa, }) } } diff --git a/packages/penelope/src/front.js b/packages/penelope/src/front.js index 4614d7021ce..ea0d6db06ac 100644 --- a/packages/penelope/src/front.js +++ b/packages/penelope/src/front.js @@ -14,7 +14,7 @@ export default function (part) { complete, sa, paperless, - macro + macro, } = part.shorthand() BuildMainShape(part, true) @@ -32,16 +32,16 @@ export default function (part) { from: points.lWaist, to: points.lLeg, margin: 5, - offset: 10 + offset: 10, }) macro('title', { nr: 1, at: points.titleAnchor, - title: 'front' + title: 'front', }) macro('grainline', { from: points.grainlineTop, - to: points.grainlineBottom + to: points.grainlineBottom, }) points.scaleBox = points.logoAnchor.shift(270, 100) @@ -61,7 +61,7 @@ export default function (part) { macro('hd', { from: points.lHem, to: points.rHem, - y: points.rHem.y - options.paperlessOffset + y: points.rHem.y - options.paperlessOffset, }) } } diff --git a/packages/penelope/src/shape.js b/packages/penelope/src/shape.js index 53e2b3ff4a1..803e2c90bb4 100644 --- a/packages/penelope/src/shape.js +++ b/packages/penelope/src/shape.js @@ -11,7 +11,7 @@ function BuildMainShape(part, frontPart) { paths, store, paperless, - macro + macro, } = part.shorthand() let skirtLength = measurements.waistToKnee * (1 + options.lengthBonus) // + options.hem; @@ -213,23 +213,23 @@ function BuildMainShape(part, frontPart) { macro('hd', { from: points.lSeat, to: points.rSeat, - y: points.rSeat.y + y: points.rSeat.y, }) macro('vd', { from: points.lWaist, to: points.rWaist, - x: points.rWaist.x + options.paperlessOffset + sa + x: points.rWaist.x + options.paperlessOffset + sa, }) macro('vd', { from: points.lWaist, to: points.lLeg, - x: points.lLeg.x + options.paperlessOffset + sa + x: points.lLeg.x + options.paperlessOffset + sa, }) if (options.hem > 0) { macro('vd', { from: points.lLeg, to: points.lHem, - x: points.lLeg.x + options.paperlessOffset + sa + x: points.lLeg.x + options.paperlessOffset + sa, }) } @@ -237,81 +237,81 @@ function BuildMainShape(part, frontPart) { macro('hd', { from: points.lWaist, to: points.dart1Middle, - y: points.dart1Middle.y + y: points.dart1Middle.y, }) macro('hd', { from: points.lWaist, to: points.dart1Start, - y: points.dart1Start.y - options.paperlessOffset - sa + y: points.dart1Start.y - options.paperlessOffset - sa, }) macro('hd', { from: points.dart1Start, to: points.dart1End, - y: points.dart1End.y - options.paperlessOffset - sa + y: points.dart1End.y - options.paperlessOffset - sa, }) if (store.get('nrOfDarts') > 1) { macro('hd', { from: points.lWaist, to: points.dart2Middle, - y: points.dart2Middle.y + y: points.dart2Middle.y, }) macro('hd', { from: points.dart1End, to: points.dart2Start, - y: points.dart2Start.y - options.paperlessOffset - sa + y: points.dart2Start.y - options.paperlessOffset - sa, }) macro('hd', { from: points.dart2Start, to: points.dart2End, - y: points.dart2End.y - options.paperlessOffset - sa + y: points.dart2End.y - options.paperlessOffset - sa, }) macro('hd', { from: points.dart2End, to: points.rWaist, - y: points.rWaist.y - options.paperlessOffset - sa + y: points.rWaist.y - options.paperlessOffset - sa, }) macro('vd', { from: points.lWaist, to: points.dart2Middle, - x: points.lWaist.x - options.paperlessOffset - sa + x: points.lWaist.x - options.paperlessOffset - sa, }) macro('vd', { from: points.dart2Middle, to: points.dart1Middle, - x: points.lWaist.x - options.paperlessOffset - sa + x: points.lWaist.x - options.paperlessOffset - sa, }) macro('vd', { from: points.dart1Middle, to: points.lSeat, - x: points.lWaist.x - options.paperlessOffset - sa + x: points.lWaist.x - options.paperlessOffset - sa, }) } else { macro('vd', { from: points.lWaist, to: points.dart1Middle, - x: points.lWaist.x - options.paperlessOffset - sa + x: points.lWaist.x - options.paperlessOffset - sa, }) macro('hd', { from: points.dart1End, to: points.rWaist, - y: points.rWaist.y - options.paperlessOffset - sa + y: points.rWaist.y - options.paperlessOffset - sa, }) macro('vd', { from: points.dart1Middle, to: points.lSeat, - x: points.lWaist.x - options.paperlessOffset - sa + x: points.lWaist.x - options.paperlessOffset - sa, }) } } else { macro('hd', { from: points.lWaist, to: points.rWaist, - y: points.rWaist.y - options.paperlessOffset - sa + y: points.rWaist.y - options.paperlessOffset - sa, }) macro('vd', { from: points.lWaist, to: points.lSeat, - x: points.lWaist.x - options.paperlessOffset - sa + x: points.lWaist.x - options.paperlessOffset - sa, }) } } diff --git a/packages/penelope/src/utils.js b/packages/penelope/src/utils.js index 77df63a0ac9..802e1391ec9 100644 --- a/packages/penelope/src/utils.js +++ b/packages/penelope/src/utils.js @@ -142,7 +142,7 @@ function addDartToCurve(part, curvePath, distance, dartSize, dartDepth) { let curveWithDart = { left: curveLeftOfDart, dart: dart, - right: curveRightOfDart + right: curveRightOfDart, } /* diff --git a/packages/penelope/src/waistband.js b/packages/penelope/src/waistband.js index c4be5e88a91..ddb20888383 100644 --- a/packages/penelope/src/waistband.js +++ b/packages/penelope/src/waistband.js @@ -11,7 +11,7 @@ export default function (part) { complete, sa, paperless, - macro + macro, } = part.shorthand() if (!options.waistBand) { @@ -47,7 +47,7 @@ export default function (part) { to: points.TL, margin: 15, offset: 15, - grainline: true + grainline: true, }) snippets.logo = new Snippet('logo', points.logoAnchor) @@ -57,7 +57,7 @@ export default function (part) { at: points.titleAnchor, title: 'waistband', rotation: 90, - scale: 0.75 + scale: 0.75, }) if (sa) { @@ -73,12 +73,12 @@ export default function (part) { macro('vd', { from: points.TL, to: points.BL, - x: points.TL.x + options.paperlessOffset + x: points.TL.x + options.paperlessOffset, }) macro('hd', { from: points.BL, to: points.BR, - y: points.BR.y - options.paperlessOffset + y: points.BR.y - options.paperlessOffset, }) } diff --git a/packages/plugin-banner/src/index.js b/packages/plugin-banner/src/index.js index c08dfaa1ad2..6f4a03b6a50 100644 --- a/packages/plugin-banner/src/index.js +++ b/packages/plugin-banner/src/index.js @@ -7,7 +7,7 @@ export default { preRender: function (svg) { if (svg.attributes.get('freesewing:plugin-banner') === false) svg.attributes.set('freesewing:plugin-banner', version) - } + }, }, macros: { banner: function (so) { @@ -18,6 +18,6 @@ export default { for (let t of so.text) this.paths[so.path].attr('data-text', t) this.paths[so.path].attr('data-text', ' '.repeat(so.spaces)) } - } - } + }, + }, } diff --git a/packages/plugin-bartack/src/bartack.js b/packages/plugin-bartack/src/bartack.js index 49310e65927..86b68a6bc75 100644 --- a/packages/plugin-bartack/src/bartack.js +++ b/packages/plugin-bartack/src/bartack.js @@ -26,7 +26,7 @@ const getPoints = (path, so) => { let points = { path1: [path1.start()], - path2: [path2.start()] + path2: [path2.start()], } let steps = Math.ceil((len / so.width) * so.density) for (let i = 1; i < steps; i++) { @@ -54,7 +54,7 @@ export default function bartack(so, self) { start: 0, end: 1, bartackAlong: false, - bartackFractionAlong: false + bartackFractionAlong: false, } so = { ...defaults, ...so } diff --git a/packages/plugin-bartack/src/index.js b/packages/plugin-bartack/src/index.js index a70bed9fb28..cd8e61f7222 100644 --- a/packages/plugin-bartack/src/index.js +++ b/packages/plugin-bartack/src/index.js @@ -9,7 +9,7 @@ export default { if (svg.attributes.get('freesewing:plugin-bartack') === false) { svg.attributes.set('freesewing:plugin-bartack', version) } - } + }, }, macros: { bartack: function (so) { @@ -25,6 +25,6 @@ export default { let self = this so.bartackFractionAlong = true return bartack(so, self) - } - } + }, + }, } diff --git a/packages/plugin-bundle/src/index.js b/packages/plugin-bundle/src/index.js index 90f2a20b2a6..22e432527af 100644 --- a/packages/plugin-bundle/src/index.js +++ b/packages/plugin-bundle/src/index.js @@ -21,7 +21,7 @@ let bundle = [ scalebox, round, sprinkle, - measurements + measurements, ] function bundleHooks() { @@ -53,5 +53,5 @@ export default { name: name, version: version, hooks: bundleHooks(), - macros: bundleMacros() + macros: bundleMacros(), } diff --git a/packages/plugin-bust/src/index.js b/packages/plugin-bust/src/index.js index ac952dc409c..dd4296511af 100644 --- a/packages/plugin-bust/src/index.js +++ b/packages/plugin-bust/src/index.js @@ -9,6 +9,6 @@ export default { settings.measurements.bust = settings.measurements.chest settings.measurements.chest = settings.measurements.highBust } - } - } + }, + }, } diff --git a/packages/plugin-buttons/src/index.js b/packages/plugin-buttons/src/index.js index 2425ee84ee9..87d3b00b972 100644 --- a/packages/plugin-buttons/src/index.js +++ b/packages/plugin-buttons/src/index.js @@ -11,6 +11,6 @@ export default { if (svg.attributes.get('freesewing:plugin-buttons') === false) svg.attributes.set('freesewing:plugin-buttons', version) svg.defs += button + buttonhole + snaps - } - } + }, + }, } diff --git a/packages/plugin-cutonfold/src/index.js b/packages/plugin-cutonfold/src/index.js index 0eb1a2417bd..c581222a099 100644 --- a/packages/plugin-cutonfold/src/index.js +++ b/packages/plugin-cutonfold/src/index.js @@ -10,7 +10,7 @@ export default { svg.attributes.set('freesewing:plugin-cutonfold', version) svg.defs += markers } - } + }, }, macros: { cutonfold: function (so) { @@ -27,7 +27,7 @@ export default { offset: 15, margin: 5, prefix: '', - ...so + ...so, } points['cutonfoldFrom' + so.prefix] = so.from.shiftFractionTowards(so.to, so.margin / 100) points['cutonfoldTo' + so.prefix] = so.to.shiftFractionTowards(so.from, so.margin / 100) @@ -48,6 +48,6 @@ export default { .attr('marker-end', 'url(#cutonfoldTo)') .attr('data-text', text) .attr('data-text-class', 'center fill-note') - } - } + }, + }, } diff --git a/packages/plugin-dimension/src/index.js b/packages/plugin-dimension/src/index.js index be4e90388db..cb99b03a43b 100644 --- a/packages/plugin-dimension/src/index.js +++ b/packages/plugin-dimension/src/index.js @@ -72,7 +72,7 @@ export default { svg.attributes.set('freesewing:plugin-dimension', version) svg.defs += markers } - } + }, }, macros: { // horizontal @@ -130,6 +130,6 @@ export default { if (id.slice(0, prefix.length) === prefix) delete this[type][id] } } - } - } + }, + }, } diff --git a/packages/plugin-export-dxf/src/dxf.js b/packages/plugin-export-dxf/src/dxf.js index 25d32371e64..cd476316c0b 100644 --- a/packages/plugin-export-dxf/src/dxf.js +++ b/packages/plugin-export-dxf/src/dxf.js @@ -204,16 +204,16 @@ Dxf.prototype.render = function (pattern) { lineTypes: [ { name: 'CONTINUOUS', - description: 'SOLIDLINE' - } + description: 'SOLIDLINE', + }, ], layers: [ { name: 1, color: 7, - lineType: 'CONTINIOUS' - } - ] + lineType: 'CONTINIOUS', + }, + ], } let dxf = '' diff --git a/packages/plugin-export-dxf/src/index.js b/packages/plugin-export-dxf/src/index.js index 9b903cdabd4..9c203bd0741 100644 --- a/packages/plugin-export-dxf/src/index.js +++ b/packages/plugin-export-dxf/src/index.js @@ -8,6 +8,6 @@ export default { hooks: { postDraft: (pattern, config = { precision: 1 }) => { pattern.exportDxf = () => new Dxf(config).render(pattern) - } - } + }, + }, } diff --git a/packages/plugin-flip/src/index.js b/packages/plugin-flip/src/index.js index f9c669a82a8..1a5dd9793bc 100644 --- a/packages/plugin-flip/src/index.js +++ b/packages/plugin-flip/src/index.js @@ -7,7 +7,7 @@ export default { preRender: function (svg) { if (svg.attributes.get('freesewing:plugin-flip') === false) svg.attributes.set('freesewing:plugin-flip', version) - } + }, }, macros: { flip: function () { @@ -46,6 +46,6 @@ export default { if (wasFlipped !== false) wasFlipped = parseInt(wasFlipped) if (wasFlipped !== flipped) this.snippets[id].anchor.x = this.snippets[id].anchor.x * -1 } - } - } + }, + }, } diff --git a/packages/plugin-gore/src/index.js b/packages/plugin-gore/src/index.js index 1498ab2d59a..e910bb00859 100644 --- a/packages/plugin-gore/src/index.js +++ b/packages/plugin-gore/src/index.js @@ -7,7 +7,7 @@ export default { preRender: function (svg) { if (svg.attributes.get('freesewing:plugin-gore') === false) svg.attributes.set('freesewing:plugin-gore', version) - } + }, }, macros: { gore: function (so) { @@ -59,6 +59,6 @@ export default { if (typeof so.render !== 'undefined' && so.render) this.paths[prefix + 'seam'].render = true else this.paths[prefix + 'seam'].render = false - } - } + }, + }, } diff --git a/packages/plugin-grainline/src/index.js b/packages/plugin-grainline/src/index.js index 9cf6064012a..cd3ca8d6d66 100644 --- a/packages/plugin-grainline/src/index.js +++ b/packages/plugin-grainline/src/index.js @@ -10,7 +10,7 @@ export default { svg.attributes.set('freesewing:plugin-grainline', version) svg.defs += markers } - } + }, }, macros: { grainline: function (so) { @@ -31,6 +31,6 @@ export default { .attr('marker-end', 'url(#grainlineTo)') .attr('data-text', 'grainline') .attr('data-text-class', 'center fill-note') - } - } + }, + }, } diff --git a/packages/plugin-i18n/src/index.js b/packages/plugin-i18n/src/index.js index 45df941cfb4..7fb40e12444 100644 --- a/packages/plugin-i18n/src/index.js +++ b/packages/plugin-i18n/src/index.js @@ -19,6 +19,6 @@ export default { let prefix = data.prefix || '' if (typeof data.strings[locale][prefix + text] === 'undefined') return text else return data.strings[locale][prefix + text] - } - } + }, + }, } diff --git a/packages/plugin-logo/src/index.js b/packages/plugin-logo/src/index.js index 4280f680650..59f1ad53884 100644 --- a/packages/plugin-logo/src/index.js +++ b/packages/plugin-logo/src/index.js @@ -10,6 +10,6 @@ export default { svg.attributes.set('freesewing:plugin-logo', version) svg.defs += logo } - } - } + }, + }, } diff --git a/packages/plugin-measurements/src/index.js b/packages/plugin-measurements/src/index.js index 6f2b4e408f2..754b8400218 100644 --- a/packages/plugin-measurements/src/index.js +++ b/packages/plugin-measurements/src/index.js @@ -29,6 +29,6 @@ export default { settings.measurements.crossSeamBack = settings.measurements.crossSeam - settings.measurements.crossSeamFront } - } - } + }, + }, } diff --git a/packages/plugin-mirror/src/index.js b/packages/plugin-mirror/src/index.js index 70fef288845..65d932301f0 100644 --- a/packages/plugin-mirror/src/index.js +++ b/packages/plugin-mirror/src/index.js @@ -28,7 +28,7 @@ export default { preRender: function (svg) { if (svg.attributes.get('freesewing:plugin-mirror') === false) svg.attributes.set('freesewing:plugin-mirror', version) - } + }, }, macros: { mirror: function ({ @@ -37,7 +37,7 @@ export default { points = null, paths = null, prefix = 'mirrored', - nameFormat = undefined + nameFormat = undefined, }) { const [start, end] = mirror const mirrorPoint = mirrorGen(start, end) @@ -95,6 +95,6 @@ export default { point.attributes.set('mirrored', true) }) } - } - } + }, + }, } diff --git a/packages/plugin-notches/src/index.js b/packages/plugin-notches/src/index.js index fc4db902b2a..05fbb6762be 100644 --- a/packages/plugin-notches/src/index.js +++ b/packages/plugin-notches/src/index.js @@ -12,6 +12,6 @@ export default { svg.defs += notches svg.attributes.add('freesewing:plugin-notches', version) } - } - } + }, + }, } diff --git a/packages/plugin-round/src/index.js b/packages/plugin-round/src/index.js index db493cd6fb4..713ccb85ab7 100644 --- a/packages/plugin-round/src/index.js +++ b/packages/plugin-round/src/index.js @@ -7,7 +7,7 @@ export default { preRender: function (svg) { if (svg.attributes.get('freesewing:plugin-round') === false) svg.attributes.set('freesewing:plugin-round', version) - } + }, }, macros: { round: function (so) { @@ -40,6 +40,6 @@ export default { if (typeof so.render !== 'undefined' && so.render) this.paths[prefix + 'Rounded'].render = true else this.paths[prefix + 'Rounded'].render = false - } - } + }, + }, } diff --git a/packages/plugin-scalebox/src/index.js b/packages/plugin-scalebox/src/index.js index 0f49613f5b4..f80f62646f6 100644 --- a/packages/plugin-scalebox/src/index.js +++ b/packages/plugin-scalebox/src/index.js @@ -8,7 +8,7 @@ export default { hooks: { preRender: function (svg) { svg.attributes.set('freesewing:plugin-scalebox', version) - } + }, }, - macros: { scalebox, miniscale } + macros: { scalebox, miniscale }, } diff --git a/packages/plugin-scalebox/src/miniscale.js b/packages/plugin-scalebox/src/miniscale.js index fe78be72939..8e6dd1b84f6 100644 --- a/packages/plugin-scalebox/src/miniscale.js +++ b/packages/plugin-scalebox/src/miniscale.js @@ -11,7 +11,7 @@ export default function (so) { '__miniscaleImperialBottomRight', '__miniscaleImperialBottomLeft', '__miniscaleMetric', - '__miniscaleImperial' + '__miniscaleImperial', ]) delete this.points[id] for (let id of ['__miniscaleMetric', '__miniscaleImperial']) delete this.paths[id] @@ -43,7 +43,7 @@ export default function (so) { '__miniscaleImperialBottomLeft', '__miniscaleImperialBottomRight', '__miniscaleMetric', - '__miniscaleImperial' + '__miniscaleImperial', ] for (let pid of points) this.points[pid] = this.points[pid].rotate(so.rotate, so.at) for (let pid of points.slice(8)) { diff --git a/packages/plugin-scalebox/src/scalebox.js b/packages/plugin-scalebox/src/scalebox.js index 3c022a62877..03926d4892d 100644 --- a/packages/plugin-scalebox/src/scalebox.js +++ b/packages/plugin-scalebox/src/scalebox.js @@ -15,7 +15,7 @@ export default function (so) { '__scaleboxText', '__scaleboxLink', '__scaleboxMetric', - '__scaleboxImperial' + '__scaleboxImperial', ]) delete this.points[id] for (let id of ['__scaleboxMetric', '__scaleboxImperial']) delete this.paths[id] @@ -53,7 +53,7 @@ export default function (so) { '__scaleboxText', '__scaleboxLink', '__scaleboxMetric', - '__scaleboxImperial' + '__scaleboxImperial', ] for (let pid of points) this.points[pid] = this.points[pid].rotate(so.rotate, so.at) for (let pid of points.slice(8)) { diff --git a/packages/plugin-sprinkle/src/index.js b/packages/plugin-sprinkle/src/index.js index da9aa3c4599..4a852ea63de 100644 --- a/packages/plugin-sprinkle/src/index.js +++ b/packages/plugin-sprinkle/src/index.js @@ -7,12 +7,12 @@ export default { preRender: function (svg) { if (svg.attributes.get('freesewing:plugin-sprinkle') === false) svg.attributes.set('freesewing:plugin-sprinkle', version) - } + }, }, macros: { sprinkle: function (so) { for (let pid of so.on) this.snippets[pid + '-' + so.snippet] = new this.Snippet(so.snippet, this.points[pid]) - } - } + }, + }, } diff --git a/packages/plugin-svgattr/src/index.js b/packages/plugin-svgattr/src/index.js index c2104615f06..b13ae4b7ecc 100644 --- a/packages/plugin-svgattr/src/index.js +++ b/packages/plugin-svgattr/src/index.js @@ -9,6 +9,6 @@ export default { for (let key of Object.keys(attributes)) svg.attributes.add(key, attributes[key]) svg.attributes.add('freesewing:plugin-svgattr', version) } - } - } + }, + }, } diff --git a/packages/plugin-theme/src/index.js b/packages/plugin-theme/src/index.js index 3f9746b5511..590c05c3e3c 100644 --- a/packages/plugin-theme/src/index.js +++ b/packages/plugin-theme/src/index.js @@ -37,6 +37,6 @@ export default { } svg.attributes.add('freesewing:plugin-theme', version) } - } - } + }, + }, } diff --git a/packages/plugin-title/src/index.js b/packages/plugin-title/src/index.js index 3c29835338c..89e4c3db66d 100644 --- a/packages/plugin-title/src/index.js +++ b/packages/plugin-title/src/index.js @@ -10,7 +10,7 @@ export default { svg.attributes.set('freesewing:plugin-title', version) svg.style += style } - } + }, }, macros: { title: function (so) { @@ -22,7 +22,7 @@ export default { } let defaults = { scale: 1, - rotation: 0 + rotation: 0, } so = { ...defaults, ...so } let overwrite = true @@ -73,6 +73,6 @@ export default { for (const txt of cut) this.points[cid].attr('data-text', txt) } } - } - } + }, + }, } diff --git a/packages/plugin-validate/src/index.js b/packages/plugin-validate/src/index.js index 71f7d9a018b..5d397c0c616 100644 --- a/packages/plugin-validate/src/index.js +++ b/packages/plugin-validate/src/index.js @@ -11,26 +11,26 @@ export default { type: 'error', label: '👕 No measurements provided', msg: - 'You did not provide any measurements. Most, if not all, patterns require measurements, so this is most likely an issue.' + 'You did not provide any measurements. Most, if not all, patterns require measurements, so this is most likely an issue.', }) for (let measurement of pattern.config.measurements) { if (!pattern.settings.measurements[measurement]) { pattern.debug({ type: 'error', label: '👕 Missing measurement:', - msg: measurement + msg: measurement, }) pattern.debug({ type: 'info', label: '👕 All measurements:', - msg: pattern.settings.measurements + msg: pattern.settings.measurements, }) throw new Error(`Missing measurement: ${measurement}`) } else { pattern.debug({ type: 'success', label: '👕 ' + measurement + ' is ok', - msg: pattern.settings.measurements[measurement] + msg: pattern.settings.measurements[measurement], }) } } @@ -55,6 +55,6 @@ export default { } } } - } - } + }, + }, } diff --git a/packages/plugin-validate/src/validate.js b/packages/plugin-validate/src/validate.js index 46e7ce8b0e9..b903a962101 100644 --- a/packages/plugin-validate/src/validate.js +++ b/packages/plugin-validate/src/validate.js @@ -5,21 +5,21 @@ validate.point = function (point, partId, pointId, debug) { debug({ type: 'error', label: 'Problem with point', - msg: points + msg: points, }) throw new Error(`Point pattern.parts.${partId}.points.${pointId} is not an object`) } else if (typeof point.x !== 'number' || isNaN(point.x)) { debug({ type: 'error', label: 'Problem with point X-value', - msg: points + msg: points, }) throw new Error(`X-value of point pattern.parts.${partId}.points.${pointId} is not a number`) } else if (typeof point.y !== 'number' || isNaN(point.y)) { debug({ type: 'error', label: 'Problem with point Y-value', - msg: points + msg: points, }) debug(dbg, 'Problem with point Y-value:', point) throw new Error(`Y-value of point pattern.parts.${partId}.points.${pointId} is not a number`) @@ -30,7 +30,7 @@ validate.point = function (point, partId, pointId, debug) { debug({ type: 'error', label: 'Problem with point attributes', - msg: points + msg: points, }) throw new Error( `attributes property of point pattern.parts.${partId}.points.${pointId} is not an object` @@ -39,7 +39,7 @@ validate.point = function (point, partId, pointId, debug) { debug({ type: 'error', label: 'Problem with point', - msg: points + msg: points, }) throw new Error(`Point pattern.parts.${partId}.points.${pointId} is not a valid Point object`) } @@ -55,7 +55,7 @@ validate.text = function (type, item, partId, itemId, debug) { debug({ type: 'warning', label: '🌐 Possible translation issue', - msg: `This text might be a translation problem:, ${item} However, the error was suppresed, so moving on.` + msg: `This text might be a translation problem:, ${item} However, the error was suppresed, so moving on.`, }) return true } @@ -64,7 +64,7 @@ validate.text = function (type, item, partId, itemId, debug) { debug({ type: 'error', label: 'This text is not a string or number', - msg: t + msg: t, }) throw new Error( `${type} pattern.parts.${partId}.${type}s.${itemId} has text that is not a string nor a number. Set the 'data-validate-skip-text' attribute to true to suppress this error.` @@ -73,12 +73,12 @@ validate.text = function (type, item, partId, itemId, debug) { debug({ type: 'warning', label: '🌐 Possible translation issue', - msg: t + msg: t, }) debug({ type: 'info', label: '💡 Tip', - msg: `${type} pattern.parts.${partId}.${type}s.${itemId} has text containing spaces. Please insert translation identifiers, and not actual text. Set the 'data-validate-skip-text' attribute to true to suppress this warning.` + msg: `${type} pattern.parts.${partId}.${type}s.${itemId} has text containing spaces. Please insert translation identifiers, and not actual text. Set the 'data-validate-skip-text' attribute to true to suppress this warning.`, }) } } @@ -91,28 +91,28 @@ validate.path = function (path, partId, pathId, debug) { debug({ type: 'error', label: 'Problem with path', - msg: path + msg: path, }) throw new Error(`Path pattern.parts.${partId}.paths.${pathId} is not an object`) } else if (typeof path.ops !== 'object') { debug({ type: 'error', label: 'Problem with path ops', - msg: path + msg: path, }) throw new Error(`ops property of path pattern.parts.${partId}.paths.${pathId} is not an object`) } else if (path.ops.length < 2) { debug({ type: 'error', label: 'Problem with path ops', - msg: path + msg: path, }) throw new Error(`Path pattern.parts.${partId}.paths.${pathId} does not do anything`) } else if (typeof path.attributes !== 'object') { debug({ type: 'error', label: 'Problem with path attributes', - msg: path + msg: path, }) throw new Error( `attributes property of path pattern.parts.${partId}.paths.${pathId} is not an object` @@ -121,14 +121,14 @@ validate.path = function (path, partId, pathId, debug) { debug({ type: 'error', label: 'Problem with path', - msg: path + msg: path, }) throw new Error(`Path pattern.parts.${partId}.paths.${pathId} is not a valid Path object`) } else if (!(path.attributes.clone instanceof Function)) { debug({ type: 'error', label: 'Problem with path attributes', - msg: path + msg: path, }) throw new Error( `attributes property of path pattern.parts.${partId}.paths.${pathId} is not a valid Attributes object` @@ -141,7 +141,7 @@ validate.path = function (path, partId, pathId, debug) { debug({ type: 'error', label: 'Problem with path TO point', - msg: op.to + msg: op.to, }) throw new Error( `Point in pattern.parts.${partId}.paths.${pathId}.ops[o].to is not a valid Point object` @@ -152,7 +152,7 @@ validate.path = function (path, partId, pathId, debug) { debug({ type: 'error', label: 'Problem with path CP1 point', - msg: op.cp1 + msg: op.cp1, }) throw new Error( `Point in pattern.parts.${partId}.paths.${pathId}.ops[o].cp1 is not a valid Point object` @@ -161,7 +161,7 @@ validate.path = function (path, partId, pathId, debug) { debug({ type: 'error', label: 'Problem with path CP2 point', - msg: op.cp2 + msg: op.cp2, }) throw new Error( `Point in pattern.parts.${partId}.paths.${pathId}.ops[o].cp2 is not a valid Point object` diff --git a/packages/prettier-config/index.json b/packages/prettier-config/index.json index f6003e9159d..3f355f080ef 100644 --- a/packages/prettier-config/index.json +++ b/packages/prettier-config/index.json @@ -2,6 +2,6 @@ "$schema": "http://json.schemastore.org/prettierrc", "semi": false, "singleQuote": true, - "trailingComma": "none", + "trailingComma": "es5", "printWidth": 100 } diff --git a/packages/remark-jargon/src/index.js b/packages/remark-jargon/src/index.js index 7888872310e..e89bb13fa95 100644 --- a/packages/remark-jargon/src/index.js +++ b/packages/remark-jargon/src/index.js @@ -29,8 +29,8 @@ export default (options) => { type: 'html', value, position, - indent: node.children[0].indent - } + indent: node.children[0].indent, + }, ] } } diff --git a/packages/rendertest/config/index.js b/packages/rendertest/config/index.js index 03bbee0b2f0..ca864b2cce0 100644 --- a/packages/rendertest/config/index.js +++ b/packages/rendertest/config/index.js @@ -11,7 +11,7 @@ export default { tags: ['example'], optionGroups: { size: ['width'], - content: ['colors', 'circles', 'text', 'snippets', 'macros'] + content: ['colors', 'circles', 'text', 'snippets', 'macros'], }, measurements: [], parts: ['test'], @@ -22,6 +22,6 @@ export default { text: { bool: true }, snippets: { bool: true }, macros: { bool: true }, - widthHd: { bool: true } - } + widthHd: { bool: true }, + }, } diff --git a/packages/rendertest/src/macros.js b/packages/rendertest/src/macros.js index 0f4ac0bcc01..8832997b720 100644 --- a/packages/rendertest/src/macros.js +++ b/packages/rendertest/src/macros.js @@ -12,19 +12,19 @@ export default function (part) { macro('title', { at: new Point(w / 2, y), nr: 5, - title: 'title' + title: 'title', }) y += 40 macro('grainline', { from: new Point(0, y), - to: new Point(w, y) + to: new Point(w, y), }) y += 20 macro('cutonfold', { from: new Point(w, y), - to: new Point(0, y) + to: new Point(0, y), }) y += 70 @@ -36,28 +36,28 @@ export default function (part) { from: points.dimf, to: points.dimt, text: 'hd', - y: y - 15 + y: y - 15, }) macro('vd', { from: points.dimt, to: points.dimf, text: 'vd', - x: 0 + x: 0, }) macro('ld', { from: points.dimf, to: points.dimt, - text: 'ld' + text: 'ld', }) macro('pd', { path: paths.dims, text: 'pd', - d: 10 + d: 10, }) y += 170 macro('scalebox', { - at: new Point(w / 2, y) + at: new Point(w / 2, y), }) store.set('y', y) diff --git a/packages/rendertest/src/snippets.js b/packages/rendertest/src/snippets.js index 725b2724f7e..3d4f196b12c 100644 --- a/packages/rendertest/src/snippets.js +++ b/packages/rendertest/src/snippets.js @@ -9,7 +9,7 @@ export default function (part) { notch: 15, bnotch: 15, button: 15, - buttonhole: 15 + buttonhole: 15, } y += 10 points.tl = new Point(0, y) diff --git a/packages/rendertest/src/test.js b/packages/rendertest/src/test.js index 64b621be9f4..800d9e4e8dc 100644 --- a/packages/rendertest/src/test.js +++ b/packages/rendertest/src/test.js @@ -13,7 +13,7 @@ export default function (part) { if (options.widthHd) macro('hd', { from: new Point(0, 0), - to: new Point(options.width, 0) + to: new Point(options.width, 0), }) if (options.colors) colors(part) if (options.circles) circles(part) diff --git a/packages/sandy/config/index.js b/packages/sandy/config/index.js index 149c3413122..1737f649239 100644 --- a/packages/sandy/config/index.js +++ b/packages/sandy/config/index.js @@ -12,11 +12,11 @@ export default { optionGroups: { fit: ['waistbandPosition', 'waistbandShape'], style: ['lengthBonus', 'circleRatio', 'waistbandWidth', 'waistbandOverlap', 'gathering'], - construction: ['seamlessFullCircle', 'hemWidth'] + construction: ['seamlessFullCircle', 'hemWidth'], }, measurements: ['waist', 'waistToFloor', 'waistToHips', 'hips'], dependencies: { - waistband: 'skirt' + waistband: 'skirt', }, options: { // Constants @@ -39,7 +39,7 @@ export default { // Lists waistbandShape: { list: ['straight', 'curved'], - dflt: 'straight' - } - } + dflt: 'straight', + }, + }, } diff --git a/packages/sandy/src/curved-waistband.js b/packages/sandy/src/curved-waistband.js index 9fb4199163a..4e81812b420 100644 --- a/packages/sandy/src/curved-waistband.js +++ b/packages/sandy/src/curved-waistband.js @@ -18,7 +18,7 @@ export default function (part) { options, complete, paperless, - macro + macro, } = part.shorthand() // Calculate the angle of the ring sector and the radius of the upper arc @@ -49,7 +49,7 @@ export default function (part) { at: points.title, nr: 2, title: 'curvedWaistband', - scale: 0.5 + scale: 0.5, }) points.grainlineFrom = utils.curveIntersectsY( points.ex2FlippedRotated, @@ -61,7 +61,7 @@ export default function (part) { points.grainlineTo = points.grainlineFrom.flipX() macro('grainline', { from: points.grainlineFrom, - to: points.grainlineTo + to: points.grainlineTo, }) if (store.get('waistbandOverlap') >= options.minimumOverlap) { @@ -85,7 +85,7 @@ export default function (part) { .shiftAlong(store.get('waistbandOverlap')) macro('sprinkle', { snippet: 'notch', - on: ['centerNotch', 'buttonNotch', 'ex2FlippedRotated'] + on: ['centerNotch', 'buttonNotch', 'ex2FlippedRotated'], }) } @@ -97,22 +97,22 @@ export default function (part) { macro('hd', { from: points.in2FlippedRotated, to: points.in2Rotated, - y: points.in2Rotated.y - sa - 15 + y: points.in2Rotated.y - sa - 15, }) macro('hd', { from: points.ex2FlippedRotated, to: points.ex2Rotated, - y: points.in2Rotated.y - sa - 30 + y: points.in2Rotated.y - sa - 30, }) macro('vd', { from: points.ex1Rotated, to: points.in2Rotated, - x: points.in2Rotated.x + sa + 30 + x: points.in2Rotated.x + sa + 30, }) macro('ld', { from: points.ex2Rotated, to: points.in2Rotated, - d: -1 * sa - 15 + d: -1 * sa - 15, }) } diff --git a/packages/sandy/src/shared.js b/packages/sandy/src/shared.js index 32351e8bf46..bd99fa2a58c 100644 --- a/packages/sandy/src/shared.js +++ b/packages/sandy/src/shared.js @@ -82,7 +82,7 @@ const draftRingSector = (part, rot, an, radIn, radEx, rotate = false) => { 'in1CFlipped', 'ex1CFlipped', 'ex2CFlipped', - 'ex2Flipped' + 'ex2Flipped', ]) points[id + 'Rotated'] = points[id].rotate(rot, points.center) diff --git a/packages/sandy/src/skirt.js b/packages/sandy/src/skirt.js index a50b6e54480..9a02f1e4e24 100644 --- a/packages/sandy/src/skirt.js +++ b/packages/sandy/src/skirt.js @@ -14,7 +14,7 @@ export default function (part) { measurements, complete, paperless, - macro + macro, } = part.shorthand() // Circumference of the top of the waistband, calculated from the waistbandPosition option @@ -102,13 +102,13 @@ export default function (part) { macro('cutonfold', { from: points.in2Flipped, to: points.ex2Flipped, - grainline: true + grainline: true, }) if (options.seamlessFullCircle) { macro('cutonfold', { from: points.ex1Rotated, to: points.in1Rotated, - prefix: 'double' + prefix: 'double', }) } points.logo = points.in2FlippedRotated.shiftFractionTowards(points.ex2FlippedRotated, 0.3) @@ -122,7 +122,7 @@ export default function (part) { macro('sprinkle', { snippet: 'notch', - on: ['in1Rotated', 'gridAnchor'] + on: ['in1Rotated', 'gridAnchor'], }) if (sa) { @@ -170,33 +170,36 @@ export default function (part) { macro('vd', { from: points.ex2Flipped, to: points.in2Flipped, - x: points.ex2Flipped.x - sa - 15 + x: points.ex2Flipped.x - sa - 15, }) macro('vd', { from: points.in2Flipped, to: points.center, - x: points.ex2Flipped.x - sa - 15 + x: points.ex2Flipped.x - sa - 15, }) macro('vd', { from: points.ex2Flipped, to: points.center, - x: points.ex2Flipped.x - sa - 30 + x: points.ex2Flipped.x - sa - 30, }) if (options.circleRatio !== 0.5) { macro('vd', { from: points.ex1Rotated, to: points.in1Rotated, - x: options.circleRatio > 0.5 ? points.in1Rotated.x - sa - 15 : points.ex1Rotated.x + sa + 15 + x: + options.circleRatio > 0.5 ? points.in1Rotated.x - sa - 15 : points.ex1Rotated.x + sa + 15, }) macro('vd', { from: points.in1Rotated, to: points.center, - x: options.circleRatio > 0.5 ? points.in1Rotated.x - sa - 15 : points.ex1Rotated.x + sa + 15 + x: + options.circleRatio > 0.5 ? points.in1Rotated.x - sa - 15 : points.ex1Rotated.x + sa + 15, }) macro('vd', { from: points.ex1Rotated, to: points.center, - x: options.circleRatio > 0.5 ? points.in1Rotated.x - sa - 30 : points.ex1Rotated.x + sa + 30 + x: + options.circleRatio > 0.5 ? points.in1Rotated.x - sa - 30 : points.ex1Rotated.x + sa + 30, }) } snippets.center = new Snippet('bnotch', points.center) diff --git a/packages/sandy/src/straight-waistband.js b/packages/sandy/src/straight-waistband.js index a21d73adc13..08b37fbcd42 100644 --- a/packages/sandy/src/straight-waistband.js +++ b/packages/sandy/src/straight-waistband.js @@ -15,7 +15,7 @@ export default function (part) { options, complete, paperless, - macro + macro, } = part.shorthand() // Calculate the corners of the rectangle and other auxiliar points @@ -54,7 +54,7 @@ export default function (part) { points.grainlineTo = points.grainlineFrom.flipX() macro('grainline', { from: points.grainlineFrom, - to: points.grainlineTo + to: points.grainlineTo, }) points.button = points.centerRight .shiftFractionTowards(points.bottomRight, 0.5) @@ -68,7 +68,7 @@ export default function (part) { points.buttonNotch = points.bottomRight.shift(180, store.get('waistbandOverlap')) macro('sprinkle', { snippet: 'notch', - on: ['centerNotch', 'buttonNotch', 'bottomLeft'] + on: ['centerNotch', 'buttonNotch', 'bottomLeft'], }) if (sa) paths.sa = paths.seam.offset(sa).attr('class', 'fabric sa') @@ -79,12 +79,12 @@ export default function (part) { macro('hd', { from: points.bottomLeft, to: points.bottomRight, - y: points.bottomLeft.y + sa + 15 + y: points.bottomLeft.y + sa + 15, }) macro('vd', { from: points.bottomRight, to: points.topRight, - x: points.topRight.x + sa + 15 + x: points.topRight.x + sa + 15, }) } diff --git a/packages/shin/config/index.js b/packages/shin/config/index.js index a139cc87750..59f57384767 100644 --- a/packages/shin/config/index.js +++ b/packages/shin/config/index.js @@ -11,7 +11,7 @@ export default { tags: ['swimwear', 'bottom'], optionGroups: { fit: ['bulge', 'backRise', 'legReduction', 'stretch'], - style: ['rise'] + style: ['rise'], }, measurements: ['hips', 'upperLeg', 'waistToUpperLeg', 'waistToHips'], parts: ['back', 'front', 'waistband'], @@ -30,6 +30,6 @@ export default { bulge: { pct: 2.5, min: 0, max: 5 }, legReduction: { pct: 5, min: 0, max: 10 }, rise: { pct: 0, min: 0, max: 25 }, - backRise: { pct: 5, min: 0, max: 10 } - } + backRise: { pct: 5, min: 0, max: 10 }, + }, } diff --git a/packages/shin/src/back.js b/packages/shin/src/back.js index 5731e2a182f..31d15467537 100644 --- a/packages/shin/src/back.js +++ b/packages/shin/src/back.js @@ -13,7 +13,7 @@ export default function (part) { sa, options, measurements, - utils + utils, } = part.shorthand() // Store some helper variables @@ -112,7 +112,7 @@ export default function (part) { macro('title', { at: points.title, nr: 1, - title: 'back' + title: 'back', }) macro('scalebox', { at: new Point(points.legSide.x + 80, points.legSide.y - 40) }) if (sa) { @@ -129,42 +129,42 @@ export default function (part) { macro('hd', { from: points.hipSide, to: points.hipCb, - y: points.hipCb.y - sa - 15 + y: points.hipCb.y - sa - 15, }) macro('hd', { from: points.legSide, to: points.hipCb, - y: points.hipCb.y - sa - 30 + y: points.hipCb.y - sa - 30, }) macro('vd', { from: points.legSide, to: points.hipSide, - x: points.legSide.x - sa - 15 + x: points.legSide.x - sa - 15, }) macro('vd', { from: points.reducedLegInner, to: points.hipSide, - x: points.legSide.x - sa - 30 + x: points.legSide.x - sa - 30, }) macro('hd', { from: points.legSide, to: points.reducedLegInner, - y: points.reducedLegInner.y + 3 * sa + 15 + y: points.reducedLegInner.y + 3 * sa + 15, }) macro('hd', { from: points.legSide, to: points.reducedCrossSeam, - y: points.reducedLegInner.y + 3 * sa + 30 + y: points.reducedLegInner.y + 3 * sa + 30, }) macro('vd', { from: points.reducedLegInner, to: points.reducedCrossSeam, - x: points.reducedCrossSeam.x + sa + 15 + x: points.reducedCrossSeam.x + sa + 15, }) macro('vd', { from: points.reducedLegInner, to: points.hipCb, - x: points.reducedCrossSeam.x + sa + 30 + x: points.reducedCrossSeam.x + sa + 30, }) } diff --git a/packages/shin/src/front.js b/packages/shin/src/front.js index 4317183660c..f1f0e2c4242 100644 --- a/packages/shin/src/front.js +++ b/packages/shin/src/front.js @@ -13,7 +13,7 @@ export default function (part) { sa, options, measurements, - utils + utils, } = part.shorthand() let angle = -12 @@ -115,7 +115,7 @@ export default function (part) { macro('title', { at: points.title, nr: 2, - title: 'front' + title: 'front', }) if (sa) { paths.sa = paths.hemBase @@ -131,42 +131,42 @@ export default function (part) { macro('vd', { from: points.legSide, to: points.hipSide, - x: points.hipSide.x - sa - 15 + x: points.hipSide.x - sa - 15, }) macro('vd', { from: points.reducedLegInner, to: points.hipSide, - x: points.hipSide.x - sa - 30 + x: points.hipSide.x - sa - 30, }) macro('vd', { from: points.reducedLegInner, to: points.reducedCrossSeam, - x: points.reducedCrossSeam.x + sa + 15 + x: points.reducedCrossSeam.x + sa + 15, }) macro('vd', { from: points.reducedLegInner, to: points.hipCb, - x: points.reducedCrossSeam.x + sa + 30 + x: points.reducedCrossSeam.x + sa + 30, }) macro('hd', { from: points.hipSide, to: points.hipCb, - y: points.hipSide.y - sa - 15 + y: points.hipSide.y - sa - 15, }) macro('hd', { from: points.hipSide, to: points.reducedCrossSeam, - y: points.hipSide.y - sa - 30 + y: points.hipSide.y - sa - 30, }) macro('hd', { from: points.legSide, to: points.reducedLegInner, - y: points.reducedLegInner.y + 3 * sa + 15 + y: points.reducedLegInner.y + 3 * sa + 15, }) macro('hd', { from: points.legSide, to: points.reducedCrossSeam, - y: points.reducedLegInner.y + 3 * sa + 30 + y: points.reducedLegInner.y + 3 * sa + 30, }) } diff --git a/packages/shin/src/waistband.js b/packages/shin/src/waistband.js index b00609fe610..0eaa4b5c59e 100644 --- a/packages/shin/src/waistband.js +++ b/packages/shin/src/waistband.js @@ -10,7 +10,7 @@ export default function (part) { paperless, sa, options, - utils + utils, } = part.shorthand() let height = options.elasticWidth * 2 @@ -46,7 +46,7 @@ export default function (part) { macro('title', { at: points.title, nr: 3, - title: 'waistband' + title: 'waistband', }) if (sa) { paths.sa = new Path() @@ -63,7 +63,7 @@ export default function (part) { from: points.bottomLeft, to: points.bottomRight, y: points.bottomLeft.y - 10, - text: utils.units(store.get('hips') * 2) + text: utils.units(store.get('hips') * 2), }) } @@ -72,7 +72,7 @@ export default function (part) { macro('vd', { from: points.bottomRight, to: points.topRight, - x: points.topRight.x + sa + 15 + x: points.topRight.x + sa + 15, }) } diff --git a/packages/simon/config/index.js b/packages/simon/config/index.js index dccc9501c79..5df63486437 100644 --- a/packages/simon/config/index.js +++ b/packages/simon/config/index.js @@ -20,7 +20,7 @@ export default { 'sleeveLengthBonus', 'waistEase', 'hipsEase', - 'yokeDart' + 'yokeDart', ], style: [ 'splitYoke', @@ -39,8 +39,8 @@ export default { 'buttonPlacketWidth', 'buttonholePlacketWidth', 'buttonholePlacketFoldWidth', - 'buttonFreeLength' - ] + 'buttonFreeLength', + ], }, { cuffs: [ @@ -50,8 +50,8 @@ export default { 'sleevePlacketWidth', 'sleevePlacketLength', 'cuffDrape', - 'cuffLength' - ] + 'cuffLength', + ], }, { collar: [ @@ -62,9 +62,9 @@ export default { 'collarStandWidth', 'collarBend', 'collarGap', - 'collarRoll' - ] - } + 'collarRoll', + ], + }, ], advanced: [ 'acrossBackFactor', @@ -96,10 +96,10 @@ export default { 'sleevecapQ3Spread1', 'sleevecapQ3Spread2', 'sleevecapQ4Spread1', - 'sleevecapQ4Spread2' - ] - } - ] + 'sleevecapQ4Spread2', + ], + }, + ], }, measurements: [ 'biceps', @@ -112,11 +112,11 @@ export default { 'shoulderToShoulder', 'hips', 'shoulderToWrist', - 'wrist' + 'wrist', ], dependencies: { sleeveBase: ['frontBase', 'backBase', 'back'], - sleeve: ['sleeveBase', 'front', 'back'] + sleeve: ['sleeveBase', 'front', 'back'], }, inject: { frontBase: 'base', @@ -129,7 +129,7 @@ export default { buttonholePlacket: 'front', yoke: 'backBase', sleeveBase: 'front', - sleeve: 'sleeveBase' + sleeve: 'sleeveBase', }, parts: ['collarStand', 'collar', 'sleevePlacketUnderlap', 'sleevePlacketOverlap', 'cuff'], hide: ['base', 'frontBase', 'front', 'backBase', 'sleeveBase'], @@ -151,15 +151,15 @@ export default { // Lists hemStyle: { list: ['straight', 'baseball', 'slashed'], - dflt: 'straight' + dflt: 'straight', }, buttonPlacketStyle: { list: ['classic', 'seamless'], - dflt: 'classic' + dflt: 'classic', }, buttonholePlacketStyle: { list: ['classic', 'seamless'], - dflt: 'seamless' + dflt: 'seamless', }, cuffStyle: { list: [ @@ -168,13 +168,13 @@ export default { 'straightBarrelCuff', 'roundedFrenchCuff', 'angledFrenchCuff', - 'straightFrenchCuff' + 'straightFrenchCuff', ], - dflt: 'angledBarrelCuff' + dflt: 'angledBarrelCuff', }, backDarts: { list: ['auto', 'never', 'always'], - dflt: 'auto' + dflt: 'auto', }, // Bool @@ -242,6 +242,6 @@ export default { sleevePlacketLength: { pct: 25, min: 15, max: 35 }, waistEase: { pct: 15, min: 10, max: 35 }, yokeDart: { pct: 0, min: 0, max: 15 }, - backDartShaping: { pct: 25, min: 5, max: 75 } - } + backDartShaping: { pct: 25, min: 5, max: 75 }, + }, } diff --git a/packages/simon/src/back.js b/packages/simon/src/back.js index 4513c40b400..820c8bd7106 100644 --- a/packages/simon/src/back.js +++ b/packages/simon/src/back.js @@ -16,7 +16,7 @@ export default (part) => { complete, paperless, macro, - options + options, } = part.shorthand() // Populare store with data we need @@ -96,7 +96,7 @@ export default (part) => { 'armholeHollow', 'armholeHollowCp1', 'armholeCp2', - 'armhole' + 'armhole', ]) points[p] = points[p].shift(0, options.boxPleatFold * 2) } @@ -165,7 +165,7 @@ export default (part) => { to: points.cbHem, via: points.hem, radius: points.hips.dist(points.hem) * options.hemCurve, - prefix: 'slash' + prefix: 'slash', }) paths.saBase = new Path() .move(points.hips) @@ -200,7 +200,7 @@ export default (part) => { macro('cutonfold', { from: points.cbYoke, to: points.cbHem, - grainline: true + grainline: true, }) points.title = new Point(points.armhole.x / 4, points.armhole.y) macro('title', { at: points.title, nr: 3, title: 'back' }) @@ -230,7 +230,7 @@ export default (part) => { .attr('class', 'fabric sa') macro('banner', { path: 'hemSa', - text: ['hem', ': 3x', 'seamAllowance'] + text: ['hem', ': 3x', 'seamAllowance'], }) } } @@ -241,30 +241,30 @@ export default (part) => { macro('vd', { from: points.dartBottom, to: points.dartCenterIn, - x: points.dartCenterIn.x - 15 + x: points.dartCenterIn.x - 15, }) macro('vd', { from: points.dartCenterIn, to: points.dartTop, - x: points.dartCenterIn.x - 15 + x: points.dartCenterIn.x - 15, }) macro('hd', { from: points.dartCenterIn, to: points.dartCenterOut, - y: points.dartBottom.y + 15 + y: points.dartBottom.y + 15, }) macro('hd', { from: points.dartCenterOut, - to: points.waist + to: points.waist, }) macro('hd', { from: points.cbWaist, - to: points.dartCenterIn + to: points.dartCenterIn, }) } else { macro('hd', { from: points.cbWaist, - to: points.waist + to: points.waist, }) } let bottomRight @@ -272,84 +272,84 @@ export default (part) => { macro('hd', { from: points.cbHem, to: points.slashEnd, - y: points.cbHem.y + 15 + 3 * sa + y: points.cbHem.y + 15 + 3 * sa, }) macro('vd', { from: points.slashEnd, to: points.slashStart, - x: points.slashStart.x + 15 + 3 * sa + x: points.slashStart.x + 15 + 3 * sa, }) bottomRight = points.slashEnd } else if (typeof points.bballStart !== 'undefined') { macro('hd', { from: points.cbHem, to: points.bballStart, - y: points.cbHem.y + 15 + 3 * sa + y: points.cbHem.y + 15 + 3 * sa, }) macro('vd', { from: points.bballStart, to: points.bballEnd, - x: points.hips.x + 15 + sa + x: points.hips.x + 15 + sa, }) bottomRight = points.bballStart } else bottomRight = points.hem macro('hd', { from: points.cbHem, to: points.hips, - y: points.cbHem.y + 30 + 3 * sa + y: points.cbHem.y + 30 + 3 * sa, }) macro('vd', { from: bottomRight, to: points.hips, - x: points.hips.x + 30 + sa + x: points.hips.x + 30 + sa, }) macro('vd', { from: bottomRight, to: points.waist, - x: points.hips.x + 45 + sa + x: points.hips.x + 45 + sa, }) macro('vd', { from: bottomRight, to: points.armhole, - x: points.hips.x + 60 + sa + x: points.hips.x + 60 + sa, }) if (options.yokeDart > 0) { macro('vd', { from: points.armhole, to: points.yokeDartEdge, - x: points.armhole.x + 15 + sa + x: points.armhole.x + 15 + sa, }) macro('vd', { from: points.armhole, to: points.yokeDartTip, - x: points.armhole.x + 30 + sa + x: points.armhole.x + 30 + sa, }) macro('hd', { from: points.cbYoke, to: points.yokeDartTip, - y: points.cbYoke.y - 15 - sa + y: points.cbYoke.y - 15 - sa, }) macro('hd', { from: points.cbYoke, to: points.yokeDartEdge, - y: points.cbYoke.y - 30 - sa + y: points.cbYoke.y - 30 - sa, }) } else { macro('vd', { from: points.armhole, to: points.armholePitch, - x: points.armhole.x + 15 + sa + x: points.armhole.x + 15 + sa, }) macro('hd', { from: points.cbYoke, to: points.armholePitch, - y: points.cbYoke.y - 15 - sa + y: points.cbYoke.y - 15 - sa, }) } macro('vd', { from: points.cbHem, to: points.cbYoke, - x: points.cbHem.x - 15 + x: points.cbHem.x - 15, }) } diff --git a/packages/simon/src/buttonholeplacket.js b/packages/simon/src/buttonholeplacket.js index eda1cf7f389..64a1481d1ea 100644 --- a/packages/simon/src/buttonholeplacket.js +++ b/packages/simon/src/buttonholeplacket.js @@ -13,7 +13,7 @@ export default (part) => { complete, paperless, macro, - options + options, } = part.shorthand() if (!options.seperateButtonholePlacket || options.buttonholePlacketStyle !== 'classic') { @@ -106,7 +106,7 @@ export default (part) => { points.grainlineTo = points.placketTopEdge.shift(0, width / 2) macro('grainline', { from: points.grainlineFrom, - to: points.grainlineTo + to: points.grainlineTo, }) // Title @@ -116,7 +116,7 @@ export default (part) => { nr: '2b', title: 'buttonholePlacket', scale: 0.75, - rotation: -90 + rotation: -90, }) // Logo @@ -147,13 +147,13 @@ export default (part) => { 'placketCfHem', 'placketBottomInnerEdgeOver', 'placketBottomInnerEdgeFold', - 'placketBottomInnerEdgeUnder' + 'placketBottomInnerEdgeUnder', ]) { offset += 15 macro('hd', { from: points.placketBottomEdge, to: points[pid], - y: points.placketBottomEdge.y + offset + 3 * sa + y: points.placketBottomEdge.y + offset + 3 * sa, }) } points.button0 = points.placketTopEdge @@ -163,13 +163,13 @@ export default (part) => { macro('vd', { from: points['button' + j], to: points['button' + i], - x: points.placketTopEdge.x - 15 + x: points.placketTopEdge.x - 15, }) } macro('vd', { from: points.placketBottomEdge, to: points.placketTopEdge, - x: points.placketTopEdge.x - 30 + x: points.placketTopEdge.x - 30, }) } diff --git a/packages/simon/src/buttonplacket.js b/packages/simon/src/buttonplacket.js index 1fb9a789412..836febd12df 100644 --- a/packages/simon/src/buttonplacket.js +++ b/packages/simon/src/buttonplacket.js @@ -13,7 +13,7 @@ export default (part) => { complete, paperless, macro, - options + options, } = part.shorthand() if (!options.seperateButtonPlacket || options.buttonPlacketStyle !== 'classic') { @@ -60,7 +60,7 @@ export default (part) => { .attr('class', 'dotted') macro('sprinkle', { snippet: 'notch', - on: ['placketTopOut', 'placketBottomOut'] + on: ['placketTopOut', 'placketBottomOut'], }) // Buttons @@ -71,7 +71,7 @@ export default (part) => { points.grainlineTo = points.placketTopEdge.shift(180, width / 2) macro('grainline', { from: points.grainlineFrom, - to: points.grainlineTo + to: points.grainlineTo, }) // Title @@ -81,7 +81,7 @@ export default (part) => { nr: '1b', title: 'buttonPlacket', scale: 0.75, - rotation: -90 + rotation: -90, }) // Logo @@ -105,17 +105,17 @@ export default (part) => { macro('hd', { from: points.placketTopIn, to: points.placketTopOut, - y: points.placketTopIn.y - 15 - sa + y: points.placketTopIn.y - 15 - sa, }) macro('hd', { from: points.placketTopIn, to: points.placketTopEdge, - y: points.placketTopIn.y - 30 - sa + y: points.placketTopIn.y - 30 - sa, }) macro('vd', { from: points.placketBottomEdge, to: points.placketTopEdge, - x: points.placketTopEdge.x + 15 + sa + x: points.placketTopEdge.x + 15 + sa, }) points.button0 = points.placketTopEdge let j @@ -124,7 +124,7 @@ export default (part) => { macro('vd', { from: points['button' + j], to: points['button' + i], - x: points.placketTopIn.x - 15 - sa + x: points.placketTopIn.x - 15 - sa, }) } } diff --git a/packages/simon/src/collar.js b/packages/simon/src/collar.js index a865b163bc5..da6b7d3a82a 100644 --- a/packages/simon/src/collar.js +++ b/packages/simon/src/collar.js @@ -10,7 +10,7 @@ export default (part) => { complete, paperless, macro, - options + options, } = part.shorthand() const draft = function (tweak = 1) { @@ -94,7 +94,7 @@ export default (part) => { // Grainline macro('grainline', { from: points.bottomMidCp2.shift(90, 10), - to: points.bottomMidCp1.shift(90, 10) + to: points.bottomMidCp1.shift(90, 10), }) // Title @@ -104,7 +104,7 @@ export default (part) => { nr: '7 + 8', title: 'collarAndUndercollar', scale: 0.6, - append: true + append: true, }) // Indicate collar stand side @@ -121,7 +121,7 @@ export default (part) => { // Notches macro('sprinkle', { snippet: 'notch', - on: ['bottomMid', 'rightBottomEdge', 'leftBottomEdge', 'rightTopEdge', 'leftTopEdge'] + on: ['bottomMid', 'rightBottomEdge', 'leftBottomEdge', 'rightTopEdge', 'leftTopEdge'], }) if (sa) { @@ -135,37 +135,37 @@ export default (part) => { macro('vd', { from: points.bottomMid, to: points.topMid, - x: points.rightTopEdge.x + 15 + sa + x: points.rightTopEdge.x + 15 + sa, }) macro('vd', { from: points.bottomMid, to: points.rightTopEdge, - x: points.rightTopEdge.x + 30 + sa + x: points.rightTopEdge.x + 30 + sa, }) macro('vd', { from: points.rightBottomEdge, to: points.topMid, - x: points.rightTopEdge.x + 45 + sa + x: points.rightTopEdge.x + 45 + sa, }) macro('vd', { from: points.rightBottomEdge, to: points.rightTopEdge, - x: points.rightTopEdge.x + 60 + sa + x: points.rightTopEdge.x + 60 + sa, }) macro('hd', { from: points.leftTopHinge, to: points.rightTopHinge, - y: points.leftTopEdge.y - 15 - sa + y: points.leftTopEdge.y - 15 - sa, }) macro('hd', { from: points.leftTopEdge, to: points.rightTopEdge, - y: points.leftTopEdge.y - 30 - sa + y: points.leftTopEdge.y - 30 - sa, }) macro('hd', { from: points.leftBottomEdge, to: points.rightBottomEdge, - y: points.leftBottomEdge.y + 15 + sa + y: points.leftBottomEdge.y + 15 + sa, }) } diff --git a/packages/simon/src/collarstand.js b/packages/simon/src/collarstand.js index 1d1860ab4fe..3b4cdbb92dd 100644 --- a/packages/simon/src/collarstand.js +++ b/packages/simon/src/collarstand.js @@ -11,7 +11,7 @@ export default (part) => { complete, paperless, macro, - options + options, } = part.shorthand() const draft = function (tweak = 1) { @@ -117,7 +117,7 @@ export default (part) => { // Grainline macro('grainline', { from: points.leftCf, - to: points.rightCf + to: points.rightCf, }) // Title @@ -126,7 +126,7 @@ export default (part) => { at: points.title, nr: 6, title: 'collarStand', - scale: 0.6 + scale: 0.6, }) // Notches @@ -138,8 +138,8 @@ export default (part) => { 'leftBottomCf', 'leftTopCf', 'rightBottomEdge', - 'leftBottomEdge' - ] + 'leftBottomEdge', + ], }) // Button and buttonhole @@ -161,22 +161,22 @@ export default (part) => { macro('hd', { from: points.topMid, to: points.rightTopCf, - y: points.topMid.y - 15 - sa + y: points.topMid.y - 15 - sa, }) macro('hd', { from: points.leftTopCf, to: points.topMid, - y: points.topMid.y - 15 - sa + y: points.topMid.y - 15 - sa, }) macro('hd', { from: points.topMid, to: points.rightBottomEdge, - y: points.topMid.y - 30 - sa + y: points.topMid.y - 30 - sa, }) macro('hd', { from: points.leftBottomEdge, to: points.topMid, - y: points.topMid.y - 30 - sa + y: points.topMid.y - 30 - sa, }) macro('pd', { path: new Path() @@ -185,27 +185,27 @@ export default (part) => { .curve(points.leftBottomHingeCp2, points.bottomMidCp1, points.bottomMid) .curve(points.bottomMidCp2, points.rightBottomHingeCp1, points.rightBottomHinge) .curve(points.rightBottomHingeCp2, points.rightBottomCfCp1, points.rightBottomCf), - d: 15 + sa + d: 15 + sa, }) macro('ld', { from: points.leftBottomEdge, to: points.leftBottomCf, - d: -30 - sa + d: -30 - sa, }) macro('ld', { from: points.rightBottomCf, to: points.rightBottomEdge, - d: -30 - sa + d: -30 - sa, }) macro('ld', { from: points.rightBottomCf, to: points.rightTopCf, - d: -15 - sa - options.buttonholePlacketWidth / 2 + d: -15 - sa - options.buttonholePlacketWidth / 2, }) macro('vd', { from: points.rightBottomCf, to: points.topMid, - x: points.rightBottomEdge.x + 30 + sa + x: points.rightBottomEdge.x + 30 + sa, }) } diff --git a/packages/simon/src/cuff-barrel-angled.js b/packages/simon/src/cuff-barrel-angled.js index 00a57bf55ff..aa043a69c5e 100644 --- a/packages/simon/src/cuff-barrel-angled.js +++ b/packages/simon/src/cuff-barrel-angled.js @@ -33,7 +33,7 @@ export default (part) => { macro('vd', { from: points.rightAngleBottom, to: points.rightAngleTop, - x: points.rightAngleBottom.x + 15 + sa + x: points.rightAngleBottom.x + 15 + sa, }) } diff --git a/packages/simon/src/cuff-barrel-rounded.js b/packages/simon/src/cuff-barrel-rounded.js index afc45d3088b..d496dfaddbf 100644 --- a/packages/simon/src/cuff-barrel-rounded.js +++ b/packages/simon/src/cuff-barrel-rounded.js @@ -10,14 +10,14 @@ export default (part) => { to: points.bottomLeft, via: points.topLeft, radius: height / 3, - prefix: 'topLeftRound' + prefix: 'topLeftRound', }) macro('round', { from: points.bottomRight, to: points.topLeft, via: points.topRight, radius: height / 3, - prefix: 'topRightRound' + prefix: 'topRightRound', }) points.leftAngleBottom = points.topLeft.shift(-90, height / 3) points.rightAngleTop = points.topRight.shift(180, height / 3) @@ -45,7 +45,7 @@ export default (part) => { macro('vd', { from: points.topRightRoundStart, to: points.topRightRoundEnd, - x: points.topRightRoundStart.x + 15 + sa + x: points.topRightRoundStart.x + 15 + sa, }) } diff --git a/packages/simon/src/cuff-french-rounded.js b/packages/simon/src/cuff-french-rounded.js index 36267ad973d..79b78142873 100644 --- a/packages/simon/src/cuff-french-rounded.js +++ b/packages/simon/src/cuff-french-rounded.js @@ -9,28 +9,28 @@ export default (part) => { to: points.bottomLeft, via: points.topLeft, radius: height / 3, - prefix: 'topLeft' + prefix: 'topLeft', }) macro('round', { from: points.topLeft, to: points.bottomRight, via: points.bottomLeft, radius: height / 3, - prefix: 'bottomLeft' + prefix: 'bottomLeft', }) macro('round', { from: points.bottomLeft, to: points.topRight, via: points.bottomRight, radius: height / 3, - prefix: 'bottomRight' + prefix: 'bottomRight', }) macro('round', { from: points.bottomRight, to: points.topLeft, via: points.topRight, radius: height / 3, - prefix: 'topRight' + prefix: 'topRight', }) paths.seam = new Path() diff --git a/packages/simon/src/front.js b/packages/simon/src/front.js index 3eb8793b327..2878a1c38fc 100644 --- a/packages/simon/src/front.js +++ b/packages/simon/src/front.js @@ -12,7 +12,7 @@ export default (part) => { paths, complete, macro, - options + options, } = part.shorthand() // Populare store with data we need @@ -77,7 +77,7 @@ export default (part) => { to: points.cfHem, via: points.hem, radius: points.hips.dist(points.hem) * options.hemCurve, - prefix: 'slash' + prefix: 'slash', }) paths.saBase = new Path().move(points.hips).join(paths.saBaseFromHips) paths.hemBase = new Path() @@ -105,12 +105,12 @@ export default (part) => { delete paths.cutonfold macro('grainline', { from: points.cfHem.shift(0, 45), - to: points.cfNeck.shift(0, 45) + to: points.cfNeck.shift(0, 45), }) macro('title', { at: points.title, nr: 'X', title: 'front' }) macro('sprinkle', { snippet: 'notch', - on: ['waist', 'armholePitch', 'hips', 'cfHips', 'cfWaist', 'armhole', 'cfArmhole'] + on: ['waist', 'armholePitch', 'hips', 'cfHips', 'cfWaist', 'armhole', 'cfArmhole'], }) if (sa) { diff --git a/packages/simon/src/frontleft-classic-cuton.js b/packages/simon/src/frontleft-classic-cuton.js index 374148049f4..77253852c42 100644 --- a/packages/simon/src/frontleft-classic-cuton.js +++ b/packages/simon/src/frontleft-classic-cuton.js @@ -11,7 +11,7 @@ export default (part) => { complete, paperless, macro, - options + options, } = part.shorthand() let fold = options.buttonholePlacketFoldWidth @@ -90,8 +90,8 @@ export default (part) => { 'placketBottomInnerEdgeUnder', 'placketBottomOuterEdgeFold', 'placketBottomOuterEdgeOver', - 'placketBottomOuterEdgeUnder' - ] + 'placketBottomOuterEdgeUnder', + ], }) delete snippets['cfWaist-notch'] delete snippets['cfHips-notch'] @@ -116,15 +116,15 @@ export default (part) => { if (paperless) { macro('hd', { from: points.placketEdgeArmhole, - to: points.armhole + to: points.armhole, }) macro('hd', { from: points.placketEdgeWaist, - to: points.waist + to: points.waist, }) macro('hd', { from: points.placketEdgeHips, - to: points.hips + to: points.hips, }) let offset = 0 for (let pid of [ @@ -134,29 +134,29 @@ export default (part) => { 'placketCfNeck', 'placketTopInnerEdgeOver', 'placketTopInnerEdgeFold', - 'placketTopInnerEdgeUnder' + 'placketTopInnerEdgeUnder', ]) { offset += 15 macro('hd', { from: points.placketTopEdge, to: points[pid], - y: points.placketTopEdge.y - offset - sa + y: points.placketTopEdge.y - offset - sa, }) } macro('hd', { from: points.placketTopEdge, to: points.neck, - y: points.placketTopEdge.y - offset - sa - 15 + y: points.placketTopEdge.y - offset - sa - 15, }) macro('hd', { from: points.placketTopEdge, to: points.shoulder, - y: points.placketTopEdge.y - offset - sa - 30 + y: points.placketTopEdge.y - offset - sa - 30, }) macro('hd', { from: points.placketTopEdge, to: points.armhole, - y: points.placketTopEdge.y - offset - sa - 45 + y: points.placketTopEdge.y - offset - sa - 45, }) points.button0 = points.placketTopEdge let j @@ -165,13 +165,13 @@ export default (part) => { macro('vd', { from: points['button' + j], to: points['button' + i], - x: points.placketTopEdge.x - 15 + x: points.placketTopEdge.x - 15, }) } macro('vd', { from: points.placketBottomEdge, to: points.placketTopEdge, - x: points.placketTopEdge.x - 30 + x: points.placketTopEdge.x - 30, }) } return part diff --git a/packages/simon/src/frontleft-classic-seperate.js b/packages/simon/src/frontleft-classic-seperate.js index 7e3fb1a7292..686325c2d7d 100644 --- a/packages/simon/src/frontleft-classic-seperate.js +++ b/packages/simon/src/frontleft-classic-seperate.js @@ -10,7 +10,7 @@ export default (part) => { complete, paperless, macro, - options + options, } = part.shorthand() let fold = options.buttonholePlacketFoldWidth @@ -41,7 +41,7 @@ export default (part) => { points.edgeHips = new Point(points.neckEdge.x, points.hips.y) macro('sprinkle', { snippet: 'notch', - on: ['edgeArmhole', 'edgeWaist', 'edgeHips'] + on: ['edgeArmhole', 'edgeWaist', 'edgeHips'], }) if (sa) { paths.saFromArmhole.end().x = points.neckEdge.x - sa @@ -58,32 +58,32 @@ export default (part) => { macro('hd', { from: points.neckEdge, to: points.neck, - y: points.neck.y - sa - 15 + y: points.neck.y - sa - 15, }) macro('hd', { from: points.neckEdge, to: points.shoulder, - y: points.neck.y - sa - 30 + y: points.neck.y - sa - 30, }) macro('hd', { from: points.neckEdge, to: points.armhole, - y: points.neck.y - sa - 45 + y: points.neck.y - sa - 45, }) macro('vd', { from: points.neckEdge, to: points.neck, - x: points.neckEdge.x - sa - 15 + x: points.neckEdge.x - sa - 15, }) macro('vd', { from: points.hemEdge, to: points.neck, - x: points.neckEdge.x - sa - 30 + x: points.neckEdge.x - sa - 30, }) for (let pid of ['Armhole', 'Waist', 'Hips']) { macro('hd', { from: points['edge' + pid], - to: points[pid.toLowerCase()] + to: points[pid.toLowerCase()], }) } } diff --git a/packages/simon/src/frontleft-seamless.js b/packages/simon/src/frontleft-seamless.js index c5ce1dd9758..e62b4e19fc1 100644 --- a/packages/simon/src/frontleft-seamless.js +++ b/packages/simon/src/frontleft-seamless.js @@ -35,8 +35,8 @@ export default (part) => { 'placketTopFold1', 'placketTopFold2', 'placketBottomFold1', - 'placketBottomFold2' - ] + 'placketBottomFold2', + ], }) // Buttons @@ -63,23 +63,23 @@ export default (part) => { macro('hd', { from: points.placketBottomEdge, to: points[pid], - y: points.placketBottomEdge.y + offset + 3 * sa + y: points.placketBottomEdge.y + offset + 3 * sa, }) } macro('hd', { from: points.placketTopEdge, to: points.neck, - y: points.neck.y - 15 - sa + y: points.neck.y - 15 - sa, }) macro('hd', { from: points.placketTopEdge, to: points.shoulder, - y: points.neck.y - 30 - sa + y: points.neck.y - 30 - sa, }) macro('hd', { from: points.placketTopEdge, to: points.armhole, - y: points.neck.y - 45 - sa + y: points.neck.y - 45 - sa, }) points.button0 = points.placketTopEdge let j @@ -88,13 +88,13 @@ export default (part) => { macro('vd', { from: points['button' + j], to: points['button' + i], - x: points.placketTopEdge.x - 15 + x: points.placketTopEdge.x - 15, }) } macro('vd', { from: points.placketBottomEdge, to: points.placketTopEdge, - x: points.placketTopEdge.x - 30 + x: points.placketTopEdge.x - 30, }) } return part diff --git a/packages/simon/src/frontleft.js b/packages/simon/src/frontleft.js index e7e590be508..5309e41d2c1 100644 --- a/packages/simon/src/frontleft.js +++ b/packages/simon/src/frontleft.js @@ -11,7 +11,7 @@ export default (part) => { macro('ld', { from: points.neck, to: points.shoulder, - d: 15 + sa + d: 15 + sa, }) } diff --git a/packages/simon/src/frontright-classic-cuton.js b/packages/simon/src/frontright-classic-cuton.js index a2bf72560c7..625c6dbbcf6 100644 --- a/packages/simon/src/frontright-classic-cuton.js +++ b/packages/simon/src/frontright-classic-cuton.js @@ -11,7 +11,7 @@ export default (part) => { complete, paperless, macro, - options + options, } = part.shorthand() let width = options.buttonPlacketWidth @@ -53,8 +53,8 @@ export default (part) => { 'cfNeck', 'placketBottomIn', 'placketBottomOut', - 'cfHem' - ] + 'cfHem', + ], }) // Buttons @@ -76,32 +76,32 @@ export default (part) => { macro('hd', { from: points.placketTopOut, to: points.placketTopEdge, - y: points.placketTopEdge.y - 15 - sa + y: points.placketTopEdge.y - 15 - sa, }) macro('hd', { from: points.cfNeck, to: points.placketTopEdge, - y: points.placketTopEdge.y - 30 - sa + y: points.placketTopEdge.y - 30 - sa, }) macro('hd', { from: points.placketTopIn, to: points.placketTopEdge, - y: points.placketTopEdge.y - 45 - sa + y: points.placketTopEdge.y - 45 - sa, }) macro('hd', { from: points.neck, to: points.placketTopEdge, - y: points.neck.y - 15 - sa + y: points.neck.y - 15 - sa, }) macro('hd', { from: points.shoulder, to: points.placketTopEdge, - y: points.neck.y - 30 - sa + y: points.neck.y - 30 - sa, }) macro('hd', { from: points.armhole, to: points.placketTopEdge, - y: points.neck.y - 45 - sa + y: points.neck.y - 45 - sa, }) points.button0 = points.placketTopEdge let j @@ -110,13 +110,13 @@ export default (part) => { macro('vd', { from: points['button' + j], to: points['button' + i], - x: points.placketTopEdge.x + 15 + sa + x: points.placketTopEdge.x + 15 + sa, }) } macro('vd', { from: points.placketBottomEdge, to: points.placketTopEdge, - x: points.placketTopEdge.x + 30 + sa + x: points.placketTopEdge.x + 30 + sa, }) } diff --git a/packages/simon/src/frontright-classic-seperate.js b/packages/simon/src/frontright-classic-seperate.js index f2631c9429e..5d0a4f742cb 100644 --- a/packages/simon/src/frontright-classic-seperate.js +++ b/packages/simon/src/frontright-classic-seperate.js @@ -9,7 +9,7 @@ export default (part) => { complete, paperless, macro, - options + options, } = part.shorthand() let width = options.buttonPlacketWidth @@ -45,32 +45,32 @@ export default (part) => { macro('hd', { from: points.neck, to: points.placketTopIn, - y: points.neck.y - sa - 15 + y: points.neck.y - sa - 15, }) macro('hd', { from: points.shoulder, to: points.placketTopIn, - y: points.neck.y - sa - 30 + y: points.neck.y - sa - 30, }) macro('hd', { from: points.armhole, to: points.placketTopIn, - y: points.neck.y - sa - 45 + y: points.neck.y - sa - 45, }) macro('vd', { from: points.placketTopIn, to: points.neck, - x: points.placketTopIn.x + sa + 15 + x: points.placketTopIn.x + sa + 15, }) macro('vd', { from: points.placketBottomIn, to: points.placketTopIn, - x: points.placketTopIn.x + sa + 15 + x: points.placketTopIn.x + sa + 15, }) for (let pid of ['Armhole', 'Waist', 'Hips']) { macro('hd', { from: points['edge' + pid], - to: points[pid.toLowerCase()] + to: points[pid.toLowerCase()], }) } } diff --git a/packages/simon/src/frontright-seamless.js b/packages/simon/src/frontright-seamless.js index 80ae78c3ae5..99e06271058 100644 --- a/packages/simon/src/frontright-seamless.js +++ b/packages/simon/src/frontright-seamless.js @@ -40,8 +40,8 @@ export default (part) => { 'placketBottomFold1', 'placketBottomFold2', 'cfNeck', - 'cfHem' - ] + 'cfHem', + ], }) // Buttons @@ -65,27 +65,27 @@ export default (part) => { macro('hd', { from: points.hps, to: points.placketTopEdge, - y: points.hps.y - sa - 15 + y: points.hps.y - sa - 15, }) macro('hd', { from: points.shoulder, to: points.placketTopEdge, - y: points.hps.y - sa - 30 + y: points.hps.y - sa - 30, }) macro('hd', { from: points.armhole, to: points.placketTopEdge, - y: points.hps.y - sa - 45 + y: points.hps.y - sa - 45, }) macro('vd', { from: points.placketTopEdge, to: points.neck, - x: points.placketTopEdge.x + sa + 15 + x: points.placketTopEdge.x + sa + 15, }) macro('vd', { from: points.placketBottomEdge, to: points.placketTopEdge, - x: points.placketTopEdge.x + sa + 15 + x: points.placketTopEdge.x + sa + 15, }) } diff --git a/packages/simon/src/frontright.js b/packages/simon/src/frontright.js index a735f81e6e6..a567f61aa67 100644 --- a/packages/simon/src/frontright.js +++ b/packages/simon/src/frontright.js @@ -14,7 +14,7 @@ export default (part) => { macro('ld', { from: points.shoulder, to: points.neck, - d: 15 + sa + d: 15 + sa, }) if (sa) { paths.hemSa.attr('data-text-dy', 7, true) diff --git a/packages/simon/src/shared.js b/packages/simon/src/shared.js index a7bde97b25a..e6b28ffffb8 100644 --- a/packages/simon/src/shared.js +++ b/packages/simon/src/shared.js @@ -62,7 +62,7 @@ export const decorateBarrelCuff = (part) => { nr: 11, title: 'cuff', at: points.title, - scale: 0.8 + scale: 0.8, }) // Button and buttonhole @@ -118,7 +118,7 @@ export const decorateFrenchCuff = (part) => { nr: 11, title: 'cuff', at: points.title, - scale: 0.8 + scale: 0.8, }) // Buttonholes @@ -145,30 +145,30 @@ export const paperlessBarrelCuff = (part) => { macro('hd', { from: points.buttonhole1, to: points.button1, - y: points.bottomLeft.y + 15 + sa + y: points.bottomLeft.y + 15 + sa, }) macro('hd', { from: points.bottomLeft, to: points.bottomRight, - y: points.bottomLeft.y + 30 + sa + y: points.bottomLeft.y + 30 + sa, }) macro('vd', { from: points.bottomLeft, to: points.topLeft.shift(0, 40), - x: points.bottomLeft.x - 15 - sa + x: points.bottomLeft.x - 15 - sa, }) if (options.barrelCuffNarrowButton) { macro('hd', { from: points.narrowButton1, to: points.button1, - y: points.topRight.y - 15 - sa + y: points.topRight.y - 15 - sa, }) } if (options.cuffButtonRows === 2) { macro('vd', { from: points.button2, to: points.button1, - x: points.topRight.x + 15 + sa + x: points.topRight.x + 15 + sa, }) } @@ -180,22 +180,22 @@ export const paperlessFrenchCuff = (part) => { macro('hd', { from: points.button4, to: points.button2, - y: points.bottomLeft.y + 15 + sa + y: points.bottomLeft.y + 15 + sa, }) macro('hd', { from: points.midLeft, to: points.midRight, - y: points.bottomLeft.y + 30 + sa + y: points.bottomLeft.y + 30 + sa, }) macro('vd', { from: points.button2, to: points.button1, - x: points.topRight.x + 15 + sa + x: points.topRight.x + 15 + sa, }) macro('vd', { from: points.bottomRight.shift(180, 40), to: points.topRight.shift(180, 40), - x: points.topRight.x + 30 + sa + x: points.topRight.x + 30 + sa, }) return part @@ -206,105 +206,105 @@ export const frontDimensions = (part, side = 'left') => { let factor = side === 'right' ? -1 : 1 macro('banner', { path: 'hemSa', - text: ['hem', ': 3x', 'seamAllowance'] + text: ['hem', ': 3x', 'seamAllowance'], }) macro('banner', { path: 'saFrench', - text: ['frenchSeam', ': 2x', 'seamAllowance'] + text: ['frenchSeam', ': 2x', 'seamAllowance'], }) if (paperless) { macro('pd', { path: new Path() .move(points.armholePitch) .curve(points.armholePitchCp2, points.shoulderCp1, points.shoulder), - d: -15 * factor + d: -15 * factor, }) macro('vd', { from: points.armhole, to: points.armholePitch, - x: points.armhole.x + (15 + sa * 2) * factor + x: points.armhole.x + (15 + sa * 2) * factor, }) macro('vd', { from: points.armhole, to: points.shoulder, - x: points.armhole.x + (30 + sa * 2) * factor + x: points.armhole.x + (30 + sa * 2) * factor, }) macro('vd', { from: points.armhole, to: points.neck, - x: points.armhole.x + (45 + sa * 2) * factor + x: points.armhole.x + (45 + sa * 2) * factor, }) macro('vd', { from: points.waist, to: points.armhole, - x: points.armhole.x + (15 + sa * 2) * factor + x: points.armhole.x + (15 + sa * 2) * factor, }) macro('vd', { from: points.hips, to: points.armhole, - x: points.armhole.x + (30 + sa * 2) * factor + x: points.armhole.x + (30 + sa * 2) * factor, }) macro('ld', { from: points.cfWaist, - to: points.waist + to: points.waist, }) if (options.hemStyle === 'baseball') { macro('vd', { from: points.bballStart, to: points.bballEnd, - x: points.hips.x + (15 + 2 * sa) * factor + x: points.hips.x + (15 + 2 * sa) * factor, }) macro('vd', { from: points.bballStart, to: points.hips, - x: points.hips.x + (30 + 2 * sa) * factor + x: points.hips.x + (30 + 2 * sa) * factor, }) macro('vd', { from: points.bballStart, to: points.armhole, - x: points.hips.x + (45 + 2 * sa) * factor + x: points.hips.x + (45 + 2 * sa) * factor, }) macro('vd', { from: points.bballStart, to: points.neck, - x: points.hips.x + (60 + 2 * sa) * factor + x: points.hips.x + (60 + 2 * sa) * factor, }) macro('hd', { from: points.bballStart, to: points.bballEnd, - y: points.bballStart.y + 15 + 3 * sa + y: points.bballStart.y + 15 + 3 * sa, }) } else if (options.hemStyle === 'slashed') { macro('vd', { from: points.slashEnd, to: points.slashStart, - x: points.hips.x + (15 + 3 * sa) * factor + x: points.hips.x + (15 + 3 * sa) * factor, }) macro('vd', { from: points.slashEnd, to: points.hips, - x: points.hips.x + (30 + 3 * sa) * factor + x: points.hips.x + (30 + 3 * sa) * factor, }) macro('vd', { from: points.slashEnd, to: points.armhole, - x: points.hips.x + (45 + 3 * sa) * factor + x: points.hips.x + (45 + 3 * sa) * factor, }) macro('vd', { from: points.slashEnd, to: points.neck, - x: points.hips.x + (60 + 3 * sa) * factor + x: points.hips.x + (60 + 3 * sa) * factor, }) } else { macro('vd', { from: points.hem, to: points.armhole, - x: points.armhole.x + (45 + 2 * sa) * factor + x: points.armhole.x + (45 + 2 * sa) * factor, }) macro('vd', { from: points.hem, to: points.neck, - x: points.armhole.x + (60 + 2 * sa) * factor + x: points.armhole.x + (60 + 2 * sa) * factor, }) } } diff --git a/packages/simon/src/sleeve.js b/packages/simon/src/sleeve.js index b277d34b7a2..b379c54cfb0 100644 --- a/packages/simon/src/sleeve.js +++ b/packages/simon/src/sleeve.js @@ -11,7 +11,7 @@ export default (part) => { macro, options, snippets, - Snippet + Snippet, } = part.shorthand() // Remove inherited paths, snippets, and scalebox @@ -53,7 +53,7 @@ export default (part) => { 'cuffRightCusp', 'cuffRightCuspCp2', 'wristRight', - 'cuffRightMid' + 'cuffRightMid', ] let shiftLeft = ['cuffLeftCuspCp1', 'cuffLeftCusp', 'cuffLeftCuspCp2', 'wristLeft'] if (drape > 20) pleats = 2 @@ -154,7 +154,7 @@ export default (part) => { .attr('class', 'fabric sa') macro('banner', { path: 'frenchSa', - text: ['frenchSean', ': 2x', 'seamAllowance'] + text: ['frenchSean', ': 2x', 'seamAllowance'], }) } } @@ -164,27 +164,27 @@ export default (part) => { macro('hd', { from: points.backNotch, to: points.sleeveTip, - y: points.sleeveTip.y - 15 - sa * 2 + y: points.sleeveTip.y - 15 - sa * 2, }) macro('hd', { from: points.sleeveTip, to: points.frontNotch, - y: points.sleeveTip.y - 15 - sa * 2 + y: points.sleeveTip.y - 15 - sa * 2, }) macro('hd', { from: points.bicepsLeft, to: points.sleeveTip, - y: points.sleeveTip.y - 30 - sa * 2 + y: points.sleeveTip.y - 30 - sa * 2, }) macro('hd', { from: points.sleeveTip, to: points.bicepsRight, - y: points.sleeveTip.y - 30 - sa * 2 + y: points.sleeveTip.y - 30 - sa * 2, }) macro('hd', { from: points.bicepsLeft, to: points.bicepsRight, - y: points.sleeveTip.y - 45 - sa * 2 + y: points.sleeveTip.y - 45 - sa * 2, }) macro('pd', { path: new Path() @@ -195,49 +195,49 @@ export default (part) => { .curve(points.capQ3Cp2, points.capQ4Cp1, points.capQ4) .curve_(points.capQ4Cp2, points.bicepsLeft) .reverse(), - d: 15 + d: 15, }) macro('vd', { from: points.wristRight, to: points.bicepsRight, - x: points.bicepsRight.x + 15 + sa * 2 + x: points.bicepsRight.x + 15 + sa * 2, }) macro('vd', { from: points.bicepsRight, to: points.frontNotch, - x: points.bicepsRight.x + 15 + sa * 2 + x: points.bicepsRight.x + 15 + sa * 2, }) macro('vd', { from: points.bicepsRight, to: points.sleeveTip, - x: points.bicepsRight.x + 30 + sa * 2 + x: points.bicepsRight.x + 30 + sa * 2, }) macro('vd', { from: points.bicepsLeft, to: points.backNotch, - x: points.bicepsLeft.x - 15 - sa + x: points.bicepsLeft.x - 15 - sa, }) macro('vd', { from: points.cuffLeftCusp, to: points.placketEnd, - x: points.placketEnd.x - 15 + x: points.placketEnd.x - 15, }) macro('hd', { from: points.wristLeft, to: points.wristRight, - y: points.wristLeft.y + 15 + sa + y: points.wristLeft.y + 15 + sa, }) if (pleats > 0) { macro('hd', { from: points.cuffMidTop, to: points.cuffPleat1EdgeTop, - y: points.cuffMidTop.y - 15 + y: points.cuffMidTop.y - 15, }) if (pleats === 2) { macro('hd', { from: points.cuffPleat2Top, to: points.cuffPleat2EdgeTop, - y: points.cuffPleat2Top.y - 15 + y: points.cuffPleat2Top.y - 15, }) } } diff --git a/packages/simon/src/sleeveplacket-overlap.js b/packages/simon/src/sleeveplacket-overlap.js index ac618a5a33a..211e62539c7 100644 --- a/packages/simon/src/sleeveplacket-overlap.js +++ b/packages/simon/src/sleeveplacket-overlap.js @@ -11,7 +11,7 @@ export default (part) => { complete, paperless, macro, - options + options, } = part.shorthand() let width = options.sleevePlacketWidth @@ -81,7 +81,7 @@ export default (part) => { at: points.title, nr: 10, title: 'sleevePlacketOverlap', - scale: 0.6 + scale: 0.6, }) // Button @@ -103,62 +103,62 @@ export default (part) => { macro('hd', { from: points.bottomLeft, to: points.cutBottom, - y: points.bottomLeft.y + 15 + y: points.bottomLeft.y + 15, }) macro('hd', { from: points.bottomLeft, to: points.zag, - y: points.bottomLeft.y + 30 + y: points.bottomLeft.y + 30, }) macro('hd', { from: points.bottomLeft, to: points.zig, - y: points.bottomLeft.y + 45 + y: points.bottomLeft.y + 45, }) macro('hd', { from: points.bottomLeft, to: points.cutRight, - y: points.bottomLeft.y + 60 + y: points.bottomLeft.y + 60, }) macro('vd', { from: points.fold1Right, to: points.topRight, - x: points.topRight.x + 15 + x: points.topRight.x + 15, }) macro('vd', { from: points.boxTip, to: points.topRight, - x: points.topRight.x + 30 + x: points.topRight.x + 30, }) macro('vd', { from: points.fold2Right, to: points.topRight, - x: points.topRight.x + 45 + x: points.topRight.x + 45, }) macro('vd', { from: points.cutRight, to: points.topRight, - x: points.topRight.x + 60 + x: points.topRight.x + 60, }) macro('vd', { from: points.zag, to: points.topRight, - x: points.topRight.x + 75 + x: points.topRight.x + 75, }) macro('vd', { from: points.cutBottom, to: points.topRight, - x: points.topRight.x + 90 + x: points.topRight.x + 90, }) macro('hd', { from: points.topLeft, to: points.boxTopLeft, - y: points.topLeft.y - 15 + y: points.topLeft.y - 15, }) macro('hd', { from: points.topLeft, to: points.boxTopRight, - y: points.topLeft.y - 30 + y: points.topLeft.y - 30, }) } diff --git a/packages/simon/src/sleeveplacket-underlap.js b/packages/simon/src/sleeveplacket-underlap.js index abd8538f2f6..43c41818f31 100644 --- a/packages/simon/src/sleeveplacket-underlap.js +++ b/packages/simon/src/sleeveplacket-underlap.js @@ -11,7 +11,7 @@ export default (part) => { complete, paperless, macro, - options + options, } = part.shorthand() let width = options.sleevePlacketWidth > 20 ? 10 : options.sleevePlacketWidth / 4 @@ -54,7 +54,7 @@ export default (part) => { nr: 9, title: 'sleevePlacketUnderlap', scale: 0.6, - append: true + append: true, }) // Button @@ -76,22 +76,22 @@ export default (part) => { macro('vd', { from: points.fold2Right, to: points.fold1Right, - x: points.topRight.x + 15 + x: points.topRight.x + 15, }) macro('vd', { from: points.bottomRight, to: points.topRight, - x: points.topRight.x + 30 + x: points.topRight.x + 30, }) macro('hd', { from: points.bottomLeft, to: points.button, - y: points.bottomRight.y + 15 + y: points.bottomRight.y + 15, }) macro('hd', { from: points.bottomLeft, to: points.bottomRight, - y: points.bottomRight.y + 30 + y: points.bottomRight.y + 30, }) } diff --git a/packages/simon/src/yoke.js b/packages/simon/src/yoke.js index c497169ae60..238e41f3259 100644 --- a/packages/simon/src/yoke.js +++ b/packages/simon/src/yoke.js @@ -10,7 +10,7 @@ export default (part) => { complete, paperless, macro, - options + options, } = part.shorthand() for (let id of Object.keys(part.paths)) delete part.paths[id] @@ -52,7 +52,7 @@ export default (part) => { macro('cutonfold', { from: points.cbNeck, to: points.cbYoke, - grainline: true + grainline: true, }) snippets.sleeveNotch = new Snippet('bnotch', points.armholePitch) } else { @@ -60,7 +60,7 @@ export default (part) => { points.grainlineTo = points.cbNeck.shift(0, 20) macro('grainline', { from: points.grainlineFrom, - to: points.grainlineTo + to: points.grainlineTo, }) snippets.sleeveNotchA = new Snippet('bnotch', points.armholePitch) snippets.sleeveNotchB = new Snippet('bnotch', points._armholePitch) @@ -78,43 +78,43 @@ export default (part) => { if (paperless) { macro('pd', { path: new Path().move(points.cbNeck)._curve(points.neckCp2, points.neck), - d: 15 + d: 15, }) macro('hd', { from: points.cbNeck, to: points.neck, - y: points.neck.y - 15 - sa + y: points.neck.y - 15 - sa, }) macro('ld', { from: points.neck, to: points.shoulder, - d: 15 + sa + d: 15 + sa, }) macro('hd', { from: points.cbYoke, to: points.armholePitch, - y: points.cbYoke.y + 15 + sa + y: points.cbYoke.y + 15 + sa, }) macro('hd', { from: points.cbYoke, to: points.shoulder, - y: points.cbYoke.y + 30 + sa + y: points.cbYoke.y + 30 + sa, }) macro('vd', { from: points.cbYoke, to: points.cbNeck, - x: points.cbYoke.x - 15 - sa + x: points.cbYoke.x - 15 - sa, }) macro('pd', { path: new Path() .move(points.armholePitch) .curve(points.armholePitchCp2, points.shoulderCp1, points.shoulder), - d: 15 + sa + d: 15 + sa, }) macro('vd', { from: points.armholePitch, to: points.shoulder, - x: points.shoulder.x + 30 + sa + x: points.shoulder.x + 30 + sa, }) } diff --git a/packages/simone/config/index.js b/packages/simone/config/index.js index 9814381d2f6..ce6c0f7fd54 100644 --- a/packages/simone/config/index.js +++ b/packages/simone/config/index.js @@ -21,7 +21,7 @@ export default { 'sleeveLengthBonus', 'waistEase', 'hipsEase', - 'yokeDart' + 'yokeDart', ], style: [ 'splitYoke', @@ -42,8 +42,8 @@ export default { 'buttonPlacketWidth', 'buttonholePlacketWidth', 'buttonholePlacketFoldWidth', - 'buttonFreeLength' - ] + 'buttonFreeLength', + ], }, { cuffs: [ @@ -53,8 +53,8 @@ export default { 'sleevePlacketWidth', 'sleevePlacketLength', 'cuffDrape', - 'cuffLength' - ] + 'cuffLength', + ], }, { collar: [ @@ -65,9 +65,9 @@ export default { 'collarStandWidth', 'collarBend', 'collarGap', - 'collarRoll' - ] - } + 'collarRoll', + ], + }, ], advanced: [ 'acrossBackFactor', @@ -102,10 +102,10 @@ export default { 'sleevecapQ3Spread1', 'sleevecapQ3Spread2', 'sleevecapQ4Spread1', - 'sleevecapQ4Spread2' - ] - } - ] + 'sleevecapQ4Spread2', + ], + }, + ], }, measurements: [ 'biceps', @@ -121,11 +121,11 @@ export default { 'shoulderToShoulder', 'hips', 'shoulderToWrist', - 'wrist' + 'wrist', ], dependencies: { sleeveBase: ['frontBase', 'backBase'], - sleeve: ['sleeveBase', 'front', 'back'] + sleeve: ['sleeveBase', 'front', 'back'], }, inject: { frontBase: 'base', @@ -139,7 +139,7 @@ export default { buttonholePlacket: 'fbaFront', yoke: 'backBase', sleeveBase: 'fbaFront', - sleeve: 'sleeveBase' + sleeve: 'sleeveBase', }, parts: ['collarStand', 'collar', 'sleevePlacketUnderlap', 'sleevePlacketOverlap', 'cuff'], hide: ['base', 'frontBase', 'front', 'backBase', 'sleeveBase', 'fbaFront'], @@ -162,15 +162,15 @@ export default { // Lists hemStyle: { list: ['straight', 'baseball', 'slashed'], - dflt: 'straight' + dflt: 'straight', }, buttonPlacketStyle: { list: ['classic', 'seamless'], - dflt: 'classic' + dflt: 'classic', }, buttonholePlacketStyle: { list: ['classic', 'seamless'], - dflt: 'seamless' + dflt: 'seamless', }, cuffStyle: { list: [ @@ -179,13 +179,13 @@ export default { 'straightBarrelCuff', 'roundedFrenchCuff', 'angledFrenchCuff', - 'straightFrenchCuff' + 'straightFrenchCuff', ], - dflt: 'angledBarrelCuff' + dflt: 'angledBarrelCuff', }, backDarts: { list: ['auto', 'never', 'always'], - dflt: 'auto' + dflt: 'auto', }, // Bool @@ -258,6 +258,6 @@ export default { backDartShaping: { pct: 25, min: 5, max: 75 }, bustDartLength: { pct: 80, min: 50, max: 90 }, frontDartLength: { pct: 45, min: 30, max: 60 }, - contour: { pct: 50, min: 30, max: 75 } - } + contour: { pct: 50, min: 30, max: 75 }, + }, } diff --git a/packages/simone/src/fba-front.js b/packages/simone/src/fba-front.js index f77f4399859..cc3cffdd010 100644 --- a/packages/simone/src/fba-front.js +++ b/packages/simone/src/fba-front.js @@ -11,7 +11,7 @@ export default (part) => { snippets, utils, sa, - complete + complete, } = part.shorthand() /* @@ -109,7 +109,7 @@ export default (part) => { 'armholeHollowCp1', 'armholeHollow', 'armholeHollowCp2', - 'armholePitchCp1' + 'armholePitchCp1', ] for (let p of rot1) points[`${p}_rot1`] = points[p].rotate(FBARot, points.armholePitch) // @@ -174,7 +174,7 @@ export default (part) => { 'armholeHollowCp2', 'armholePitchCp1', 'belowDartCpTop', - 'belowDartCpBottom' + 'belowDartCpBottom', ] for (let p of rot2) points[`${p}_rot2`] = points[`${p}_rot1`].rotate(FBARot * -1, points.bust_rot1) @@ -262,7 +262,7 @@ export default (part) => { 'armholeHollowCp1', 'armholeHollow', 'armholeHollowCp2', - 'armholePitchCp1' + 'armholePitchCp1', ] for (let p of clone1) points[p] = points[`${p}_rot1`].clone() let clone2 = ['hem', 'hips', 'hipsCp2', 'waistCp1', 'waist'] @@ -293,7 +293,7 @@ export default (part) => { for (let s in snippets) delete snippets[s] macro('sprinkle', { snippet: 'notch', - on: ['armhole', 'armholePitch', 'cfArmhole', 'cfWaist', 'cfHem', 'hips', 'waist', 'bust_rot2'] + on: ['armhole', 'armholePitch', 'cfArmhole', 'cfWaist', 'cfHem', 'hips', 'waist', 'bust_rot2'], }) points.logo = new Point(points.armhole.x / 2, points.armhole.y) snippets.logo = new Snippet('logo', points.logo) @@ -338,7 +338,7 @@ export default (part) => { to: points.cfHem, via: points.hem, radius: points.hips.dist(points.hem) * options.hemCurve, - prefix: 'slash' + prefix: 'slash', }) paths.saBase = new Path().move(points.hips).join(paths.saBaseFromHips) paths.hemBase = new Path() diff --git a/packages/simone/src/index.js b/packages/simone/src/index.js index 25cedbe6e51..88b85c92dee 100644 --- a/packages/simone/src/index.js +++ b/packages/simone/src/index.js @@ -41,7 +41,7 @@ let simonParts = [ 'Collar', 'SleevePlacketUnderlap', 'SleevePlacketOverlap', - 'Cuff' + 'Cuff', ] for (let Part of simonParts) { diff --git a/packages/sven/config/index.js b/packages/sven/config/index.js index fe7e0ff1294..62c2c2abfc5 100644 --- a/packages/sven/config/index.js +++ b/packages/sven/config/index.js @@ -17,7 +17,7 @@ export default { 'cuffEase', 'shoulderEase', 'lengthBonus', - 'sleeveLengthBonus' + 'sleeveLengthBonus', ], style: ['ribbing', 'ribbingHeight'], advanced: [ @@ -47,10 +47,10 @@ export default { 'sleevecapQ3Spread1', 'sleevecapQ3Spread2', 'sleevecapQ4Spread1', - 'sleevecapQ4Spread2' - ] - } - ] + 'sleevecapQ4Spread2', + ], + }, + ], }, measurements: [ 'biceps', @@ -63,21 +63,21 @@ export default { 'shoulderSlope', 'shoulderToShoulder', 'shoulderToWrist', - 'wrist' + 'wrist', ], dependencies: { frontBase: 'base', backBase: 'base', front: 'frontBase', back: 'backBase', - sleeve: ['sleeveBase', 'front', 'back'] + sleeve: ['sleeveBase', 'front', 'back'], }, inject: { frontBase: 'base', backBase: 'base', front: 'frontBase', back: 'backBase', - sleeve: 'sleeveBase' + sleeve: 'sleeveBase', }, parts: ['cuff', 'waistband'], hide: ['base', 'frontBase', 'backBase', 'sleeveBase'], @@ -131,6 +131,6 @@ export default { sleevecapQ4Spread1: { pct: 7, min: 4, max: 20 }, sleevecapQ4Spread2: { pct: 7, min: 4, max: 20 }, sleeveWidthGuarantee: { pct: 90, min: 25, max: 100 }, - waistEase: { pct: 8, min: -4, max: 20 } - } + waistEase: { pct: 8, min: -4, max: 20 }, + }, } diff --git a/packages/sven/src/cuff.js b/packages/sven/src/cuff.js index da599f83adb..9aec0a1f32d 100644 --- a/packages/sven/src/cuff.js +++ b/packages/sven/src/cuff.js @@ -12,7 +12,7 @@ export default (part) => { macro('title', { at: points.title, nr: 5, - title: 'cuff' + title: 'cuff', }) if (sa) { // FIXME: Don't we need SA here? diff --git a/packages/sven/src/front.js b/packages/sven/src/front.js index d35d272c844..eeef74fd125 100644 --- a/packages/sven/src/front.js +++ b/packages/sven/src/front.js @@ -10,7 +10,7 @@ export default (part) => { complete, paperless, macro, - options + options, } = part.shorthand() let front = true if (typeof points.cfHem === 'undefined') front = false @@ -69,38 +69,38 @@ export default (part) => { .curve(points.armholeCp2, points.armholeHollowCp1, points.armholeHollow) .curve(points.armholeHollowCp2, points.armholePitchCp1, points.armholePitch) .curve(points.armholePitchCp2, points.shoulderCp1, points.shoulder), - d: sa + 15 + d: sa + 15, }) macro('pd', { path: new Path() .move(points.armholePitch) .curve(points.armholePitchCp2, points.shoulderCp1, points.shoulder), - d: -15 + d: -15, }) macro('vd', { from: points.hips, to: points.waist, - x: points.hips.x + sa + 15 + x: points.hips.x + sa + 15, }) macro('vd', { from: points.hips, to: points.armhole, - x: points.hips.x + sa + 30 + x: points.hips.x + sa + 30, }) macro('vd', { from: points.hips, to: points.armholePitch, - x: points.hips.x + sa + 45 + x: points.hips.x + sa + 45, }) macro('vd', { from: points.hips, to: points.shoulder, - x: points.hips.x + sa + 60 + x: points.hips.x + sa + 60, }) macro('vd', { from: points.hips, to: points.neck, - x: points.hips.x + sa + 75 + x: points.hips.x + sa + 75, }) macro('ld', { from: points.neck, to: points.shoulder, d: sa + 15 }) } diff --git a/packages/sven/src/shared.js b/packages/sven/src/shared.js index 5f0f2224e42..ab2d6e1bed4 100644 --- a/packages/sven/src/shared.js +++ b/packages/sven/src/shared.js @@ -11,7 +11,7 @@ export const draftRibbing = function (part, length) { complete, paperless, macro, - units + units, } = part.shorthand() let height = (measurements.hpsToWaistBack + measurements.waistToHips) * options.ribbingHeight @@ -69,12 +69,12 @@ export const draftRibbing = function (part, length) { from: points.bottomRight, to: points.topRight, x: points.topRight.x + sa + 15, - text: units(length) + text: units(length), }) macro('hd', { from: points.topLeft, to: points.topRight, - y: points.topRight.y - sa - 15 + y: points.topRight.y - sa - 15, }) } } diff --git a/packages/sven/src/sleeve.js b/packages/sven/src/sleeve.js index 9ba1cc148b3..9f99ca31c76 100644 --- a/packages/sven/src/sleeve.js +++ b/packages/sven/src/sleeve.js @@ -21,7 +21,7 @@ export default (part) => { if (complete) { macro('grainline', { from: points.centerWrist, - to: points.grainlineTo + to: points.grainlineTo, }) if (sa) { paths.saBase = new Path() @@ -42,26 +42,26 @@ export default (part) => { macro('vd', { from: points.wristLeft, to: points.bicepsLeft, - x: points.bicepsLeft.x - sa - 15 + x: points.bicepsLeft.x - sa - 15, }) macro('vd', { from: points.wristLeft, to: points.sleeveTip, - x: points.bicepsLeft.x - sa - 30 + x: points.bicepsLeft.x - sa - 30, }) macro('hd', { from: points.bicepsLeft, to: points.bicepsRight, - y: points.sleeveTip.y - sa - 30 + y: points.sleeveTip.y - sa - 30, }) macro('hd', { from: points.wristLeft, to: points.wristRight, - y: points.wristLeft.y + sa * (options.ribbing ? 1 : 3) + 15 + y: points.wristLeft.y + sa * (options.ribbing ? 1 : 3) + 15, }) macro('pd', { path: paths.sleevecap.reverse(), - d: -1 * sa - 15 + d: -1 * sa - 15, }) } diff --git a/packages/sven/src/waistband.js b/packages/sven/src/waistband.js index 16d3619c8af..708c53da50e 100644 --- a/packages/sven/src/waistband.js +++ b/packages/sven/src/waistband.js @@ -13,7 +13,7 @@ export default (part) => { macro('title', { at: points.title, nr: 4, - title: 'waistband' + title: 'waistband', }) if (sa) { // FIXME: Don't we need SA here? diff --git a/packages/tamiko/config/index.js b/packages/tamiko/config/index.js index 46343e47fa8..f12e30ffff2 100644 --- a/packages/tamiko/config/index.js +++ b/packages/tamiko/config/index.js @@ -11,7 +11,7 @@ export default { tags: ['top'], optionGroups: { fit: ['armholeDepthFactor', 'chestEase'], - style: ['flare', 'lengthBonus', 'shoulderseamLength'] + style: ['flare', 'lengthBonus', 'shoulderseamLength'], }, measurements: ['shoulderToShoulder', 'chest', 'hpsToWaistBack', 'shoulderSlope', 'waistToHips'], parts: ['top'], @@ -20,6 +20,6 @@ export default { chestEase: { pct: 2, min: 1, max: 20 }, flare: { deg: 15, min: -10, max: 30 }, lengthBonus: { pct: 13, min: 0, max: 60 }, - shoulderseamLength: { pct: 10, min: 5, max: 25 } - } + shoulderseamLength: { pct: 10, min: 5, max: 25 }, + }, } diff --git a/packages/tamiko/src/top.js b/packages/tamiko/src/top.js index 115c8ddd61f..e76a118e15e 100644 --- a/packages/tamiko/src/top.js +++ b/packages/tamiko/src/top.js @@ -11,7 +11,7 @@ export default function (part) { measurements, complete, paperless, - macro + macro, } = part.shorthand() // Width at shoulders @@ -93,7 +93,7 @@ export default function (part) { to: points.bottomLeft, grainline: true, offset: points.armholeTop.dy(points.armholePitch) * 1.1, - margin: 3 + margin: 3, }) points.title = points.topLeft.shiftFractionTowards(points.bottomRight, 0.5) macro('title', { at: points.title, nr: 1, title: 'top' }) @@ -103,7 +103,7 @@ export default function (part) { macro('scalebox', { at: points.scalebox }) macro('sprinkle', { snippet: 'notch', - on: ['armgapTop', 'armgapNeck', 'armgapBottom', 'armholeNeck', 'sideBottom'] + on: ['armgapTop', 'armgapNeck', 'armgapBottom', 'armholeNeck', 'sideBottom'], }) if (sa) { @@ -121,62 +121,62 @@ export default function (part) { macro('hd', { from: points.topLeft, to: points.armgapBottom, - y: points.topLeft.y - 15 + y: points.topLeft.y - 15, }) macro('hd', { from: points.topLeft, to: points.sideBottom, - y: points.topLeft.y - 30 + y: points.topLeft.y - 30, }) macro('hd', { from: points.topLeft, to: points.topRight, - y: points.topLeft.y - 45 + y: points.topLeft.y - 45, }) macro('vd', { from: points.sideBottom, to: points.topLeft, - x: points.sideBottom.x + 15 + x: points.sideBottom.x + 15, }) macro('vd', { from: points.armgapBottom, to: points.topLeft, - x: points.topLeft.x - 15 + x: points.topLeft.x - 15, }) macro('vd', { from: points.armgapTop, to: points.topLeft, - x: points.topLeft.x - 30 + x: points.topLeft.x - 30, }) macro('vd', { from: points.bottomLeft, to: points.topLeft, - x: points.topLeft.x - 45 + x: points.topLeft.x - 45, }) macro('vd', { from: points.armgapNeck, to: points.armgapTop, - x: points.armgapTop.x + 15 + x: points.armgapTop.x + 15, }) macro('hd', { from: points.bottomLeft, to: points.armholeNeck, - y: points.bottomLeft.y + 15 + y: points.bottomLeft.y + 15, }) macro('hd', { from: points.bottomLeft, to: points.armholeTop, - y: points.bottomLeft.y + 30 + y: points.bottomLeft.y + 30, }) macro('hd', { from: points.armholeTop, to: points.armholeBottom, - y: points.bottomLeft.y + 30 + y: points.bottomLeft.y + 30, }) macro('vd', { from: points.armholeTop, to: points.armholePitch, - x: points.armholePitch.x + x: points.armholePitch.x, }) } diff --git a/packages/teagan/config/index.js b/packages/teagan/config/index.js index 5208746c723..c363dba6793 100644 --- a/packages/teagan/config/index.js +++ b/packages/teagan/config/index.js @@ -12,7 +12,7 @@ export default { cut: { front: [2, 'onFold'], back: [2, 'onFold'], - sleeve: 2 + sleeve: 2, }, optionGroups: { fit: ['chestEase', 'hipsEase', 'sleeveEase', 'draftForHighBust'], @@ -41,10 +41,10 @@ export default { 'sleevecapQ3Spread1', 'sleevecapQ3Spread2', 'sleevecapQ4Spread1', - 'sleevecapQ4Spread2' - ] - } - ] + 'sleevecapQ4Spread2', + ], + }, + ], }, measurements: [ 'biceps', @@ -55,19 +55,19 @@ export default { 'shoulderSlope', 'shoulderToShoulder', 'waistToHips', - 'waist' + 'waist', ], optionalMeasurements: ['highBust'], dependencies: { front: 'base', back: 'front', sleevecap: 'back', - sleeve: 'sleevecap' + sleeve: 'sleevecap', }, inject: { front: 'base', back: 'front', - sleeve: 'sleevecap' + sleeve: 'sleevecap', }, hide: ['base', 'sleevecap'], options: { @@ -117,6 +117,6 @@ export default { sleevecapQ3Spread1: { pct: 10, min: 4, max: 20 }, sleevecapQ3Spread2: { pct: 8, min: 4, max: 20 }, sleevecapQ4Spread1: { pct: 7, min: 4, max: 20 }, - sleevecapQ4Spread2: { pct: 7, min: 4, max: 20 } - } + sleevecapQ4Spread2: { pct: 7, min: 4, max: 20 }, + }, } diff --git a/packages/teagan/src/back.js b/packages/teagan/src/back.js index 4459a2adbb2..7d36a684415 100644 --- a/packages/teagan/src/back.js +++ b/packages/teagan/src/back.js @@ -11,7 +11,7 @@ export default function (part) { paperless, macro, utils, - measurements + measurements, } = part.shorthand() // Adjust neckline @@ -57,7 +57,7 @@ export default function (part) { macro('cutonfold', { from: points.cfNeck, to: points.cfHem, - grainline: true + grainline: true, }) macro('title', { at: points.title, nr: 2, title: 'back' }) @@ -82,7 +82,7 @@ export default function (part) { macro('vd', { from: points.cbHem, to: points.cbNeck, - x: points.cbHem.x - sa - 15 + x: points.cbHem.x - sa - 15, }) } diff --git a/packages/teagan/src/front.js b/packages/teagan/src/front.js index 8dbfbe5c0c3..335a5565d81 100644 --- a/packages/teagan/src/front.js +++ b/packages/teagan/src/front.js @@ -15,7 +15,7 @@ export default function (part) { paperless, macro, raise, - units + units, } = part.shorthand() // Hide Brian paths @@ -92,7 +92,7 @@ export default function (part) { macro('cutonfold', { from: points.cfNeck, to: points.cfHem, - grainline: true + grainline: true, }) points.title = new Point(points.waist.x / 2, points.waist.y) macro('title', { at: points.title, nr: 1, title: 'front' }) @@ -115,37 +115,37 @@ export default function (part) { macro('hd', { from: points.cfHem, to: points.hem, - y: points.hem.y + sa * 2.5 + 15 + y: points.hem.y + sa * 2.5 + 15, }) macro('vd', { from: points.hem, to: points.armhole, - x: points.armhole.x + sa + 15 + x: points.armhole.x + sa + 15, }) macro('vd', { from: points.hem, to: points.shoulder, - x: points.armhole.x + sa + 30 + x: points.armhole.x + sa + 30, }) macro('vd', { from: points.hem, to: points.neck, - x: points.armhole.x + sa + 45 + x: points.armhole.x + sa + 45, }) macro('hd', { from: points.cfNeck, to: points.neck, - y: points.neck.y - sa - 15 + y: points.neck.y - sa - 15, }) macro('hd', { from: points.cfNeck, to: points.shoulder, - y: points.neck.y - sa - 30 + y: points.neck.y - sa - 30, }) macro('hd', { from: points.cfNeck, to: points.armhole, - y: points.neck.y - sa - 45 + y: points.neck.y - sa - 45, }) // These dimensions are only for the front let id = part.getId() @@ -153,7 +153,7 @@ export default function (part) { id, from: points.cfHem, to: points.cfNeck, - x: points.cfHem.x - sa - 15 + x: points.cfHem.x - sa - 15, }) store.set('frontOnlyDimensions', [id]) } diff --git a/packages/teagan/src/shared.js b/packages/teagan/src/shared.js index 54a6df1fdfd..71cf9292199 100644 --- a/packages/teagan/src/shared.js +++ b/packages/teagan/src/shared.js @@ -2,37 +2,37 @@ export function dimensions(macro, points, sa) { macro('hd', { from: points.cfHem, to: points.hem, - y: points.hem.y + sa * 2.5 + 15 + y: points.hem.y + sa * 2.5 + 15, }) macro('vd', { from: points.hem, to: points.armhole, - x: points.armhole.x + sa + 15 + x: points.armhole.x + sa + 15, }) macro('vd', { from: points.hem, to: points.shoulder, - x: points.armhole.x + sa + 30 + x: points.armhole.x + sa + 30, }) macro('vd', { from: points.hem, to: points.neck, - x: points.armhole.x + sa + 45 + x: points.armhole.x + sa + 45, }) macro('hd', { from: points.cfNeck, to: points.neck, - y: points.neck.y - sa - 15 + y: points.neck.y - sa - 15, }) macro('hd', { from: points.cfNeck, to: points.shoulder, - y: points.neck.y - sa - 30 + y: points.neck.y - sa - 30, }) macro('hd', { from: points.cfNeck, to: points.armhole, - y: points.neck.y - sa - 45 + y: points.neck.y - sa - 45, }) } diff --git a/packages/teagan/src/sleeve.js b/packages/teagan/src/sleeve.js index 77bd1e20a28..f74993b2e63 100644 --- a/packages/teagan/src/sleeve.js +++ b/packages/teagan/src/sleeve.js @@ -9,7 +9,7 @@ export default function (part) { complete, paperless, macro, - measurements + measurements, } = part.shorthand() let height = points.bicepsRight.x * options.sleeveLength @@ -48,7 +48,7 @@ export default function (part) { macro('title', { at: points.title, nr: 2, title: 'back' }) macro('grainline', { from: new Point(points.top.x, points.hemLeft.y), - to: points.top + to: points.top, }) if (sa) { @@ -67,17 +67,17 @@ export default function (part) { macro('hd', { from: points.hemLeft, to: points.hemRight, - y: points.hemLeft.y + sa * 3 + 15 + y: points.hemLeft.y + sa * 3 + 15, }) macro('hd', { from: points.bicepsLeft, to: points.bicepsRight, - y: points.hemLeft.y + sa * 3 + 30 + y: points.hemLeft.y + sa * 3 + 30, }) macro('vd', { from: points.hemRight, to: points.bicepsRight, - x: points.bicepsRight.x + sa + 15 + x: points.bicepsRight.x + sa + 15, }) macro('vd', { from: points.hemRight, @@ -85,7 +85,7 @@ export default function (part) { .move(points.capQ2) .curve(points.capQ2Cp2, points.capQ3Cp1, points.capQ3) .edge('top'), - x: points.bicepsRight.x + sa + 30 + x: points.bicepsRight.x + sa + 30, }) } diff --git a/packages/theo/config/index.js b/packages/theo/config/index.js index 5c8ecf30039..581f9c8a7ad 100644 --- a/packages/theo/config/index.js +++ b/packages/theo/config/index.js @@ -12,7 +12,7 @@ export default { tags: ['trousers', 'bottom'], optionGroups: { fit: ['backRise', 'wedge'], - style: ['waistbandWidth', 'lengthBonus', 'legWidth'] + style: ['waistbandWidth', 'lengthBonus', 'legWidth'], }, measurements: ['crotchDepth', 'hips', 'inseam', 'knee', 'seat', 'waistToHips'], dependencies: {}, @@ -27,7 +27,7 @@ export default { sidePiece: 'front', frontPocketBag: 'front', backOuterPocketBag: 'backInnerPocketBag', - backPocketInterfacing: 'backPocketFacing' + backPocketInterfacing: 'backPocketFacing', }, hide: [], parts: ['waistbandInterfacingLeft', 'waistbandInterfacingRight', 'backPocketFacing', 'beltLoop'], @@ -41,6 +41,6 @@ export default { legWidth: { pct: 10, min: 0, max: 30 }, backRise: { pct: 3.5, min: 0.5, max: 8 }, lengthBonus: { pct: 0, min: -10, max: 10 }, - wedge: { pct: 0, min: -3, max: 3 } - } + wedge: { pct: 0, min: -3, max: 3 }, + }, } diff --git a/packages/theo/src/back-inner-pocket-bag.js b/packages/theo/src/back-inner-pocket-bag.js index d98118f41f4..ffd3e953194 100644 --- a/packages/theo/src/back-inner-pocket-bag.js +++ b/packages/theo/src/back-inner-pocket-bag.js @@ -8,7 +8,7 @@ export default function (part) { paths, complete, sa, - paperless + paperless, } = part.shorthand() let width = measurements.hips * 0.16 @@ -26,14 +26,14 @@ export default function (part) { to: points.bottomRight, via: points.bottomLeft, radius: width / 12, - prefix: 'left' + prefix: 'left', }) macro('round', { from: points.bottomLeft, to: points.topRight, via: points.bottomRight, radius: width / 12, - prefix: 'right' + prefix: 'right', }) paths.seam = new Path() @@ -60,11 +60,11 @@ export default function (part) { points.grainlineBottom = new Point(width / -3, height) macro('grainline', { from: points.grainlineBottom, - to: points.grainlineTop + to: points.grainlineTop, }) macro('sprinkle', { snippet: 'notch', - on: ['weltLeft', 'weltRight'] + on: ['weltLeft', 'weltRight'], }) } @@ -73,17 +73,17 @@ export default function (part) { macro('hd', { from: points.weltLeft, to: points.weltRight, - y: points.weltLeft.y + 15 + y: points.weltLeft.y + 15, }) macro('hd', { from: points.leftStart, to: points.rightEnd, - y: points.leftEnd.y + sa + 15 + y: points.leftEnd.y + sa + 15, }) macro('vd', { from: points.rightStart, to: points.topRight, - x: points.topRight.x + sa + 15 + x: points.topRight.x + sa + 15, }) } diff --git a/packages/theo/src/back-pocket-facing.js b/packages/theo/src/back-pocket-facing.js index 8b88864b4a0..c4da91e2563 100644 --- a/packages/theo/src/back-pocket-facing.js +++ b/packages/theo/src/back-pocket-facing.js @@ -32,11 +32,11 @@ export default function (part) { points.grainlineBottom = new Point(points.grainlineTop.x, points.bottomLeft.y) macro('grainline', { from: points.grainlineBottom, - to: points.grainlineTop + to: points.grainlineTop, }) macro('sprinkle', { snippet: 'notch', - on: ['weltLeft', 'weltRight'] + on: ['weltLeft', 'weltRight'], }) } @@ -45,12 +45,12 @@ export default function (part) { macro('hd', { from: points.bottomLeft, to: points.bottomRight, - y: points.bottomLeft.y + 15 + y: points.bottomLeft.y + 15, }) macro('vd', { from: points.bottomRight, to: points.topRight, - x: points.bottomRight.x + 15 + x: points.bottomRight.x + 15, }) } diff --git a/packages/theo/src/back-pocket-interfacing.js b/packages/theo/src/back-pocket-interfacing.js index 0b9e776129b..42e00cbab89 100644 --- a/packages/theo/src/back-pocket-interfacing.js +++ b/packages/theo/src/back-pocket-interfacing.js @@ -9,7 +9,7 @@ export default function (part) { macro('title', { at: points.title, title: 'backPocketInterfacing', - nr: 13 + nr: 13, }) macro('grainline', false) } diff --git a/packages/theo/src/back.js b/packages/theo/src/back.js index ce967256b30..f918c5cbefa 100644 --- a/packages/theo/src/back.js +++ b/packages/theo/src/back.js @@ -13,7 +13,7 @@ export default function (part) { utils, measurements, snippets, - Snippet + Snippet, } = part.shorthand() const calculateSlashCorner = () => { @@ -267,7 +267,7 @@ export default function (part) { points.grainlineBottom = points[2].clone() macro('grainline', { from: points.grainlineBottom, - to: points.grainlineTop + to: points.grainlineTop, }) points.title = new Point(0, points[-2301].y) macro('title', { at: points.title, title: 'back', nr: 1 }) @@ -277,7 +277,7 @@ export default function (part) { macro('scalebox', { at: points.scalebox }) macro('sprinkle', { snippet: 'notch', - on: ['pocketEdgeLeft', 'pocketEdgeRight'] + on: ['pocketEdgeLeft', 'pocketEdgeRight'], }) } @@ -286,77 +286,77 @@ export default function (part) { macro('ld', { from: points[66601], to: points.dartTopLeft, - d: sa + 15 + d: sa + 15, }) macro('ld', { from: points.dartTopLeft, to: points.dartTopRight, - d: sa + 15 + d: sa + 15, }) macro('ld', { from: points[66601], to: points[-2104], - d: sa + 30 + d: sa + 30, }) macro('ld', { from: points.pocketEdgeLeft, to: points.pocketCenterLeft, - d: 15 + d: 15, }) macro('ld', { from: points.pocketCenterRight, to: points.pocketEdgeRight, - d: 15 + d: 15, }) macro('ld', { from: points.dartTip, to: points.dartTop, - d: 30 + d: 30, }) macro('ld', { from: points.dartTip, to: points.pocketCenterRight, - d: -15 + d: -15, }) macro('hd', { from: points[-2301], to: points[66601], - y: points[66601].y - sa - 45 + y: points[66601].y - sa - 45, }) macro('hd', { from: points[66601], to: points[-2104], - y: points[66601].y - sa - 45 + y: points[66601].y - sa - 45, }) macro('hd', { from: points[-2301], to: points[-2104], - y: points[66601].y - sa - 60 + y: points[66601].y - sa - 60, }) macro('vd', { from: points[-2301], to: points[66601], - x: points[-2301].x - sa - 15 + x: points[-2301].x - sa - 15, }) macro('vd', { from: points[201], to: points[-2301], - x: points[-2301].x - sa - 15 + x: points[-2301].x - sa - 15, }) macro('vd', { from: points[201], to: points[66601], - x: points[-2301].x - sa - 30 + x: points[-2301].x - sa - 30, }) macro('hd', { from: points[-28], to: points[-27], - y: points[201].y + 3 * sa + 15 + y: points[201].y + 3 * sa + 15, }) macro('vd', { from: points[-27], to: points[-2104], - x: points[-2104].x + sa + 15 + x: points[-2104].x + sa + 15, }) } diff --git a/packages/theo/src/belt-loop.js b/packages/theo/src/belt-loop.js index dcf334819f8..0e65cdca203 100644 --- a/packages/theo/src/belt-loop.js +++ b/packages/theo/src/belt-loop.js @@ -25,13 +25,13 @@ export default function (part) { at: points.title, title: 'beltLoop', nr: 14, - scale: 0.4 + scale: 0.4, }) points.grainlineTop = points.topLeft.shiftFractionTowards(points.topRight, 0.5) points.grainlineBottom = new Point(points.grainlineTop.x, points.bottomLeft.y) macro('grainline', { from: points.grainlineBottom, - to: points.grainlineTop + to: points.grainlineTop, }) } diff --git a/packages/theo/src/fly-piece.js b/packages/theo/src/fly-piece.js index 7f488892c61..84485d3dd39 100644 --- a/packages/theo/src/fly-piece.js +++ b/packages/theo/src/fly-piece.js @@ -35,13 +35,13 @@ export default function (part) { at: points.title, title: 'flyPiece', nr: 6, - scale: 0.7 + scale: 0.7, }) points.grainlineTop = points[-100101].shiftFractionTowards(points.splitWaist, 0.3) points.grainlineBottom = new Point(points.grainlineTop.x, points[41].y) macro('grainline', { from: points.grainlineBottom, - to: points.grainlineTop + to: points.grainlineTop, }) delete paths.pocket delete paths.lining @@ -54,17 +54,17 @@ export default function (part) { macro('hd', { from: points[-100101], to: points.splitWaist, - y: points.splitWaist.y - sa - 15 + y: points.splitWaist.y - sa - 15, }) macro('hd', { from: points.flyPretipX, to: points.splitWaist, - y: points.splitWaist.y - sa - 30 + y: points.splitWaist.y - sa - 30, }) macro('vd', { from: points.flyPretipX, to: points.splitWaist, - x: points.splitWaist.x + sa + 15 + x: points.splitWaist.x + sa + 15, }) } diff --git a/packages/theo/src/fly-shield.js b/packages/theo/src/fly-shield.js index 5fec25feda1..2d20fe5a8d8 100644 --- a/packages/theo/src/fly-shield.js +++ b/packages/theo/src/fly-shield.js @@ -24,7 +24,7 @@ export default function (part) { at: points.title, title: 'flyShield', nr: 7, - scale: 0.7 + scale: 0.7, }) } @@ -33,17 +33,17 @@ export default function (part) { macro('hd', { from: points.leftTop, to: points.splitWaist, - y: points.splitWaist.y - sa - 15 + y: points.splitWaist.y - sa - 15, }) macro('hd', { from: points.new43, to: points.splitWaist, - y: points.splitWaist.y - sa - 30 + y: points.splitWaist.y - sa - 30, }) macro('vd', { from: points.new43, to: points.splitWaist, - x: points.splitWaist.x + sa + 15 + x: points.splitWaist.x + sa + 15, }) } diff --git a/packages/theo/src/front-pocket-bag.js b/packages/theo/src/front-pocket-bag.js index 75bf289a239..242268f3f62 100644 --- a/packages/theo/src/front-pocket-bag.js +++ b/packages/theo/src/front-pocket-bag.js @@ -9,7 +9,7 @@ export default function (part) { paperless, macro, snippets, - Snippet + Snippet, } = part.shorthand() // Clean up inherited paths & snippets @@ -55,7 +55,7 @@ export default function (part) { points.grainlineBottom = new Point(points.grainlineTop.x, points[810].y) macro('grainline', { from: points.grainlineBottom, - to: points.grainlineTop + to: points.grainlineTop, }) points.logo = new Point(points[60].x, points[61].y) snippets.logo = new Snippet('logo', points.logo) @@ -69,32 +69,32 @@ export default function (part) { macro('hd', { from: points[813], to: points[-8], - y: points.grainlineBottom.y + sa + 15 + y: points.grainlineBottom.y + sa + 15, }) macro('hd', { from: points[-40], to: points[-8], - y: points[-1102].y - sa - 15 + y: points[-1102].y - sa - 15, }) macro('hd', { from: points[-100101], to: points[-8], - y: points[-1102].y - sa - 30 + y: points[-1102].y - sa - 30, }) macro('vd', { from: points.grainlineBottom, to: points[-1102], - x: points[-8].x + sa + 15 + x: points[-8].x + sa + 15, }) macro('vd', { from: points.grainlineBottom, to: points[813], - x: points[813].x - sa - 15 + x: points[813].x - sa - 15, }) macro('vd', { from: points.grainlineBottom, to: points[-100101], - x: points[813].x - sa - 30 + x: points[813].x - sa - 30, }) } diff --git a/packages/theo/src/front.js b/packages/theo/src/front.js index 96a3b9d1220..752247e5a61 100644 --- a/packages/theo/src/front.js +++ b/packages/theo/src/front.js @@ -13,7 +13,7 @@ export default function (part) { utils, measurements, snippets, - raise + raise, } = part.shorthand() // Let's warn about some common issues @@ -209,7 +209,7 @@ export default function (part) { macro('title', { at: points.title, title: 'front', nr: 2 }) macro('sprinkle', { snippet: 'notch', - on: [60, 61, 43] + on: [60, 61, 43], }) } @@ -218,47 +218,47 @@ export default function (part) { macro('hd', { from: points[-9], to: points[-100101], - y: points[-1102].y - sa - 15 + y: points[-1102].y - sa - 15, }) macro('hd', { from: points[-100101], to: points[-1102], - y: points[-1102].y - sa - 15 + y: points[-1102].y - sa - 15, }) macro('hd', { from: points[-9], to: points[-1102], - y: points[-1102].y - sa - 15 + y: points[-1102].y - sa - 15, }) macro('hd', { from: points[-9], to: points[-8], - y: points[-1102].y - sa - 30 + y: points[-1102].y - sa - 30, }) macro('vd', { from: points[-9], to: points[-100101], - x: points[-9].x - sa - 15 + x: points[-9].x - sa - 15, }) macro('vd', { from: points[-9], to: points[-1102], - x: points[-9].x - sa - 30 + x: points[-9].x - sa - 30, }) macro('vd', { from: points[-13], to: points[-9], - x: points[-9].x - sa - 30 + x: points[-9].x - sa - 30, }) macro('vd', { from: points[-12], to: points[-1102], - x: points[-8].x + sa + 15 + x: points[-8].x + sa + 15, }) macro('hd', { from: points[-13], to: points[-12], - y: points[-12].y + 3 * sa + 15 + y: points[-12].y + 3 * sa + 15, }) } diff --git a/packages/theo/src/side-piece.js b/packages/theo/src/side-piece.js index 8094499c85a..376be38790e 100644 --- a/packages/theo/src/side-piece.js +++ b/packages/theo/src/side-piece.js @@ -54,7 +54,7 @@ export default function (part) { points.grainlineBottom = new Point(points.grainlineTop.x, points.bottomLeft.y) macro('grainline', { from: points.grainlineBottom, - to: points.grainlineTop + to: points.grainlineTop, }) points.title = points[-801].shift(180, 40) macro('title', { at: points.title, title: 'sidePiece', nr: 8 }) @@ -65,32 +65,32 @@ export default function (part) { macro('hd', { from: points.topLeft, to: points[-1102], - y: points[-1102].y - sa - 15 + y: points[-1102].y - sa - 15, }) macro('hd', { from: points.topLeft, to: points[-8], - y: points[-1102].y - sa - 30 + y: points[-1102].y - sa - 30, }) macro('hd', { from: points.bottomLeft, to: points[61], - y: points.bottomLeft.y + sa + 15 + y: points.bottomLeft.y + sa + 15, }) macro('hd', { from: points.bottomLeft, to: points[-8], - y: points.bottomLeft.y + sa + 30 + y: points.bottomLeft.y + sa + 30, }) macro('vd', { from: points.bottomLeft, to: points.topLeft, - x: points.topLeft.x - sa - 15 + x: points.topLeft.x - sa - 15, }) macro('vd', { from: points.bottomLeft, to: points[-1102], - x: points.topLeft.x - sa - 30 + x: points.topLeft.x - sa - 30, }) } diff --git a/packages/theo/src/waistband-interfacing-left.js b/packages/theo/src/waistband-interfacing-left.js index ac5a8a2b61d..683d17675bc 100644 --- a/packages/theo/src/waistband-interfacing-left.js +++ b/packages/theo/src/waistband-interfacing-left.js @@ -10,7 +10,7 @@ export default function (part) { measurements, macro, snippets, - Snippet + Snippet, } = part.shorthand() points[0] = new Point(0, 0) @@ -35,7 +35,7 @@ export default function (part) { title: 'waistbandInterfacingLeft', nr: '3a', scale: 0.5, - rotation: -90 + rotation: -90, }) points.logo = new Point(points[2].x / 2, 45) snippets.logo = new Snippet('logo', points.logo).attr('data-scale', 0.7) @@ -46,12 +46,12 @@ export default function (part) { macro('hd', { from: points[3], to: points[2], - y: points[2].y + 15 + y: points[2].y + 15, }) macro('vd', { from: points[2], to: points[1], - x: points[2].x + 15 + x: points[2].x + 15, }) } diff --git a/packages/theo/src/waistband-interfacing-right.js b/packages/theo/src/waistband-interfacing-right.js index 93641dbf9c7..cbb3c943049 100644 --- a/packages/theo/src/waistband-interfacing-right.js +++ b/packages/theo/src/waistband-interfacing-right.js @@ -10,7 +10,7 @@ export default function (part) { measurements, macro, snippets, - Snippet + Snippet, } = part.shorthand() points[0] = new Point(0, 0) @@ -35,7 +35,7 @@ export default function (part) { title: 'waistbandInterfacingRight', nr: '3b', scale: 0.5, - rotation: -90 + rotation: -90, }) points.logo = new Point(points[2].x / 2, 45) snippets.logo = new Snippet('logo', points.logo).attr('data-scale', 0.7) @@ -46,12 +46,12 @@ export default function (part) { macro('hd', { from: points[3], to: points[2], - y: points[2].y + 15 + y: points[2].y + 15, }) macro('vd', { from: points[2], to: points[1], - x: points[2].x + 15 + x: points[2].x + 15, }) } diff --git a/packages/theo/src/waistband-left.js b/packages/theo/src/waistband-left.js index d382f8070aa..1fc0b686eaa 100644 --- a/packages/theo/src/waistband-left.js +++ b/packages/theo/src/waistband-left.js @@ -12,13 +12,13 @@ export default function (part) { title: 'waistbandLeft', nr: '4a', scale: 0.5, - rotation: -90 + rotation: -90, }) points.grainlineTop = new Point(points[2].x / 2, 0) points.grainlineBottom = new Point(points[2].x / 2, points[2].y, 0) macro('grainline', { from: points.grainlineBottom, - to: points.grainlineTop + to: points.grainlineTop, }) } @@ -27,12 +27,12 @@ export default function (part) { macro('hd', { from: points[3], to: points[2], - y: points[2].y + sa + 15 + y: points[2].y + sa + 15, }) macro('vd', { from: points[2], to: points[1], - x: points[2].x + sa + 15 + x: points[2].x + sa + 15, }) } diff --git a/packages/theo/src/waistband-lining-left.js b/packages/theo/src/waistband-lining-left.js index 6c0a669af90..974593a50ff 100644 --- a/packages/theo/src/waistband-lining-left.js +++ b/packages/theo/src/waistband-lining-left.js @@ -9,7 +9,7 @@ export default function (part) { Path, complete, sa, - paperless + paperless, } = part.shorthand() points[0] = points[0].shift(180, 80) @@ -33,7 +33,7 @@ export default function (part) { title: 'waistbandLiningLeft', nr: '5a', scale: 0.5, - rotation: -90 + rotation: -90, }) points.logo = points.title.shift(90, 70) snippets.logo = new Snippet('logo', points.logo) @@ -41,7 +41,7 @@ export default function (part) { points.grainlineBottom = new Point(points[2].x / 2, points[2].y, 0) macro('grainline', { from: points.grainlineBottom, - to: points.grainlineTop + to: points.grainlineTop, }) } @@ -50,12 +50,12 @@ export default function (part) { macro('hd', { from: points[3], to: points[2], - y: points[2].y + sa + 15 + y: points[2].y + sa + 15, }) macro('vd', { from: points[2], to: points[1], - x: points[2].x + sa + 15 + x: points[2].x + sa + 15, }) } diff --git a/packages/theo/src/waistband-lining-right.js b/packages/theo/src/waistband-lining-right.js index 1dbd7dea0ef..1dbd33d4158 100644 --- a/packages/theo/src/waistband-lining-right.js +++ b/packages/theo/src/waistband-lining-right.js @@ -9,7 +9,7 @@ export default function (part) { Path, complete, sa, - paperless + paperless, } = part.shorthand() points[0] = points[0].shift(180, 80) @@ -33,7 +33,7 @@ export default function (part) { title: 'waistbandLiningRight', nr: '5b', scale: 0.5, - rotation: -90 + rotation: -90, }) points.logo = points.title.shift(90, 70) snippets.logo = new Snippet('logo', points.logo) @@ -41,7 +41,7 @@ export default function (part) { points.grainlineBottom = new Point(points[2].x / 2, points[2].y, 0) macro('grainline', { from: points.grainlineBottom, - to: points.grainlineTop + to: points.grainlineTop, }) } @@ -50,12 +50,12 @@ export default function (part) { macro('hd', { from: points[3], to: points[2], - y: points[2].y + sa + 15 + y: points[2].y + sa + 15, }) macro('vd', { from: points[2], to: points[1], - x: points[2].x + sa + 15 + x: points[2].x + sa + 15, }) } diff --git a/packages/theo/src/waistband-right.js b/packages/theo/src/waistband-right.js index 78ec11a7be3..973e72038d8 100644 --- a/packages/theo/src/waistband-right.js +++ b/packages/theo/src/waistband-right.js @@ -12,13 +12,13 @@ export default function (part) { title: 'waistbandRight', nr: '4b', scale: 0.5, - rotation: -90 + rotation: -90, }) points.grainlineTop = new Point(points[2].x / 2, 0) points.grainlineBottom = new Point(points[2].x / 2, points[2].y, 0) macro('grainline', { from: points.grainlineBottom, - to: points.grainlineTop + to: points.grainlineTop, }) } @@ -27,12 +27,12 @@ export default function (part) { macro('hd', { from: points[3], to: points[2], - y: points[2].y + sa + 15 + y: points[2].y + sa + 15, }) macro('vd', { from: points[2], to: points[1], - x: points[2].x + sa + 15 + x: points[2].x + sa + 15, }) } diff --git a/packages/titan/config/index.js b/packages/titan/config/index.js index 2c3a1e05938..01b00e9cccf 100644 --- a/packages/titan/config/index.js +++ b/packages/titan/config/index.js @@ -22,8 +22,8 @@ export default { 'grainlinePosition', 'legBalance', 'waistBalance', - 'waistbandWidth' - ] + 'waistbandWidth', + ], }, measurements: [ 'crossSeam', @@ -37,10 +37,10 @@ export default { 'waistToKnee', 'waistToHips', 'waistToSeat', - 'waistToUpperLeg' + 'waistToUpperLeg', ], dependencies: { - front: 'back' + front: 'back', }, options: { // Constants @@ -70,6 +70,6 @@ export default { crotchSeamCurveAngle: { deg: 25, min: 0, max: 35 }, waistBalance: { pct: 60, min: 30, max: 90 }, grainlinePosition: { pct: 45, min: 30, max: 60 }, - waistbandWidth: { mm: 0, min: 0, max: 60 } - } + waistbandWidth: { mm: 0, min: 0, max: 60 }, + }, } diff --git a/packages/titan/src/back.js b/packages/titan/src/back.js index 58f461f168b..a8d621c360e 100644 --- a/packages/titan/src/back.js +++ b/packages/titan/src/back.js @@ -96,7 +96,7 @@ export default (part) => { utils, snippets, Snippet, - sa + sa, } = part.shorthand() // Let's get to work @@ -215,7 +215,7 @@ export default (part) => { points.grainlineTop.y = points.styleWaistOut.y macro('grainline', { from: points.grainlineTop, - to: points.grainlineBottom + to: points.grainlineBottom, }) macro('scalebox', { at: points.knee }) points.logoAnchor = new Point(points.crossSeamCurveStart.x / 2, points.crossSeamCurveStart.y) @@ -224,7 +224,7 @@ export default (part) => { macro('title', { nr: 1, title: 'back', - at: points.titleAnchor + at: points.titleAnchor, }) if (sa) { @@ -257,17 +257,17 @@ export default (part) => { macro('hd', { from: points.floorIn, to: points.floorOut, - y: points.floorIn.y - 30 + y: points.floorIn.y - 30, }) macro('hd', { from: points.floorIn, to: points.floor, - y: points.floorIn.y - 15 + y: points.floorIn.y - 15, }) macro('hd', { from: points.floor, to: points.floorOut, - y: points.floorIn.y - 15 + y: points.floorIn.y - 15, }) macro('vd', { from: points.floorOut, @@ -275,58 +275,58 @@ export default (part) => { x: (points.seatOut.x > points.styleWaistOut.x ? points.seatOut.x : points.styleWaistOut.x) + sa + - 15 + 15, }) macro('vd', { from: points.floorIn, to: points.fork, - x: points.fork.x - sa - 15 + x: points.fork.x - sa - 15, }) macro('vd', { from: points.fork, to: points.styleWaistIn, - x: points.fork.x - sa - 15 + x: points.fork.x - sa - 15, }) macro('vd', { from: points.floorIn, to: points.styleWaistIn, - x: points.fork.x - sa - 30 + x: points.fork.x - sa - 30, }) macro('vd', { from: points.crossSeamCurveStart, to: points.styleWaistIn, - x: points.crossSeamCurveStart.x - sa - 15 + x: points.crossSeamCurveStart.x - sa - 15, }) macro('hd', { from: points.styleWaistIn, to: points.grainlineTop, - y: points.styleWaistIn.y - sa - 15 + y: points.styleWaistIn.y - sa - 15, }) macro('hd', { from: points.crossSeamCurveStart, to: points.grainlineTop, - y: points.styleWaistIn.y - sa - 30 + y: points.styleWaistIn.y - sa - 30, }) macro('hd', { from: points.crossSeamCurveMax, to: points.grainlineTop, - y: points.styleWaistIn.y - sa - 45 + y: points.styleWaistIn.y - sa - 45, }) macro('hd', { from: points.fork, to: points.grainlineTop, - y: points.styleWaistIn.y - sa - 60 + y: points.styleWaistIn.y - sa - 60, }) macro('hd', { from: points.grainlineTop, to: points.styleWaistOut, - y: points.styleWaistIn.y - sa - 15 + y: points.styleWaistIn.y - sa - 15, }) if (points.seatOut.x > points.styleWaistOut.x) { macro('hd', { from: points.grainlineTop, to: points.seatOut, - y: points.styleWaistIn.y - sa - 30 + y: points.styleWaistIn.y - sa - 30, }) } } diff --git a/packages/titan/src/front.js b/packages/titan/src/front.js index 2ee35ca1c7f..6d8517ac94e 100644 --- a/packages/titan/src/front.js +++ b/packages/titan/src/front.js @@ -104,7 +104,7 @@ export default (part) => { 'floorIn', 'floorOut', 'floor', - 'grainlineBottom' + 'grainlineBottom', ] let delta = seamDelta() let run = 0 @@ -135,7 +135,7 @@ export default (part) => { 'crotchSeamCurveStart', 'waistIn', 'cfWaist', - 'waistOut' + 'waistOut', ] rotate.push(out ? 'seatOut' : 'fork') const deltaMethod = out ? outseamDelta : inseamDelta @@ -169,7 +169,7 @@ export default (part) => { utils, snippets, Snippet, - sa + sa, } = part.shorthand() // Let's get to work @@ -292,7 +292,7 @@ export default (part) => { points.grainlineTop.y = points.styleWaistIn.y macro('grainline', { from: points.grainlineTop, - to: points.grainlineBottom + to: points.grainlineBottom, }) points.logoAnchor = new Point(points.crotchSeamCurveStart.x / 2, points.crotchSeamCurveStart.y) snippets.logo = new Snippet('logo', points.logoAnchor) @@ -300,7 +300,7 @@ export default (part) => { macro('title', { nr: 2, title: 'front', - at: points.titleAnchor + at: points.titleAnchor, }) if (sa) { @@ -337,27 +337,27 @@ export default (part) => { macro('hd', { from: points.floorOut, to: points.floor, - y: points.floorIn.y - 15 + y: points.floorIn.y - 15, }) macro('hd', { from: points.floor, to: points.floorIn, - y: points.floorIn.y - 15 + y: points.floorIn.y - 15, }) macro('hd', { from: points.floorOut, to: points.floorIn, - y: points.floorIn.y - 30 + y: points.floorIn.y - 30, }) macro('vd', { from: points.floorOut, to: points.fork, - x: points.fork.x + sa + 15 + x: points.fork.x + sa + 15, }) macro('vd', { from: points.fork, to: points.styleWaistIn, - x: points.fork.x + sa + 15 + x: points.fork.x + sa + 15, }) macro('vd', { from: points.floorIn, @@ -365,44 +365,44 @@ export default (part) => { x: (points.seatOut.x < points.styleWaistOut.x ? points.seatOut.x : points.styleWaistOut.x) - sa - - 15 + 15, }) macro('vd', { from: points.crotchSeamCurveStart, to: points.styleWaistIn, - x: points.crotchSeamCurveStart.x + sa + 15 + x: points.crotchSeamCurveStart.x + sa + 15, }) macro('hd', { from: points.seatOut, to: points.grainlineTop, - y: points.styleWaistIn.y - sa - 15 + y: points.styleWaistIn.y - sa - 15, }) if (points.styleWaistOut.x < points.seatOut.x) { macro('hd', { from: points.styleWaistOut, to: points.grainlineTop, - y: points.styleWaistIn.y - sa - 30 + y: points.styleWaistIn.y - sa - 30, }) } macro('hd', { from: points.grainlineTop, to: points.styleWaistIn, - y: points.styleWaistIn.y - sa - 15 + y: points.styleWaistIn.y - sa - 15, }) macro('hd', { from: points.grainlineTop, to: points.crotchSeamCurveStart, - y: points.styleWaistIn.y - sa - 30 + y: points.styleWaistIn.y - sa - 30, }) macro('hd', { from: points.grainlineTop, to: points.crotchSeamCurveMax, - y: points.styleWaistIn.y - sa - 45 + y: points.styleWaistIn.y - sa - 45, }) macro('hd', { from: points.grainlineTop, to: points.fork, - y: points.styleWaistIn.y - sa - 60 + y: points.styleWaistIn.y - sa - 60, }) } } diff --git a/packages/trayvon/config/index.js b/packages/trayvon/config/index.js index da27812208c..35a381bb327 100644 --- a/packages/trayvon/config/index.js +++ b/packages/trayvon/config/index.js @@ -10,7 +10,7 @@ export default { difficulty: 2, tags: ['top', 'basics'], optionGroups: { - style: ['tipWidth', 'knotWidth', 'lengthBonus'] + style: ['tipWidth', 'knotWidth', 'lengthBonus'], }, measurements: ['hpsToWaistBack', 'waistToHips', 'neck'], parts: [ @@ -20,23 +20,23 @@ export default { 'fabricTail', 'liningTip', 'liningTail', - 'loop' + 'loop', ], options: { tipWidth: { mm: 60, min: 20, - max: 120 + max: 120, }, knotWidth: { mm: 35, min: 20, - max: 70 + max: 70, }, lengthBonus: { pct: 0, min: -50, - max: 50 - } - } + max: 50, + }, + }, } diff --git a/packages/trayvon/src/fabrictail.js b/packages/trayvon/src/fabrictail.js index 9f64a30e7df..84f55880d2e 100644 --- a/packages/trayvon/src/fabrictail.js +++ b/packages/trayvon/src/fabrictail.js @@ -13,7 +13,7 @@ export default (part) => { at: points.title, nr: 4, title: 'fabricTail', - rotation: -90 + rotation: -90, }) if (sa) seamAllowance(part, 'fabric') @@ -25,12 +25,12 @@ export default (part) => { macro('ld', { from: points.tip, to: points.notch1, - d: options.tipWidth / -2.5 + d: options.tipWidth / -2.5, }) macro('ld', { from: points.notch2, to: points.tip, - d: options.tipWidth / -2.5 + d: options.tipWidth / -2.5, }) paths.n45 = new Path() .move(points.midLeft) diff --git a/packages/trayvon/src/fabrictip.js b/packages/trayvon/src/fabrictip.js index 63bcd3f2d32..c351401885d 100644 --- a/packages/trayvon/src/fabrictip.js +++ b/packages/trayvon/src/fabrictip.js @@ -11,7 +11,7 @@ export default (part) => { paperless, points, sa, - snippets + snippets, } = part.shorthand() calculateHelpers(part) @@ -24,7 +24,7 @@ export default (part) => { at: points.title, nr: 3, title: 'fabricTip', - rotation: -90 + rotation: -90, }) points.logo = points.tip.shiftFractionTowards(points.mid, 0.4) @@ -39,12 +39,12 @@ export default (part) => { macro('ld', { from: points.tip, to: points.notch1, - d: options.tipWidth / -2.5 + d: options.tipWidth / -2.5, }) macro('ld', { from: points.notch2, to: points.tip, - d: options.tipWidth / -2.5 + d: options.tipWidth / -2.5, }) paths.n45 = new Path() .move(points.midLeft) diff --git a/packages/trayvon/src/interfacingtail.js b/packages/trayvon/src/interfacingtail.js index d9ecbca9e64..4234ad385fe 100644 --- a/packages/trayvon/src/interfacingtail.js +++ b/packages/trayvon/src/interfacingtail.js @@ -13,7 +13,7 @@ export default (part) => { at: points.title, nr: 2, title: 'interfacingTail', - rotation: -90 + rotation: -90, }) } diff --git a/packages/trayvon/src/interfacingtip.js b/packages/trayvon/src/interfacingtip.js index fec3630b424..9353b632f53 100644 --- a/packages/trayvon/src/interfacingtip.js +++ b/packages/trayvon/src/interfacingtip.js @@ -13,7 +13,7 @@ export default (part) => { at: points.title, nr: 1, title: 'interfacingTip', - rotation: -90 + rotation: -90, }) } diff --git a/packages/trayvon/src/liningtail.js b/packages/trayvon/src/liningtail.js index cf7331c0c3f..08f85415f66 100644 --- a/packages/trayvon/src/liningtail.js +++ b/packages/trayvon/src/liningtail.js @@ -12,7 +12,7 @@ export default (part) => { paperless, sa, snippets, - store + store, } = part.shorthand() calculateHelpers(part) @@ -39,7 +39,7 @@ export default (part) => { at: points.title, nr: 6, title: 'liningTip', - rotation: -90 + rotation: -90, }) snippets.notch = new Snippet('notch', points.tip) diff --git a/packages/trayvon/src/liningtip.js b/packages/trayvon/src/liningtip.js index 8d15b58dd97..1d23aac46e9 100644 --- a/packages/trayvon/src/liningtip.js +++ b/packages/trayvon/src/liningtip.js @@ -11,7 +11,7 @@ export default (part) => { paths, points, sa, - snippets + snippets, } = part.shorthand() calculateHelpers(part) @@ -38,7 +38,7 @@ export default (part) => { at: points.title, nr: 5, title: 'liningTip', - rotation: -90 + rotation: -90, }) snippets.notch = new Snippet('notch', points.tip) macro('miniscale', { at: points.gridAnchor }) diff --git a/packages/trayvon/src/loop.js b/packages/trayvon/src/loop.js index c2f12c5025c..19c5299b6d5 100644 --- a/packages/trayvon/src/loop.js +++ b/packages/trayvon/src/loop.js @@ -21,7 +21,7 @@ export default (part) => { macro('title', { nr: 7, title: 'loop', - at: points.title + at: points.title, }) } @@ -29,12 +29,12 @@ export default (part) => { macro('hd', { from: points.bottomLeft, to: points.bottomRight, - y: points.bottomRight.y + 15 + y: points.bottomRight.y + 15, }) macro('vd', { from: points.topRight, to: points.bottomRight, - x: points.topRight.x + 15 + x: points.topRight.x + 15, }) } diff --git a/packages/trayvon/src/shared.js b/packages/trayvon/src/shared.js index 3aa600768f1..88bb928565f 100644 --- a/packages/trayvon/src/shared.js +++ b/packages/trayvon/src/shared.js @@ -36,7 +36,7 @@ export const draftTieShape = (part, tipWidth, knotWidth, notch = false) => { points.notch2 = points.tip.shift(-135, options.tipWidth / 5) macro('sprinkle', { snippet: 'notch', - on: ['notch1', 'notch2', 'mid'] + on: ['notch1', 'notch2', 'mid'], }) } paths.seam = new Path() @@ -55,29 +55,29 @@ export const tieShapeDimensions = (part, lining = false) => { macro('hd', { from: points.tipLeft, to: points.tipRight, - y: points.tip.y - 15 + y: points.tip.y - 15, }) macro('vd', { from: points.tipRight, to: points.tip, - x: points.tipRight.x + 15 + x: points.tipRight.x + 15, }) if (lining) { macro('vd', { from: points.cutRight, to: points.tip, - x: points.cutRight.x + 30 + x: points.cutRight.x + 30, }) } else { macro('hd', { from: points._tmp3, to: points._tmp1, - y: points.midLeft.y + 15 + y: points.midLeft.y + 15, }) macro('vd', { from: points.mid, to: points.tip, - x: points.tipRight.x + 30 + x: points.tipRight.x + 30, }) paths.hint = new Path() .move(points._tmp3) diff --git a/packages/tutorial/config/index.js b/packages/tutorial/config/index.js index 897007b858e..6371c54076f 100644 --- a/packages/tutorial/config/index.js +++ b/packages/tutorial/config/index.js @@ -13,7 +13,7 @@ export default { tags: ['example'], optionGroups: { fit: ['neckRatio', 'widthRatio', 'lengthRatio'], - box: ['size'] + box: ['size'], }, measurements: ['head'], inject: { @@ -24,13 +24,13 @@ export default { step8: 'step7', step9: 'step8', step10: 'step9', - step11: 'step10' + step11: 'step10', }, parts: ['step1', 'step2', 'bib'], options: { size: { pct: 50, min: 10, max: 100 }, neckRatio: { pct: 80, min: 70, max: 90 }, widthRatio: { pct: 45, min: 35, max: 55 }, - lengthRatio: { pct: 75, min: 55, max: 85 } - } + lengthRatio: { pct: 75, min: 55, max: 85 }, + }, } diff --git a/packages/tutorial/src/bib.js b/packages/tutorial/src/bib.js index 54364e96f61..20bf399b6b8 100644 --- a/packages/tutorial/src/bib.js +++ b/packages/tutorial/src/bib.js @@ -10,7 +10,7 @@ export default function (part) { complete, snippets, Snippet, - paperless + paperless, } = part.shorthand() // Construct the neck opening @@ -73,13 +73,13 @@ export default function (part) { from: points.edgeTop, to: points.tipRight, via: points.tipRightTop, - prefix: 'tipRightTop' + prefix: 'tipRightTop', }) macro('round', { from: points.tipRight, to: points.top, via: points.tipRightBottom, - prefix: 'tipRightBottom' + prefix: 'tipRightBottom', }) // Rotate straps so they don't overlap @@ -98,7 +98,7 @@ export default function (part) { 'tipRightBottomEnd', 'tipRightBottom', 'top', - 'topCp2' + 'topCp2', ] while (points.tipRightBottomStart.x > -1) { @@ -128,14 +128,14 @@ export default function (part) { to: points.bottomRight, via: points.bottomLeft, radius: points.bottomRight.x / 4, - prefix: 'bottomLeft' + prefix: 'bottomLeft', }) macro('round', { from: points.bottomLeft, to: points.topRight, via: points.bottomRight, radius: points.bottomRight.x / 4, - prefix: 'bottomRight' + prefix: 'bottomRight', }) // Construct the path @@ -177,7 +177,7 @@ export default function (part) { macro('title', { at: points.title, nr: 1, - title: 'bib' + title: 'bib', }) // Add the scalebox @@ -194,32 +194,32 @@ export default function (part) { macro('hd', { from: points.bottomLeftStart, to: points.bottomRightEnd, - y: points.bottomLeft.y + 15 + y: points.bottomLeft.y + 15, }) macro('vd', { from: points.bottomRightStart, to: points.bottom, - x: points.bottomRight.x + 15 + x: points.bottomRight.x + 15, }) macro('vd', { from: points.bottomRightStart, to: points.right, - x: points.bottomRight.x + 30 + x: points.bottomRight.x + 30, }) macro('vd', { from: points.bottomRightStart, to: points.tipLeftTopStart, - x: points.bottomRight.x + 45 + x: points.bottomRight.x + 45, }) macro('hd', { from: points.left, to: points.right, - y: points.left.y + 25 + y: points.left.y + 25, }) macro('ld', { from: points.tipLeftBottomEnd, to: points.tipLeftTopStart, - d: -15 + d: -15, }) } } diff --git a/packages/tutorial/src/step1.js b/packages/tutorial/src/step1.js index ce26efd6995..c125e539df4 100644 --- a/packages/tutorial/src/step1.js +++ b/packages/tutorial/src/step1.js @@ -10,7 +10,7 @@ export default function (part) { complete, sa, paperless, - macro + macro, } = part.shorthand() let w = 500 * options.size @@ -47,12 +47,12 @@ export default function (part) { macro('hd', { from: points.bottomLeft, to: points.bottomRight, - y: points.bottomLeft.y + sa + 15 + y: points.bottomLeft.y + sa + 15, }) macro('vd', { from: points.bottomRight, to: points.topRight, - x: points.topRight.x + sa + 15 + x: points.topRight.x + sa + 15, }) } diff --git a/packages/tutorial/src/step10.js b/packages/tutorial/src/step10.js index eea72ff4ef6..dda06df97de 100644 --- a/packages/tutorial/src/step10.js +++ b/packages/tutorial/src/step10.js @@ -7,7 +7,7 @@ export default function (part) { via: points.bottomLeft, radius: points.bottomRight.x / 4, render: true, - prefix: 'bottomLeft' + prefix: 'bottomLeft', }) macro('round', { from: points.bottomLeft, @@ -15,7 +15,7 @@ export default function (part) { via: points.bottomRight, radius: points.bottomRight.x / 4, render: true, - prefix: 'bottomRight' + prefix: 'bottomRight', }) paths.seam = new Path() diff --git a/packages/tutorial/src/step11.js b/packages/tutorial/src/step11.js index 400503b919b..26f1bb5c431 100644 --- a/packages/tutorial/src/step11.js +++ b/packages/tutorial/src/step11.js @@ -16,7 +16,7 @@ export default function (part) { macro('title', { at: points.title, nr: 1, - title: 'bib' + title: 'bib', }) points.scalebox = points.title.shift(-90, 55) diff --git a/packages/tutorial/src/step7.js b/packages/tutorial/src/step7.js index d1b4b94c278..07d8da36a97 100644 --- a/packages/tutorial/src/step7.js +++ b/packages/tutorial/src/step7.js @@ -12,14 +12,14 @@ export default function (part) { to: points.tipRight, via: points.tipRightTop, prefix: 'tipRightTop', - render: true + render: true, }) macro('round', { from: points.tipRight, to: points.top, via: points.tipRightBottom, prefix: 'tipRightBottom', - render: true + render: true, }) return part diff --git a/packages/tutorial/src/step8.js b/packages/tutorial/src/step8.js index ee046983a5b..c480386652b 100644 --- a/packages/tutorial/src/step8.js +++ b/packages/tutorial/src/step8.js @@ -16,7 +16,7 @@ export default function (part) { 'tipRightBottomEnd', 'tipRightBottom', 'top', - 'topCp2' + 'topCp2', ] while (points.tipRightBottomStart.x > -1) { @@ -30,14 +30,14 @@ export default function (part) { to: points.tipRight, via: points.tipRightTop, prefix: 'tipRightTop', - render: true + render: true, }) macro('round', { from: points.tipRight, to: points.top, via: points.tipRightBottom, prefix: 'tipRightBottom', - render: true + render: true, }) paths.rect = new Path() diff --git a/packages/utils/src/index.js b/packages/utils/src/index.js index 6673ff3ad6c..7b8d0f7dbcf 100644 --- a/packages/utils/src/index.js +++ b/packages/utils/src/index.js @@ -22,5 +22,5 @@ export default [ 'storage', 'tiler', 'validateEmail', - 'validateTld' + 'validateTld', ] diff --git a/packages/wahid/config/index.js b/packages/wahid/config/index.js index ef415170bdd..3b0614d19cf 100644 --- a/packages/wahid/config/index.js +++ b/packages/wahid/config/index.js @@ -18,7 +18,7 @@ export default { 'armholeDepthFactor', 'backScyeDart', 'frontScyeDart', - 'centerBackDart' + 'centerBackDart', ], style: [ 'pocketLocation', @@ -28,9 +28,9 @@ export default { 'frontStyle', 'hemStyle', 'hemRadius', - 'buttons' + 'buttons', ], - advanced: ['backInset', 'frontInset', 'shoulderInset', 'neckInset', 'pocketAngle'] + advanced: ['backInset', 'frontInset', 'shoulderInset', 'neckInset', 'pocketAngle'], }, measurements: [ 'biceps', @@ -41,7 +41,7 @@ export default { 'neck', 'shoulderSlope', 'shoulderToShoulder', - 'waist' + 'waist', ], dependencies: { backBlock: 'base', @@ -50,7 +50,7 @@ export default { back: 'backBlock', frontFacing: 'front', frontLining: 'front', - pocketBag: 'front' + pocketBag: 'front', }, inject: { backBlock: 'base', @@ -58,7 +58,7 @@ export default { front: 'frontBlock', back: 'backBlock', frontFacing: 'front', - frontLining: 'front' + frontLining: 'front', }, hide: ['base', 'frontBlock', 'backBlock'], parts: ['pocketWelt', 'pocketFacing', 'pocketInterfacing'], @@ -80,105 +80,105 @@ export default { armholeDepthFactor: { pct: 70, min: 60, - max: 80 + max: 80, }, pocketLocation: { pct: 35, min: 25, - max: 55 + max: 55, }, pocketWidth: { pct: 10, max: 15, - min: 8 + min: 8, }, weltHeight: { pct: 12.5, max: 20, - min: 10 + min: 10, }, chestEase: { pct: 2, min: 1, - max: 10 + max: 10, }, waistEase: { pct: 8, min: 2, - max: 15 + max: 15, }, hipsEase: { pct: 8, min: 2, - max: 15 + max: 15, }, lengthBonus: { pct: 1, min: 0, - max: 8 + max: 8, }, backScyeDart: { deg: 2, min: 0, - max: 6 + max: 6, }, frontScyeDart: { deg: 6, min: 0, - max: 12 + max: 12, }, centerBackDart: { pct: 2, min: 0, - max: 5 + max: 5, }, necklineDrop: { pct: 50, min: 35, - max: 85 + max: 85, }, frontStyle: { dflt: 'classic', - list: ['classic', 'rounded'] + list: ['classic', 'rounded'], }, hemStyle: { dflt: 'classic', - list: ['classic', 'rounded', 'square'] + list: ['classic', 'rounded', 'square'], }, hemRadius: { pct: 6, min: 2, - max: 12 + max: 12, }, buttons: { count: 6, min: 4, - max: 12 + max: 12, }, backInset: { pct: 15, min: 10, - max: 20 + max: 20, }, frontInset: { pct: 15, min: 10, - max: 20 + max: 20, }, shoulderInset: { pct: 10, min: 0, - max: 20 + max: 20, }, neckInset: { pct: 5, min: 0, - max: 10 + max: 10, }, pocketAngle: { deg: 5, min: 0, - max: 5 - } - } + max: 5, + }, + }, } diff --git a/packages/wahid/src/back.js b/packages/wahid/src/back.js index 47a5196312d..cccb7640ba4 100644 --- a/packages/wahid/src/back.js +++ b/packages/wahid/src/back.js @@ -12,7 +12,7 @@ export default (part) => { complete, sa, paperless, - snippets + snippets, } = part.shorthand() // Cleanup from Brian @@ -116,95 +116,95 @@ export default (part) => { macro('ld', { from: points.neck, to: points.shoulder, - d: 15 + sa + d: 15 + sa, }) macro('hd', { from: points.cbArmhole, to: points.cbNeck, - y: points.cbNeck.y - 15 - sa + y: points.cbNeck.y - 15 - sa, }) macro('hd', { from: points.cbArmhole, to: points.neck, - y: points.cbNeck.y - 30 - sa + y: points.cbNeck.y - 30 - sa, }) macro('hd', { from: points.cbArmhole, to: points.shoulder, - y: points.cbNeck.y - 45 - sa + y: points.cbNeck.y - 45 - sa, }) macro('hd', { from: points.cbArmhole, to: points.armholePitch, - y: points.armholePitch.y + y: points.armholePitch.y, }) macro('hd', { from: points.cbArmhole, to: points.dartTop, - y: points.dartTop.y - 15 + y: points.dartTop.y - 15, }) macro('vd', { from: points.armhole, to: points.armholePitch, - x: points.armhole.x + 15 + sa + x: points.armhole.x + 15 + sa, }) macro('vd', { from: points.armhole, to: points.shoulder, - x: points.armhole.x + 30 + sa + x: points.armhole.x + 30 + sa, }) macro('vd', { from: points.armhole, to: points.neck, - x: points.armhole.x + 45 + sa + x: points.armhole.x + 45 + sa, }) macro('vd', { from: points.hem, to: points.waist, - x: points.armhole.x + 15 + sa + x: points.armhole.x + 15 + sa, }) macro('vd', { from: points.hem, to: points.armhole, - x: points.armhole.x + 30 + sa + x: points.armhole.x + 30 + sa, }) macro('hd', { from: points.dartHemRight, to: points.hem, - y: points.hem.y + 3 * sa + 15 + y: points.hem.y + 3 * sa + 15, }) macro('hd', { from: points.cbHem, to: points.dartHemLeft, - y: points.hem.y + 3 * sa + 15 + y: points.hem.y + 3 * sa + 15, }) macro('hd', { from: points.cbHem, to: points.hem, - y: points.hem.y + 3 * sa + 30 + y: points.hem.y + 3 * sa + 30, }) macro('ld', { from: points.dartWaistLeft, - to: points.dartWaistRight + to: points.dartWaistRight, }) macro('ld', { from: points.dartHipLeft, - to: points.dartHipRight + to: points.dartHipRight, }) macro('vd', { from: points.cbHem, to: points.cbArmhole, - x: points.cbHem.x - 15 - sa + x: points.cbHem.x - 15 - sa, }) macro('vd', { from: points.cbHem, to: points.cbNeck, - x: points.cbHem.x - 30 - sa + x: points.cbHem.x - 30 - sa, }) macro('vd', { from: points.cbHem, to: points.neck, - x: points.cbHem.x - 45 - sa + x: points.cbHem.x - 45 - sa, }) } } diff --git a/packages/wahid/src/front.js b/packages/wahid/src/front.js index 952b1b9b2e2..06493a7357e 100644 --- a/packages/wahid/src/front.js +++ b/packages/wahid/src/front.js @@ -15,7 +15,7 @@ export default (part) => { complete, sa, paperless, - store + store, } = part.shorthand() // Cleanup from Brian @@ -108,7 +108,7 @@ export default (part) => { to: points.hem, via: points.closureBottom, radius, - prefix: 'round' + prefix: 'round', }) points.lastButton = new Point(0, points.roundStart.y) } else { @@ -197,7 +197,7 @@ export default (part) => { 'pocketBottomMidRight', 'pocketTopRight', 'pocketBottomRight', - 'dartEnd' + 'dartEnd', ] for (let p of toRotate) { if (typeof points[p] !== 'undefined') @@ -294,183 +294,183 @@ export default (part) => { macro('hd', { from: points.closureTop, to: points.neck, - y: points.neck.y - 15 - sa + y: points.neck.y - 15 - sa, }) macro('hd', { from: points.closureTop, to: points.shoulder, - y: points.neck.y - 30 - sa + y: points.neck.y - 30 - sa, }) macro('hd', { from: points.closureTop, to: points.armhole, - y: points.neck.y - 45 - sa + y: points.neck.y - 45 - sa, }) macro('ld', { from: points.neck, to: points.shoulder, - d: 15 + sa + d: 15 + sa, }) macro('ld', { from: points.neck, to: points.flbTop, - d: -15 + d: -15, }) macro('vd', { from: points.armhole, to: points.shoulder, - x: points.armhole.x + 15 + sa + x: points.armhole.x + 15 + sa, }) macro('vd', { from: points.armhole, to: points.neck, - x: points.armhole.x + 30 + sa + x: points.armhole.x + 30 + sa, }) macro('vd', { from: points.hem, to: points.armhole, - x: (points.armhole.x > points.hem.x ? points.armhole.x : points.hem.x) + 15 + sa + x: (points.armhole.x > points.hem.x ? points.armhole.x : points.hem.x) + 15 + sa, }) macro('vd', { from: options.hemStyle === 'classic' ? points.splitDartHemRight : points.dartHemRight, to: points.armhole, - x: (points.armhole.x > points.hem.x ? points.armhole.x : points.hem.x) + 30 + sa + x: (points.armhole.x > points.hem.x ? points.armhole.x : points.hem.x) + 30 + sa, }) macro('vd', { from: options.hemStyle === 'classic' ? points.splitDartHemLeft : points.dartHemLeft, to: points.armhole, - x: (points.armhole.x > points.hem.x ? points.armhole.x : points.hem.x) + 45 + sa + x: (points.armhole.x > points.hem.x ? points.armhole.x : points.hem.x) + 45 + sa, }) macro('ld', { from: points.dartHemRight, to: points.hem, - d: 15 + d: 15, }) if (options.hemStyle === 'classic') { macro('hd', { from: points.closureBottom, to: points.hemTip, - y: points.hemTip.y + 15 + sa + y: points.hemTip.y + 15 + sa, }) macro('hd', { from: points.closureBottom, to: points.splitDartHemLeft, - y: points.hemTip.y + 30 + sa + y: points.hemTip.y + 30 + sa, }) macro('hd', { from: points.closureBottom, to: points.splitDartHemRight, - y: points.hemTip.y + 45 + sa + y: points.hemTip.y + 45 + sa, }) macro('hd', { from: points.closureBottom, to: points.hem, - y: points.hemTip.y + 60 + sa + y: points.hemTip.y + 60 + sa, }) macro('vd', { from: points.hemTip, to: points.closureBottom, - x: points.closureBottom.x - 15 - sa + x: points.closureBottom.x - 15 - sa, }) macro('vd', { from: points.hemTip, to: points.pocketTopMidLeft, - x: points.closureBottom.x - 30 - sa + x: points.closureBottom.x - 30 - sa, }) macro('vd', { from: points.hemTip, to: points.dartWaistLeft, - x: points.closureBottom.x - 45 - sa + x: points.closureBottom.x - 45 - sa, }) macro('vd', { from: points.hemTip, to: points.closureTop, - x: points.closureBottom.x - 60 - sa + x: points.closureBottom.x - 60 - sa, }) } else { macro('hd', { from: points.roundStart, to: points.roundEnd, - y: points.roundEnd.y + 15 + sa + y: points.roundEnd.y + 15 + sa, }) macro('hd', { from: points.roundStart, to: points.dartHemLeft, - y: points.roundEnd.y + 30 + sa + y: points.roundEnd.y + 30 + sa, }) macro('hd', { from: points.roundStart, to: points.dartHemRight, - y: points.roundEnd.y + 45 + sa + y: points.roundEnd.y + 45 + sa, }) macro('hd', { from: points.roundStart, to: points.hem, - y: points.roundEnd.y + 60 + sa + y: points.roundEnd.y + 60 + sa, }) macro('vd', { from: points.roundEnd, to: points.roundStart, - x: points.roundStart.x - 15 - sa + x: points.roundStart.x - 15 - sa, }) macro('vd', { from: points.roundEnd, to: points.pocketTopMidLeft, - x: points.roundStart.x - 30 - sa + x: points.roundStart.x - 30 - sa, }) macro('vd', { from: points.roundEnd, to: points.dartWaistLeft, - x: points.roundStart.x - 45 - sa + x: points.roundStart.x - 45 - sa, }) macro('vd', { from: points.roundEnd, to: points.closureTop, - x: points.roundStart.x - 60 - sa + x: points.roundStart.x - 60 - sa, }) } macro('vd', { from: points.closureTop, to: points.neck, - x: points.closureTop.x - 15 - sa + x: points.closureTop.x - 15 - sa, }) macro('vd', { from: points.button2, to: points.button1, - x: points.button1.x + 15 + x: points.button1.x + 15, }) macro('hd', { from: points.closureTop, to: points.button2, - y: points.button2.y + 15 + y: points.button2.y + 15, }) macro('ld', { from: points.dartWaistLeft, - to: points.dartWaistRight + to: points.dartWaistRight, }) macro('ld', { from: points.dartHipLeft, - to: points.dartHipRight + to: points.dartHipRight, }) macro('ld', { from: points.pocketTopLeft, to: points.pocketTopMidLeft, - d: 15 + d: 15, }) macro('ld', { from: points.pocketTopMidRight, to: points.pocketTopRight, - d: 15 + d: 15, }) macro('ld', { from: points.pocketBottomRight, to: points.pocketTopRight, - d: -15 + d: -15, }) macro('vd', { from: points.pocketTopMidLeft, to: points.dartTop, - x: points.closureTop.x - 30 - sa + x: points.closureTop.x - 30 - sa, }) } } diff --git a/packages/wahid/src/frontfacing.js b/packages/wahid/src/frontfacing.js index f6888855a66..9c497bff94e 100644 --- a/packages/wahid/src/frontfacing.js +++ b/packages/wahid/src/frontfacing.js @@ -9,7 +9,7 @@ export default (part) => { snippets, Snippet, complete, - sa + sa, } = part.shorthand() // Cleanup from front part @@ -47,7 +47,7 @@ export default (part) => { macro('title', { nr: 3, at: points.title, - title: 'frontFacing' + title: 'frontFacing', }) points.logo = points.closureTop.shiftFractionTowards(points.dartWaistLeft, 0.5) snippets.logo = new Snippet('logo', points.logo) diff --git a/packages/wahid/src/frontlining.js b/packages/wahid/src/frontlining.js index 0ef4cc4abda..df26551511e 100644 --- a/packages/wahid/src/frontlining.js +++ b/packages/wahid/src/frontlining.js @@ -29,7 +29,7 @@ export default (part) => { macro('title', { nr: 4, at: points.title, - title: 'frontLining' + title: 'frontLining', }) points.logo = points.dartWaistRight.shiftFractionTowards(points.waist, 0.5) snippets.logo = new Snippet('logo', points.logo) diff --git a/packages/wahid/src/index.js b/packages/wahid/src/index.js index c91bbd55304..b946906aa61 100644 --- a/packages/wahid/src/index.js +++ b/packages/wahid/src/index.js @@ -23,8 +23,8 @@ const wristPlugin = { preDraft: function ({ settings }) { settings.measurements.wrist = settings.measurements.biceps * 0.6 settings.measurements.shoulderToWrist = settings.measurements.shoulderToShouder * 1.5 - } - } + }, + }, } // Create pattern diff --git a/packages/wahid/src/pocketbag.js b/packages/wahid/src/pocketbag.js index e50f01097ce..cd8ec1f66c7 100644 --- a/packages/wahid/src/pocketbag.js +++ b/packages/wahid/src/pocketbag.js @@ -9,7 +9,7 @@ export default (part) => { macro, complete, paperless, - store + store, } = part.shorthand() let pw = measurements.hips * options.pocketWidth // Pocket width @@ -25,7 +25,7 @@ export default (part) => { via: points.bottomLeft, radius: pw / 8, render: false, - prefix: 'roundLeft' + prefix: 'roundLeft', }) macro('round', { from: points.bottomLeft, @@ -33,7 +33,7 @@ export default (part) => { via: points.bottomRight, radius: pw / 8, render: false, - prefix: 'roundRight' + prefix: 'roundRight', }) paths.seam = new Path() @@ -52,7 +52,7 @@ export default (part) => { macro('title', { nr: 7, title: 'pocketBag', - at: points.title + at: points.title, }) } @@ -60,12 +60,12 @@ export default (part) => { macro('hd', { from: points.bottomLeft, to: points.bottomRight, - y: points.bottomLeft.y + 15 + y: points.bottomLeft.y + 15, }) macro('vd', { from: points.bottomRight, to: points.topRight, - x: points.topRight.x + 15 + x: points.topRight.x + 15, }) } diff --git a/packages/wahid/src/pocketfacing.js b/packages/wahid/src/pocketfacing.js index 40d553a5a47..401f63580f5 100644 --- a/packages/wahid/src/pocketfacing.js +++ b/packages/wahid/src/pocketfacing.js @@ -9,7 +9,7 @@ export default (part) => { macro, complete, paperless, - store + store, } = part.shorthand() let pw = measurements.hips * options.pocketWidth // Pocket width @@ -28,7 +28,7 @@ export default (part) => { via: points.bottomLeft, radius: pw / 8, render: false, - prefix: 'roundLeft' + prefix: 'roundLeft', }) macro('round', { from: points.bottomLeft, @@ -36,7 +36,7 @@ export default (part) => { via: points.bottomRight, radius: pw / 8, render: false, - prefix: 'roundRight' + prefix: 'roundRight', }) paths.seam = new Path() @@ -55,11 +55,11 @@ export default (part) => { macro('title', { nr: 6, title: 'pocketFacing', - at: points.title + at: points.title, }) macro('sprinkle', { snippet: 'notch', - on: ['notchLeft', 'notchRight'] + on: ['notchLeft', 'notchRight'], }) paths.cutline = new Path() .move(points.notchLeft) @@ -71,12 +71,12 @@ export default (part) => { macro('hd', { from: points.bottomLeft, to: points.bottomRight, - y: points.bottomLeft.y + 15 + y: points.bottomLeft.y + 15, }) macro('vd', { from: points.bottomRight, to: points.topRight, - x: points.topRight.x + 15 + x: points.topRight.x + 15, }) } diff --git a/packages/wahid/src/pocketinterfacing.js b/packages/wahid/src/pocketinterfacing.js index b98e58d9167..8e0f49dcfc8 100644 --- a/packages/wahid/src/pocketinterfacing.js +++ b/packages/wahid/src/pocketinterfacing.js @@ -8,7 +8,7 @@ export default (part) => { options, macro, complete, - paperless + paperless, } = part.shorthand() let pw = measurements.hips * options.pocketWidth // Pocket width @@ -35,11 +35,11 @@ export default (part) => { macro('title', { nr: 8, title: 'pocketInterfacing', - at: points.title + at: points.title, }) macro('sprinkle', { snippet: 'notch', - on: ['notchLeft', 'notchRight'] + on: ['notchLeft', 'notchRight'], }) paths.cutline = new Path() .move(points.notchLeft) @@ -51,12 +51,12 @@ export default (part) => { macro('hd', { from: points.bottomLeft, to: points.bottomRight, - y: points.bottomLeft.y + 15 + y: points.bottomLeft.y + 15, }) macro('vd', { from: points.bottomRight, to: points.topRight, - x: points.topRight.x + 15 + x: points.topRight.x + 15, }) } diff --git a/packages/wahid/src/pocketwelt.js b/packages/wahid/src/pocketwelt.js index 3802d7529e1..9c22e98e55d 100644 --- a/packages/wahid/src/pocketwelt.js +++ b/packages/wahid/src/pocketwelt.js @@ -8,7 +8,7 @@ export default (part) => { options, macro, complete, - paperless + paperless, } = part.shorthand() let pw = measurements.hips * options.pocketWidth // Pocket width @@ -37,11 +37,11 @@ export default (part) => { macro('title', { nr: 5, title: 'pocketWelt', - at: points.title + at: points.title, }) macro('sprinkle', { snippet: 'notch', - on: ['notchLeft', 'notchRight'] + on: ['notchLeft', 'notchRight'], }) paths.cutline = new Path() .move(points.notchLeft) @@ -57,27 +57,27 @@ export default (part) => { macro('hd', { from: points.notchLeft, to: points.notchRight, - y: points.bottomLeft.y + 15 + y: points.bottomLeft.y + 15, }) macro('hd', { from: points.bottomLeft, to: points.bottomRight, - y: points.bottomLeft.y + 30 + y: points.bottomLeft.y + 30, }) macro('vd', { from: points.midRight, to: points.notchRight, - x: points.midRight.x + 15 + x: points.midRight.x + 15, }) macro('vd', { from: points.midRight, to: points.topRight, - x: points.midRight.x + 30 + x: points.midRight.x + 30, }) macro('vd', { from: points.bottomRight, to: points.topRight, - x: points.midRight.x + 45 + x: points.midRight.x + 45, }) } diff --git a/packages/waralee/config/index.js b/packages/waralee/config/index.js index c4ddc063088..d3f9eaead87 100644 --- a/packages/waralee/config/index.js +++ b/packages/waralee/config/index.js @@ -21,8 +21,8 @@ export default { 'crotchFactorBackHor', 'crotchFactorBackVer', 'crotchFactorFrontHor', - 'crotchFactorFrontVer' - ] + 'crotchFactorFrontVer', + ], }, measurements: ['seat', 'inseam', 'crotchDepth', 'waistToHips'], dependencies: {}, @@ -52,6 +52,6 @@ export default { crotchFactorBackVer: { pct: 60, min: 20, max: 90 }, waistOverlap: { pct: 50, min: 10, max: 100 }, legShortening: { pct: 25, min: -10, max: 50 }, - backRaise: { pct: 10, min: 0, max: 25 } - } + backRaise: { pct: 10, min: 0, max: 25 }, + }, } diff --git a/packages/waralee/src/backpocket.js b/packages/waralee/src/backpocket.js index 0e9a7d3c8e1..e9f0511bfd5 100644 --- a/packages/waralee/src/backpocket.js +++ b/packages/waralee/src/backpocket.js @@ -10,7 +10,7 @@ export default function (part) { snippets, complete, paperless, - macro + macro, } = part.shorthand() let pocketDepth = options.backPocketDepth @@ -47,7 +47,7 @@ export default function (part) { macro('title', { nr: 4, at: points.title, - title: 'backPocket' + title: 'backPocket', }) points.logo = points.title.shift(270, 75) @@ -63,12 +63,12 @@ export default function (part) { macro('hd', { from: points.topLeft, to: points.topRight, - y: points.topLeft.y + 15 + y: points.topLeft.y + 15, }) macro('vd', { from: points.topLeft, to: points.bottomLeft, - x: points.topLeft.x + 15 + x: points.topLeft.x + 15, }) } diff --git a/packages/waralee/src/cutout.js b/packages/waralee/src/cutout.js index 7f07de83e5f..55530181906 100644 --- a/packages/waralee/src/cutout.js +++ b/packages/waralee/src/cutout.js @@ -13,7 +13,7 @@ export default function (part) { complete, sa, paperless, - macro + macro, } = part.shorthand() let seatDepth = (measurements.crotchDepth - measurements.waistToHips) * (1 + options.waistRaise) @@ -44,7 +44,7 @@ export default function (part) { macro('title', { nr: 2, at: points.title, - title: 'cutout' + title: 'cutout', }) if (sa) { @@ -62,22 +62,22 @@ export default function (part) { macro('hd', { from: points.fWaistSide, to: points.mWaist, - y: points.mWaist.y + y: points.mWaist.y, }) macro('hd', { from: points.mWaist, to: points.bWaistSide, - y: points.mWaist.y + y: points.mWaist.y, }) macro('vd', { from: points.mWaist1, to: points.mHip, - x: points.mWaist.x + x: points.mWaist.x, }) macro('vd', { from: points.mWaist2, to: points.mWaist1, - x: points.mWaist.x + 15 + x: points.mWaist.x + 15, }) } diff --git a/packages/waralee/src/facings.js b/packages/waralee/src/facings.js index 403c719b171..7ba4f64dc71 100644 --- a/packages/waralee/src/facings.js +++ b/packages/waralee/src/facings.js @@ -10,7 +10,7 @@ export default function (part) { snippets, complete, paperless, - macro + macro, } = part.shorthand() let frontPocketSize = @@ -52,7 +52,7 @@ export default function (part) { nr: 5, at: points.frontTitle.shift(0, 30), title: 'frontFacing', - prefix: 'front' + prefix: 'front', }) points.frontLogo = points.frontTitle.shift(270, 0) snippets.frontLogo = new Snippet('logo', points.frontLogo).attr('data-scale', 0.4) @@ -66,7 +66,7 @@ export default function (part) { nr: 6, at: points.backTitle.shift(0, 30), title: 'backFacing', - prefix: 'back' + prefix: 'back', }) points.backLogo = points.backTitle.shift(270, 0) snippets.backLogo = new Snippet('logo', points.backLogo).attr('data-scale', 0.4) @@ -81,22 +81,22 @@ export default function (part) { macro('hd', { from: points.frontTL, to: points.frontTR, - y: points.frontTL.y + 15 + y: points.frontTL.y + 15, }) macro('hd', { from: points.backTL, to: points.backTR, - y: points.backTL.y + 15 + y: points.backTL.y + 15, }) macro('vd', { from: points.frontTL, to: points.frontBL, - x: points.frontTL.x + 15 + x: points.frontTL.x + 15, }) macro('vd', { from: points.backTL, to: points.backBL, - x: points.backTL.x + 15 + x: points.backTL.x + 15, }) } diff --git a/packages/waralee/src/mini.js b/packages/waralee/src/mini.js index 0f610ddc486..205d4b23a80 100644 --- a/packages/waralee/src/mini.js +++ b/packages/waralee/src/mini.js @@ -15,7 +15,7 @@ export default function (part) { complete, sa, paperless, - macro + macro, } = part.shorthand() let mini = options.minimizer @@ -56,7 +56,7 @@ export default function (part) { from: points.fWaistSide, to: points.mWaist, y: points.fWaistSide.y, - text: part.units(points.fWaistSide.dist(points.mWaist) * mini) + text: part.units(points.fWaistSide.dist(points.mWaist) * mini), }) /* macro("hd", { diff --git a/packages/waralee/src/pants.js b/packages/waralee/src/pants.js index 3238c87b2d8..ef3c545a093 100644 --- a/packages/waralee/src/pants.js +++ b/packages/waralee/src/pants.js @@ -8,7 +8,7 @@ export default function (part) { complete, sa, paperless, - macro + macro, } = part.shorthand() paths.waistFoldBack = paths.waistBack @@ -30,7 +30,7 @@ export default function (part) { macro('title', { nr: 1, at: points.title, - title: 'pants' + title: 'pants', }) macro('scalebox', { at: points.mHip.shift(-90, 70) }) @@ -42,86 +42,86 @@ export default function (part) { macro('hd', { from: points.fWaistSide, to: points.mWaist, - y: points.fWaistSide.y + y: points.fWaistSide.y, }) macro('hd', { from: points.fWaistFrontOverlap, to: points.mWaist, - y: points.fWaistSide.y - sa - 15 + y: points.fWaistSide.y - sa - 15, }) macro('hd', { from: points.mWaist, to: points.bWaistSide, - y: points.bWaistSide.y + y: points.bWaistSide.y, }) macro('hd', { from: points.mWaist, to: points.bWaistBack, - y: points.bWaistSide.y - sa - 15 + y: points.bWaistSide.y - sa - 15, }) macro('hd', { from: points.mWaist, to: points.bWaistBackOverlap, - y: points.bWaistSide.y - sa - 30 + y: points.bWaistSide.y - sa - 30, }) macro('vd', { from: points.mWaist, to: points.mHip, - x: points.mWaist.x + x: points.mWaist.x, }) macro('vd', { from: points.bWaistSide, to: points.bWaistBack, - x: points.bWaistSide.x + 15 + x: points.bWaistSide.x + 15, }) macro('vd', { from: points.bWaistBackOverlap, to: points.bLegBackOverlap, - x: points.bLegBackOverlap.x - 30 + x: points.bLegBackOverlap.x - 30, }) if (options.frontPocket) { macro('vd', { from: points.fWaistSide, to: points.frontPocketTop, - x: points.frontPocketTop.x + x: points.frontPocketTop.x, }) macro('vd', { from: points.fWaistSide, to: points.frontPocketBottom, - x: points.frontPocketBottom.x + x: points.frontPocketBottom.x, }) macro('hd', { from: points.frontPocketTop, to: points.fWaistSide, - y: points.frontPocketTop.y + y: points.frontPocketTop.y, }) macro('hd', { from: points.frontPocketBottom, to: points.fWaistSide, - y: points.frontPocketBottom.y + y: points.frontPocketBottom.y, }) } if (options.backPocket) { macro('vd', { from: points.bWaistSide, to: points.backPocketLeft, - x: points.backPocketLeft.x + x: points.backPocketLeft.x, }) macro('vd', { from: points.bWaistSide, to: points.backPocketRight, - x: points.backPocketRight.x + x: points.backPocketRight.x, }) macro('hd', { from: points.bWaistSide, to: points.backPocketLeft, - y: points.backPocketLeft.y + y: points.backPocketLeft.y, }) macro('hd', { from: points.bWaistSide, to: points.backPocketRight, - y: points.backPocketRight.y + y: points.backPocketRight.y, }) } } diff --git a/packages/waralee/src/pocket.js b/packages/waralee/src/pocket.js index eb10decd0ba..3fd30604b22 100644 --- a/packages/waralee/src/pocket.js +++ b/packages/waralee/src/pocket.js @@ -11,7 +11,7 @@ export default function (part) { complete, sa, paperless, - macro + macro, } = part.shorthand() let pocketDepth = @@ -41,13 +41,13 @@ export default function (part) { from: points.topLeft, to: points.bottomLeft, margin: 5, - offset: 10 + offset: 10, }) points.title = points.topLeft.shift(270, 75).shift(0, 50) macro('title', { nr: 3, at: points.title, - title: 'pocket' + title: 'pocket', }) points.logo = points.title.shift(270, 75) @@ -78,27 +78,27 @@ export default function (part) { macro('hd', { from: points.topLeft, to: points.topRight, - y: points.topLeft.y + 15 + y: points.topLeft.y + 15, }) macro('hd', { from: points.bottomLeft, to: points.bottomRight, - y: points.bottomRight.y + y: points.bottomRight.y, }) macro('vd', { from: points.topLeft, to: points.bottomLeft, - x: points.topLeft.x + 15 + x: points.topLeft.x + 15, }) macro('vd', { from: points.topRight, to: points.bottomRight, - x: points.bottomRight.x + x: points.bottomRight.x, }) macro('vd', { from: points.bottomRight, to: points.bottomLeft, - x: points.bottomRight.x + x: points.bottomRight.x, }) }