diff --git a/packages/aaron/src/index.js b/packages/aaron/src/index.js index 62f543970f2..ff4f0994745 100644 --- a/packages/aaron/src/index.js +++ b/packages/aaron/src/index.js @@ -10,11 +10,11 @@ import draftFront from './front' const Pattern = new freesewing.Design(config, plugins) // Attach draft methods to prototype -Pattern.prototype.draftBase = function(part) { +Pattern.prototype.draftBase = function (part) { // Getting the base part from Brian return new Brian(this.settings).draftBase(part) } -Pattern.prototype.draftFront = part => draftFront(part) -Pattern.prototype.draftBack = part => draftBack(part) +Pattern.prototype.draftFront = (part) => draftFront(part) +Pattern.prototype.draftBack = (part) => draftBack(part) export default Pattern diff --git a/packages/bella/src/front-side-dart.js b/packages/bella/src/front-side-dart.js index 2c2f993f49c..f8d8f74bfd2 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 @@ -43,7 +43,10 @@ export default function (part) { ) // Bust point - points.bust = new Point(measurements.bustSpan * 0.5 * (1 + options.bustSpanEase), measurements.hpsToBust) + points.bust = new Point( + measurements.bustSpan * 0.5 * (1 + options.bustSpanEase), + measurements.hpsToBust + ) // Construct armhole points.armholeCp2 = points.armhole.shift(180, 40) @@ -112,15 +115,22 @@ export default function (part) { ) points.bustDartBottom = points.bustDartTop.rotate(angle * -1, points.bust) points.bustDartMiddle = points.bustDartTop.shiftFractionTowards(points.bustDartBottom, 0.5) - points.bustDartTip = points.bustDartMiddle.shiftFractionTowards(points.bust, options.bustDartLength) + points.bustDartTip = points.bustDartMiddle.shiftFractionTowards( + points.bust, + options.bustDartLength + ) points.bustDartEdge = utils.beamsIntersect( points.bust, points.bustDartMiddle, points.armhole, points.bustDartTop ) - points.bustDartCpTop = points.bust.shiftFractionTowards(points.bustDartTop, 0.666).rotate(5 * options.bustDartCurve, points.bust) - points.bustDartCpBottom = points.bust.shiftFractionTowards(points.bustDartBottom, 0.666).rotate(-5 * options.bustDartCurve, points.bust) + points.bustDartCpTop = points.bust + .shiftFractionTowards(points.bustDartTop, 0.666) + .rotate(5 * options.bustDartCurve, points.bust) + points.bustDartCpBottom = points.bust + .shiftFractionTowards(points.bustDartBottom, 0.666) + .rotate(-5 * options.bustDartCurve, points.bust) // Side seam length let aboveDart = points.armhole.dist(points.bustDartTop) @@ -142,10 +152,7 @@ export default function (part) { points.bust, options.waistDartLength ) - points.waistDartLeftCp = points.waistDartLeft.shift( - 90, - points.waistDartHem.dist(points.bust) / 2 - ) + points.waistDartLeftCp = points.waistDartLeft.shift(90, points.waistDartHem.dist(points.bust) / 2) points.waistDartRightCp = points.waistDartRight.shift( 90, points.waistDartHem.dist(points.bust) / 2 @@ -185,7 +192,7 @@ export default function (part) { .setRender(false) if (complete) { - points.titleAnchor = new Point(points.armholePitch.x/2, points.armholePitchCp2.y) + points.titleAnchor = new Point(points.armholePitch.x / 2, points.armholePitchCp2.y) macro('title', { at: points.titleAnchor, nr: 1, @@ -205,122 +212,113 @@ export default function (part) { }) macro('sprinkle', { snippet: 'notch', - on: [ - 'bust', - 'armholePitch', - 'cfBust', - ] + on: ['bust', 'armholePitch', 'cfBust'] }) if (sa) { - paths.sa = paths.saBase - .offset(sa) - .line(points.cfNeck) - .attr('class', 'fabric sa') - paths.sa = paths.sa - .move(points.cfHem) - .line(paths.sa.start()) + paths.sa = paths.saBase.offset(sa).line(points.cfNeck).attr('class', 'fabric sa') + paths.sa = paths.sa.move(points.cfHem).line(paths.sa.start()) } if (paperless) { 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/src/bow1.js b/packages/benjamin/src/bow1.js index 1a04d02873c..ba7630fbd34 100644 --- a/packages/benjamin/src/bow1.js +++ b/packages/benjamin/src/bow1.js @@ -1,4 +1,4 @@ -export default function(part) { +export default function (part) { let { Point, points, Path, paths, complete, macro, sa, store, paperless } = part.shorthand() points.bandBottomLeft = points.bandBottomLeft.shift(0, 0) @@ -30,10 +30,7 @@ export default function(part) { }) } if (sa) { - paths.sa = paths.seam - .offset(sa) - .attr('class', 'fabric sa') - .setRender(true) + paths.sa = paths.seam.offset(sa).attr('class', 'fabric sa').setRender(true) } macro('title', { at: points.titleAnchor, diff --git a/packages/benjamin/src/bow2.js b/packages/benjamin/src/bow2.js index 26bf9122bfd..156a2c7c3c3 100644 --- a/packages/benjamin/src/bow2.js +++ b/packages/benjamin/src/bow2.js @@ -1,4 +1,4 @@ -export default function(part) { +export default function (part) { let { options, Point, @@ -46,10 +46,7 @@ export default function(part) { }) } if (sa) { - paths.sa = paths.seam - .offset(sa) - .attr('class', 'fabric sa') - .setRender(true) + paths.sa = paths.seam.offset(sa).attr('class', 'fabric sa').setRender(true) } macro('title', { at: points.titleAnchor, diff --git a/packages/benjamin/src/bow3.js b/packages/benjamin/src/bow3.js index 475b5cfcd27..bc849528ae3 100644 --- a/packages/benjamin/src/bow3.js +++ b/packages/benjamin/src/bow3.js @@ -1,4 +1,4 @@ -export default function(part) { +export default function (part) { let { options, Point, @@ -46,10 +46,7 @@ export default function(part) { }) } if (sa) { - paths.sa = paths.seam - .offset(sa) - .attr('class', 'fabric sa') - .setRender(true) + paths.sa = paths.seam.offset(sa).attr('class', 'fabric sa').setRender(true) } macro('title', { at: points.titleAnchor, diff --git a/packages/bent/src/index.js b/packages/bent/src/index.js index 84c9f986cb5..49dce1a7453 100644 --- a/packages/bent/src/index.js +++ b/packages/bent/src/index.js @@ -11,13 +11,13 @@ import draftUnderSleeve from './undersleeve' const Pattern = new freesewing.Design(config, plugins) // Attach draft methods from Brian to prototype -Pattern.prototype.draftBase = function(part) { +Pattern.prototype.draftBase = function (part) { return new Brian(this.settings).draftBase(part) } -Pattern.prototype.draftFront = function(part) { +Pattern.prototype.draftFront = function (part) { return new Brian(this.settings).draftFront(part) } -Pattern.prototype.draftBack = function(part) { +Pattern.prototype.draftBack = function (part) { return new Brian(this.settings).draftBack(part) } diff --git a/packages/bent/src/shared.js b/packages/bent/src/shared.js index eaba9eb0a9d..adf718c6ddf 100644 --- a/packages/bent/src/shared.js +++ b/packages/bent/src/shared.js @@ -1,4 +1,4 @@ -export default function(part, s) { +export default function (part, s) { let { macro, points, sa } = part.shorthand() macro('ld', { diff --git a/packages/bent/src/topsleeve.js b/packages/bent/src/topsleeve.js index c0bdbce9bb4..32b105338a5 100644 --- a/packages/bent/src/topsleeve.js +++ b/packages/bent/src/topsleeve.js @@ -1,6 +1,6 @@ import dimensions from './shared' -export default function(part) { +export default function (part) { let { macro, Path, points, paths, complete, paperless, snippets, Snippet, sa } = part.shorthand() // Extract seamline from sleeve @@ -10,7 +10,7 @@ export default function(part) { // Complete? if (complete) { - macro('scalebox', { at: points.elbowCenter, }) + macro('scalebox', { at: points.elbowCenter }) snippets.logo = new Snippet('logo', points.elbowCenter.shift(90, 50)) macro('title', { at: points.armCenter, diff --git a/packages/breanna/src/back.js b/packages/breanna/src/back.js index 9d639240f49..7c7cadb7144 100644 --- a/packages/breanna/src/back.js +++ b/packages/breanna/src/back.js @@ -1,4 +1,4 @@ -export default part => { +export default (part) => { let { sa, points, @@ -91,10 +91,7 @@ export default part => { // Insert darts if (options.waistDart) { - let dart = new Path() - .line(points.waistDart1) - .line(points.waistDartTip) - .line(points.waistDart2) + let dart = new Path().line(points.waistDart1).line(points.waistDartTip).line(points.waistDart2) paths.seam = paths.seam.insop('waistDart', dart) let saDart = new Path() .line(points.waistDart1) @@ -165,10 +162,7 @@ export default part => { store.set('backSideSeamLength', points.armhole.dist(points.waist)) store.set( 'backCollarLength', - new Path() - .move(points.cbNeck) - ._curve(points.hpsCp2, points.hps) - .length() * 2 + new Path().move(points.cbNeck)._curve(points.hpsCp2, points.hps).length() * 2 ) // Anchor point diff --git a/packages/breanna/src/dart-utils.js b/packages/breanna/src/dart-utils.js index 6e88d0b4941..e50532dba85 100644 --- a/packages/breanna/src/dart-utils.js +++ b/packages/breanna/src/dart-utils.js @@ -46,7 +46,7 @@ export const getDartInsertionPoint = (points, utils, loc, angle) => { } // What points need to be rotated after cutting the primary bust dart -export const getPrimaryDartRotationList = loc => { +export const getPrimaryDartRotationList = (loc) => { let rotate = ['cfWaist'] if (loc >= 1100) rotate.push('cfNeck') if (loc >= 1130) rotate.push('hpsCp2') @@ -74,7 +74,7 @@ export const getSecondaryDartRotationList = (loc1, loc2) => { return rotate } -export const getDartLocationsAsNumbers = options => { +export const getDartLocationsAsNumbers = (options) => { let loc1 = options.primaryBustDart let loc2 = options.secondaryBustDart loc1 = Number(loc1.slice(0, 2) + loc1.slice(-2)) diff --git a/packages/breanna/src/front-primary-1100.js b/packages/breanna/src/front-primary-1100.js index 387f2fd1c49..67e3c579acb 100644 --- a/packages/breanna/src/front-primary-1100.js +++ b/packages/breanna/src/front-primary-1100.js @@ -1,4 +1,4 @@ -export default part => { +export default (part) => { let { points, Path, store } = part.shorthand() switch (store.get('secondaryBustDartLocation')) { diff --git a/packages/breanna/src/front-primary-1130.js b/packages/breanna/src/front-primary-1130.js index e745d5c5ccd..76c878beb41 100644 --- a/packages/breanna/src/front-primary-1130.js +++ b/packages/breanna/src/front-primary-1130.js @@ -1,4 +1,4 @@ -export default part => { +export default (part) => { let { points, Path, store } = part.shorthand() switch (store.get('secondaryBustDartLocation')) { diff --git a/packages/breanna/src/front-primary-1200.js b/packages/breanna/src/front-primary-1200.js index 84566959e03..05346956a90 100644 --- a/packages/breanna/src/front-primary-1200.js +++ b/packages/breanna/src/front-primary-1200.js @@ -1,4 +1,4 @@ -export default part => { +export default (part) => { let { points, Path, store } = part.shorthand() switch (store.get('secondaryBustDartLocation')) { diff --git a/packages/breanna/src/front-primary-1300.js b/packages/breanna/src/front-primary-1300.js index b218ff6a299..413d3d0075c 100644 --- a/packages/breanna/src/front-primary-1300.js +++ b/packages/breanna/src/front-primary-1300.js @@ -1,4 +1,4 @@ -export default part => { +export default (part) => { let { points, Path, store } = part.shorthand() switch (store.get('secondaryBustDartLocation')) { diff --git a/packages/breanna/src/front-primary-1330.js b/packages/breanna/src/front-primary-1330.js index 434d20bbd0c..a21aeecb733 100644 --- a/packages/breanna/src/front-primary-1330.js +++ b/packages/breanna/src/front-primary-1330.js @@ -1,4 +1,4 @@ -export default part => { +export default (part) => { let { points, Path, store } = part.shorthand() switch (store.get('secondaryBustDartLocation')) { diff --git a/packages/breanna/src/front-primary-1400.js b/packages/breanna/src/front-primary-1400.js index b89257a18ae..c03465d1298 100644 --- a/packages/breanna/src/front-primary-1400.js +++ b/packages/breanna/src/front-primary-1400.js @@ -1,4 +1,4 @@ -export default part => { +export default (part) => { let { points, Path, store } = part.shorthand() switch (store.get('secondaryBustDartLocation')) { diff --git a/packages/breanna/src/front-primary-600.js b/packages/breanna/src/front-primary-600.js index 8bc6a64eac9..d7522dc0b32 100644 --- a/packages/breanna/src/front-primary-600.js +++ b/packages/breanna/src/front-primary-600.js @@ -1,4 +1,4 @@ -export default part => { +export default (part) => { let { points, Path, store } = part.shorthand() switch (store.get('secondaryBustDartLocation')) { diff --git a/packages/breanna/src/front-primary-700.js b/packages/breanna/src/front-primary-700.js index edbfbd1f160..3972b100b9a 100644 --- a/packages/breanna/src/front-primary-700.js +++ b/packages/breanna/src/front-primary-700.js @@ -1,4 +1,4 @@ -export default part => { +export default (part) => { let { points, Path, store } = part.shorthand() switch (store.get('secondaryBustDartLocation')) { diff --git a/packages/breanna/src/front-primary-800.js b/packages/breanna/src/front-primary-800.js index 1f7adf63c1c..b96d792c72c 100644 --- a/packages/breanna/src/front-primary-800.js +++ b/packages/breanna/src/front-primary-800.js @@ -1,4 +1,4 @@ -export default part => { +export default (part) => { let { points, Path, store } = part.shorthand() switch (store.get('secondaryBustDartLocation')) { diff --git a/packages/breanna/src/front-primary-only.js b/packages/breanna/src/front-primary-only.js index 2f20fb079a5..dd498a160d0 100644 --- a/packages/breanna/src/front-primary-only.js +++ b/packages/breanna/src/front-primary-only.js @@ -1,4 +1,4 @@ -export default part => { +export default (part) => { let { points, Path, store } = part.shorthand() switch (store.get('primaryBustDartLocation')) { diff --git a/packages/breanna/src/front.js b/packages/breanna/src/front.js index 12124f9103e..9a474fb70cc 100644 --- a/packages/breanna/src/front.js +++ b/packages/breanna/src/front.js @@ -18,7 +18,7 @@ import { getSaDartPaths } from './dart-utils' -export default part => { +export default (part) => { let { options, store, diff --git a/packages/brian/src/back.js b/packages/brian/src/back.js index 9dff2a98c80..e14d3c7d931 100644 --- a/packages/brian/src/back.js +++ b/packages/brian/src/back.js @@ -39,10 +39,7 @@ export default (part) => { macro('title', { at: points.title, nr: 2, title: 'back' }) snippets.armholePitchNotch = new Snippet('bnotch', points.armholePitch) - paths.waist = new Path() - .move(points.cbWaist) - .line(points.waist) - .attr('class', 'help') + paths.waist = new Path().move(points.cbWaist).line(points.waist).attr('class', 'help') if (sa) { paths.sa = paths.saBase .offset(sa) diff --git a/packages/brian/src/front.js b/packages/brian/src/front.js index 5e955f67e84..18947b0ffe1 100644 --- a/packages/brian/src/front.js +++ b/packages/brian/src/front.js @@ -53,10 +53,7 @@ export default (part) => { }) macro('title', { at: points.title, nr: 1, title: 'front' }) snippets.armholePitchNotch = new Snippet('notch', points.armholePitch) - paths.waist = new Path() - .move(points.cfWaist) - .line(points.waist) - .attr('class', 'help') + paths.waist = new Path().move(points.cfWaist).line(points.waist).attr('class', 'help') if (sa) { paths.sa = paths.saBase .offset(sa) diff --git a/packages/bruce/src/back.js b/packages/bruce/src/back.js index 18c73b7c15a..e222b89b60c 100644 --- a/packages/bruce/src/back.js +++ b/packages/bruce/src/back.js @@ -1,6 +1,6 @@ import init from './init' -export default function(part) { +export default function (part) { let { store, sa, diff --git a/packages/bruce/src/index.js b/packages/bruce/src/index.js index 37ef3615431..71c2af04ba0 100644 --- a/packages/bruce/src/index.js +++ b/packages/bruce/src/index.js @@ -11,9 +11,9 @@ import draftInset from './inset' const Pattern = new freesewing.Design(config, plugins) // Attach draft methods to prototype -Pattern.prototype.draftBack = part => draftBack(part) -Pattern.prototype.draftSide = part => draftSide(part) -Pattern.prototype.draftInset = part => draftInset(part) -Pattern.prototype.draftFront = part => draftFront(part) +Pattern.prototype.draftBack = (part) => draftBack(part) +Pattern.prototype.draftSide = (part) => draftSide(part) +Pattern.prototype.draftInset = (part) => draftInset(part) +Pattern.prototype.draftFront = (part) => draftFront(part) export default Pattern diff --git a/packages/bruce/src/side.js b/packages/bruce/src/side.js index 48307a3c613..d6bd0b6776c 100644 --- a/packages/bruce/src/side.js +++ b/packages/bruce/src/side.js @@ -1,6 +1,6 @@ import init from './init' -export default function(part) { +export default function (part) { let { store, sa, @@ -52,10 +52,7 @@ export default function(part) { paths.hemBase = new Path().move(points.bottomRight).line(points.bottomLeft) paths.saBase.render = false paths.hemBase.render = false - paths.seam = paths.saBase - .join(paths.hemBase) - .close() - .attr('class', 'fabric') + paths.seam = paths.saBase.join(paths.hemBase).close().attr('class', 'fabric') // Anchor point for sampling points.anchor = points.topLeft diff --git a/packages/carlita/src/front.js b/packages/carlita/src/front.js index ee992928531..821c872e928 100644 --- a/packages/carlita/src/front.js +++ b/packages/carlita/src/front.js @@ -1,4 +1,4 @@ -export default function(part) { +export default function (part) { let { paperless, sa, @@ -253,21 +253,14 @@ export default function(part) { ._curve(points.lapelStraightEndCp1, points.lapelStraightEnd) .line(points.hemEdge) .line(points.flbHem) - paths.seam = paths.saBase - .clone() - .line(points.psHem) - .close() - .attr('class', 'fabric') + paths.seam = paths.saBase.clone().line(points.psHem).close().attr('class', 'fabric') paths.rollLine = new Path() .move(points.rollLineStart) .line(points.rollLineEnd) .attr('class', 'lashed') - paths.flb = new Path() - .move(points.flbHem) - .line(points.flbTop) - .attr('class', 'lining lashed') + paths.flb = new Path().move(points.flbHem).line(points.flbTop).attr('class', 'lining lashed') paths.pocket = new Path() .move( diff --git a/packages/carlita/src/index.js b/packages/carlita/src/index.js index efbefe2e71b..6adde977e78 100644 --- a/packages/carlita/src/index.js +++ b/packages/carlita/src/index.js @@ -16,7 +16,7 @@ let fromBent = ['Base', 'Front', 'Back', 'Sleeve', 'TopSleeve', 'UnderSleeve'] // Attach draft methods from Bent to prototype for (let m of fromBent) { - Pattern.prototype['draftBent' + m] = function(part) { + Pattern.prototype['draftBent' + m] = function (part) { return new Bent(this.settings)['draft' + m](part) } } @@ -40,12 +40,12 @@ for (let m of [ 'draftInnerPocketBag', 'draftInnerPocketTab' ]) { - Pattern.prototype[m] = function(part) { + Pattern.prototype[m] = function (part) { return new Carlton(this.settings)[m](part) } } -Pattern.prototype.draftCarltonFront = function(part) { +Pattern.prototype.draftCarltonFront = function (part) { return new Carlton(this.settings).draftFront(part) } diff --git a/packages/carlton/src/chestpocketbag.js b/packages/carlton/src/chestpocketbag.js index 3fb455c93b8..b38fa2c7af1 100644 --- a/packages/carlton/src/chestpocketbag.js +++ b/packages/carlton/src/chestpocketbag.js @@ -1,4 +1,4 @@ -export default function(part) { +export default function (part) { let { units, paperless, diff --git a/packages/carlton/src/chestpocketwelt.js b/packages/carlton/src/chestpocketwelt.js index 116c990b403..f377373c848 100644 --- a/packages/carlton/src/chestpocketwelt.js +++ b/packages/carlton/src/chestpocketwelt.js @@ -1,4 +1,4 @@ -export default function(part) { +export default function (part) { let { paperless, sa, store, complete, points, macro, Point, paths, Path } = part.shorthand() points.topLeft = new Point(0, 0) @@ -17,10 +17,7 @@ export default function(part) { .close() .attr('class', 'fabric') - paths.fold = new Path() - .move(points.topMid) - .line(points.bottomMid) - .attr('class', 'dashed') + paths.fold = new Path().move(points.topMid).line(points.bottomMid).attr('class', 'dashed') if (complete) { points.title = new Point(points.bottomRight.x / 4, points.bottomRight.y / 2) diff --git a/packages/carlton/src/collar.js b/packages/carlton/src/collar.js index a5e80b203a0..dfac9801f25 100644 --- a/packages/carlton/src/collar.js +++ b/packages/carlton/src/collar.js @@ -4,7 +4,7 @@ * but gets complicated when doing it in code. */ -export default function(part) { +export default function (part) { let { paperless, sa, complete, points, options, macro, paths, Path } = part.shorthand() // We're going to slash and spread this collar. Slashing first: @@ -165,11 +165,7 @@ export default function(part) { .line(points.rot4bottomRight) .line(points.rot4topRight) ._curve(points.topLeftCp, points.topLeft) - paths.seam = paths.saBase - .clone() - .line(points.standTop) - .close() - .attr('class', 'fabric') + paths.seam = paths.saBase.clone().line(points.standTop).close().attr('class', 'fabric') if (complete) { points.title = points.standTopCp.clone() diff --git a/packages/carlton/src/cufffacing.js b/packages/carlton/src/cufffacing.js index db32494df7f..3a8762690c7 100644 --- a/packages/carlton/src/cufffacing.js +++ b/packages/carlton/src/cufffacing.js @@ -1,4 +1,4 @@ -export default function(part) { +export default function (part) { let { paperless, sa, store, complete, points, macro, Point, paths, Path } = part.shorthand() points.topLeft = new Point(0, 0) diff --git a/packages/carlton/src/index.js b/packages/carlton/src/index.js index 232aebb98b0..9fc056ea835 100644 --- a/packages/carlton/src/index.js +++ b/packages/carlton/src/index.js @@ -26,22 +26,22 @@ import draftInnerPocketTab from './innerpockettab' const Pattern = new freesewing.Design(config, [plugins, buttons]) // Attach draft methods from Bent to prototype -Pattern.prototype.draftBentBase = function(part) { +Pattern.prototype.draftBentBase = function (part) { return new Bent(this.settings).draftBase(part) } -Pattern.prototype.draftBentFront = function(part) { +Pattern.prototype.draftBentFront = function (part) { return new Bent(this.settings).draftFront(part) } -Pattern.prototype.draftBentBack = function(part) { +Pattern.prototype.draftBentBack = function (part) { return new Bent(this.settings).draftBack(part) } -Pattern.prototype.draftBentSleeve = function(part) { +Pattern.prototype.draftBentSleeve = function (part) { return new Bent(this.settings).draftSleeve(part) } -Pattern.prototype.draftBentTopSleeve = function(part) { +Pattern.prototype.draftBentTopSleeve = function (part) { return new Bent(this.settings).draftTopSleeve(part) } -Pattern.prototype.draftBentUnderSleeve = function(part) { +Pattern.prototype.draftBentUnderSleeve = function (part) { return new Bent(this.settings).draftUnderSleeve(part) } diff --git a/packages/carlton/src/innerpocketbag.js b/packages/carlton/src/innerpocketbag.js index 04f1a8fdf92..8c4d1c53831 100644 --- a/packages/carlton/src/innerpocketbag.js +++ b/packages/carlton/src/innerpocketbag.js @@ -1,4 +1,4 @@ -export default function(part) { +export default function (part) { let { units, paperless, diff --git a/packages/carlton/src/innerpockettab.js b/packages/carlton/src/innerpockettab.js index 49fe98ae0c4..4a34e48066f 100644 --- a/packages/carlton/src/innerpockettab.js +++ b/packages/carlton/src/innerpockettab.js @@ -1,4 +1,4 @@ -export default function(part) { +export default function (part) { let { paperless, sa, store, complete, points, macro, Point, paths, Path } = part.shorthand() points.topLeft = new Point(0, 0) @@ -17,10 +17,7 @@ export default function(part) { .close() .attr('class', 'lining') - paths.hint = new Path() - .move(points.top) - .line(points.bottom) - .attr('class', 'lining dashed') + paths.hint = new Path().move(points.top).line(points.bottom).attr('class', 'lining dashed') if (complete) { points.title = points.top.shiftFractionTowards(points.bottom, 0.5) diff --git a/packages/carlton/src/innerpocketwelt.js b/packages/carlton/src/innerpocketwelt.js index 38077e96d9c..c1d713ab6c7 100644 --- a/packages/carlton/src/innerpocketwelt.js +++ b/packages/carlton/src/innerpocketwelt.js @@ -1,4 +1,4 @@ -export default function(part) { +export default function (part) { let { paperless, sa, store, complete, points, macro, Point, paths, Path } = part.shorthand() points.topLeft = new Point(0, 0) @@ -27,10 +27,7 @@ export default function(part) { .close() .attr('class', 'fabric') - paths.fold = new Path() - .move(points.leftMid) - .line(points.rightMid) - .attr('class', 'dashed') + paths.fold = new Path().move(points.leftMid).line(points.rightMid).attr('class', 'dashed') paths.welt = new Path() .move(points.realTopLeft) diff --git a/packages/carlton/src/pocket.js b/packages/carlton/src/pocket.js index b27c581cc68..3da12f5b43a 100644 --- a/packages/carlton/src/pocket.js +++ b/packages/carlton/src/pocket.js @@ -1,4 +1,4 @@ -export default function(part) { +export default function (part) { let { paperless, sa, @@ -41,10 +41,7 @@ export default function(part) { .line(points.roundRightStart) .curve(points.roundRightCp1, points.roundRightCp2, points.roundRightEnd) } else { - paths.seam = new Path() - .move(points.edgeLeft) - .line(points.bottomLeft) - .line(points.bottomRight) + paths.seam = new Path().move(points.edgeLeft).line(points.bottomLeft).line(points.bottomRight) } paths.seam = paths.seam @@ -53,10 +50,7 @@ export default function(part) { .close() .attr('class', 'fabric') - paths.fold = new Path() - .move(points.topLeft) - .line(points.topRight) - .attr('class', 'fabric dashed') + paths.fold = new Path().move(points.topLeft).line(points.topRight).attr('class', 'fabric dashed') if (complete) { points.title = points.topLeft.shiftFractionTowards(points.bottomRight, 0.5) diff --git a/packages/carlton/src/pocketflap.js b/packages/carlton/src/pocketflap.js index 14ff2ce1ba5..8962fc4c787 100644 --- a/packages/carlton/src/pocketflap.js +++ b/packages/carlton/src/pocketflap.js @@ -1,4 +1,4 @@ -export default function(part) { +export default function (part) { let { paperless, sa, @@ -39,17 +39,10 @@ export default function(part) { .line(points.roundRightStart) .curve(points.roundRightCp1, points.roundRightCp2, points.roundRightEnd) } else { - paths.seam = new Path() - .move(points.topLeft) - .line(points.bottomLeft) - .line(points.bottomRight) + paths.seam = new Path().move(points.topLeft).line(points.bottomLeft).line(points.bottomRight) } - paths.seam = paths.seam - .line(points.topRight) - .line(points.topLeft) - .close() - .attr('class', 'fabric') + paths.seam = paths.seam.line(points.topRight).line(points.topLeft).close().attr('class', 'fabric') if (complete) { points.title = points.topLeft.shiftFractionTowards(points.bottomRight, 0.5) diff --git a/packages/carlton/src/pocketlining.js b/packages/carlton/src/pocketlining.js index 20e912b43cd..8dede4f0996 100644 --- a/packages/carlton/src/pocketlining.js +++ b/packages/carlton/src/pocketlining.js @@ -1,4 +1,4 @@ -export default function(part) { +export default function (part) { let { paperless, sa, @@ -37,17 +37,10 @@ export default function(part) { .line(points.roundRightStart) .curve(points.roundRightCp1, points.roundRightCp2, points.roundRightEnd) } else { - paths.seam = new Path() - .move(points.topLeft) - .line(points.bottomLeft) - .line(points.bottomRight) + paths.seam = new Path().move(points.topLeft).line(points.bottomLeft).line(points.bottomRight) } - paths.seam = paths.seam - .line(points.topRight) - .line(points.topLeft) - .close() - .attr('class', 'lining') + paths.seam = paths.seam.line(points.topRight).line(points.topLeft).close().attr('class', 'lining') delete paths.fold diff --git a/packages/carlton/src/tail.js b/packages/carlton/src/tail.js index 52f73ab2de1..c053cd61abd 100644 --- a/packages/carlton/src/tail.js +++ b/packages/carlton/src/tail.js @@ -1,4 +1,4 @@ -export default function(part) { +export default function (part) { let { units, paperless, @@ -79,11 +79,7 @@ export default function(part) { to: points.fold2Top.shift(0, 10) }) - if (sa) - paths.sa = paths.seam - .offset(sa) - .close() - .attr('class', 'fabric sa') + 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), diff --git a/packages/core/src/attributes.js b/packages/core/src/attributes.js index 05d39a3f385..dd711eeaefe 100644 --- a/packages/core/src/attributes.js +++ b/packages/core/src/attributes.js @@ -3,7 +3,7 @@ function Attributes() { } /** Adds an attribute */ -Attributes.prototype.add = function(name, value) { +Attributes.prototype.add = function (name, value) { if (typeof this.list[name] === 'undefined') { this.list[name] = [] } @@ -13,33 +13,33 @@ Attributes.prototype.add = function(name, value) { } /** Sets an attribute, overwriting existing value */ -Attributes.prototype.set = function(name, value) { +Attributes.prototype.set = function (name, value) { this.list[name] = [value] return this } /** Removes an attribute */ -Attributes.prototype.remove = function(name) { +Attributes.prototype.remove = function (name) { delete this.list[name] return this } /** Retrieves an attribute */ -Attributes.prototype.get = function(name) { +Attributes.prototype.get = function (name) { if (typeof this.list[name] === 'undefined') return false else return this.list[name].join(' ') } /** Retrieves an attribute as array*/ -Attributes.prototype.getAsArray = function(name) { +Attributes.prototype.getAsArray = function (name) { if (typeof this.list[name] === 'undefined') return false else return this.list[name] } /** Returns SVG code for attributes */ -Attributes.prototype.render = function() { +Attributes.prototype.render = function () { let svg = '' for (let key in this.list) { svg += ` ${key}="${this.list[key].join(' ')}"` @@ -49,7 +49,7 @@ Attributes.prototype.render = function() { } /** Returns CSS code for attributes */ -Attributes.prototype.renderAsCss = function() { +Attributes.prototype.renderAsCss = function () { let css = '' for (let key in this.list) { css += ` ${key}:${this.list[key].join(' ')};` @@ -60,7 +60,7 @@ Attributes.prototype.renderAsCss = function() { /** Returns SVG code for attributes with a fiven prefix * typically used for data-text*/ -Attributes.prototype.renderIfPrefixIs = function(prefix = '') { +Attributes.prototype.renderIfPrefixIs = function (prefix = '') { let svg = '' let prefixLen = prefix.length for (let key in this.list) { @@ -74,7 +74,7 @@ Attributes.prototype.renderIfPrefixIs = function(prefix = '') { /** Returns a props object for attributes with a fiven prefix * typically used for data-text*/ -Attributes.prototype.asPropsIfPrefixIs = function(prefix = '') { +Attributes.prototype.asPropsIfPrefixIs = function (prefix = '') { let props = {} let prefixLen = prefix.length for (let key in this.list) { @@ -89,7 +89,7 @@ Attributes.prototype.asPropsIfPrefixIs = function(prefix = '') { } /** Returns a deep copy of this */ -Attributes.prototype.clone = function() { +Attributes.prototype.clone = function () { let clone = new Attributes() clone.list = JSON.parse(JSON.stringify(this.list)) diff --git a/packages/create-freesewing-pattern/template/default/example/src/serviceWorker.js b/packages/create-freesewing-pattern/template/default/example/src/serviceWorker.js index 44e1b1b2f8c..4fe923e7795 100644 --- a/packages/create-freesewing-pattern/template/default/example/src/serviceWorker.js +++ b/packages/create-freesewing-pattern/template/default/example/src/serviceWorker.js @@ -53,7 +53,7 @@ export function register(config) { function registerValidSW(swUrl, config) { navigator.serviceWorker .register(swUrl) - .then(registration => { + .then((registration) => { registration.onupdatefound = () => { const installingWorker = registration.installing installingWorker.onstatechange = () => { @@ -84,7 +84,7 @@ function registerValidSW(swUrl, config) { } } }) - .catch(error => { + .catch((error) => { console.error('Error during service worker registration:', error) }) } @@ -92,14 +92,14 @@ function registerValidSW(swUrl, config) { function checkValidServiceWorker(swUrl, config) { // Check if the service worker can be found. If it can't reload the page. fetch(swUrl) - .then(response => { + .then((response) => { // Ensure service worker exists, and that we really are getting a JS file. if ( response.status === 404 || response.headers.get('content-type').indexOf('javascript') === -1 ) { // No service worker found. Probably a different app. Reload the page. - navigator.serviceWorker.ready.then(registration => { + navigator.serviceWorker.ready.then((registration) => { registration.unregister().then(() => { window.location.reload() }) @@ -116,7 +116,7 @@ function checkValidServiceWorker(swUrl, config) { export function unregister() { if ('serviceWorker' in navigator) { - navigator.serviceWorker.ready.then(registration => { + navigator.serviceWorker.ready.then((registration) => { registration.unregister() }) } diff --git a/packages/create-freesewing-pattern/template/default/src/box.js b/packages/create-freesewing-pattern/template/default/src/box.js index b22cbb1053f..ce26efd6995 100644 --- a/packages/create-freesewing-pattern/template/default/src/box.js +++ b/packages/create-freesewing-pattern/template/default/src/box.js @@ -1,4 +1,4 @@ -export default function(part) { +export default function (part) { let { options, Point, diff --git a/packages/diana/src/index.js b/packages/diana/src/index.js index 8e6f9c922a7..6097efd8e40 100644 --- a/packages/diana/src/index.js +++ b/packages/diana/src/index.js @@ -10,16 +10,16 @@ import draftSleeve from './sleeve' const Pattern = new freesewing.Design(config, plugins) // Attach draft methods to prototype -Pattern.prototype.draftBase = function(part) { +Pattern.prototype.draftBase = function (part) { return new Brian(this.settings).draftBase(part) } -Pattern.prototype.draftFrontBase = function(part) { +Pattern.prototype.draftFrontBase = function (part) { return new Brian(this.settings).draftFront(part) } -Pattern.prototype.draftBackBase = function(part) { +Pattern.prototype.draftBackBase = function (part) { return new Brian(this.settings).draftBack(part) } -Pattern.prototype.draftSleeveBase = function(part) { +Pattern.prototype.draftSleeveBase = function (part) { let brian = new Brian(this.settings) return brian.draftSleeve(brian.draftSleevecap(part)) } diff --git a/packages/examples/src/docs_coords.js b/packages/examples/src/docs_coords.js index 73faa106795..a573613ef5b 100644 --- a/packages/examples/src/docs_coords.js +++ b/packages/examples/src/docs_coords.js @@ -1,6 +1,6 @@ import { box } from './shared' -export default part => { +export default (part) => { let { Point, points, paths, Path } = part.shorthand() points.origin = new Point(10, 10) diff --git a/packages/examples/src/docs_overview.js b/packages/examples/src/docs_overview.js index 2d7cf254fde..23f8e6e7f92 100644 --- a/packages/examples/src/docs_overview.js +++ b/packages/examples/src/docs_overview.js @@ -1,4 +1,4 @@ -export default part => { +export default (part) => { let { Point, points, Path, paths, options } = part.shorthand() /** diff --git a/packages/examples/src/path__curve.js b/packages/examples/src/path__curve.js index 35326aa49ed..770c610c9c5 100644 --- a/packages/examples/src/path__curve.js +++ b/packages/examples/src/path__curve.js @@ -1,6 +1,6 @@ import { box } from './shared' -export default part => { +export default (part) => { let { Point, points, Path, paths } = part.shorthand() points.from = new Point(5, 20) diff --git a/packages/examples/src/path_attr.js b/packages/examples/src/path_attr.js index 28f97e79c4f..98625bb9fdf 100644 --- a/packages/examples/src/path_attr.js +++ b/packages/examples/src/path_attr.js @@ -1,4 +1,4 @@ -export default part => { +export default (part) => { let { Point, points, Path, paths } = part.shorthand() points.B = new Point(10, 50) diff --git a/packages/examples/src/path_clone.js b/packages/examples/src/path_clone.js index dcf3d72af1c..90ea833ba04 100644 --- a/packages/examples/src/path_clone.js +++ b/packages/examples/src/path_clone.js @@ -1,4 +1,4 @@ -export default part => { +export default (part) => { let { Point, points, Path, paths } = part.shorthand() points.A = new Point(45, 60) @@ -7,10 +7,7 @@ export default part => { points.C = new Point(90, 30) points.CCp1 = new Point(50, -30) - paths.example = new Path() - .move(points.A) - .line(points.B) - .curve(points.BCp2, points.CCp1, points.C) + paths.example = new Path().move(points.A).line(points.B).curve(points.BCp2, points.CCp1, points.C) paths.clone = paths.example .clone() diff --git a/packages/examples/src/path_close.js b/packages/examples/src/path_close.js index d4297ff21d8..8abab31ed89 100644 --- a/packages/examples/src/path_close.js +++ b/packages/examples/src/path_close.js @@ -1,6 +1,6 @@ import { box } from './shared' -export default part => { +export default (part) => { let { Point, points, Path, paths } = part.shorthand() points.from = new Point(10, 20) diff --git a/packages/examples/src/path_curve.js b/packages/examples/src/path_curve.js index 5cc1663e0b3..cedffb582d4 100644 --- a/packages/examples/src/path_curve.js +++ b/packages/examples/src/path_curve.js @@ -1,6 +1,6 @@ import { box } from './shared' -export default part => { +export default (part) => { let { Point, points, Path, paths } = part.shorthand() points.from = new Point(10, 20) diff --git a/packages/examples/src/path_curve_.js b/packages/examples/src/path_curve_.js index 0b20cc2eb0c..f5f54d77ce2 100644 --- a/packages/examples/src/path_curve_.js +++ b/packages/examples/src/path_curve_.js @@ -1,6 +1,6 @@ import { box } from './shared' -export default part => { +export default (part) => { let { Point, points, Path, paths } = part.shorthand() points.from = new Point(10, 20) diff --git a/packages/examples/src/path_divide.js b/packages/examples/src/path_divide.js index cbdbed41fd7..0fd6ea116ab 100644 --- a/packages/examples/src/path_divide.js +++ b/packages/examples/src/path_divide.js @@ -1,4 +1,4 @@ -export default part => { +export default (part) => { let { Point, points, Path, paths } = part.shorthand() points.A = new Point(55, 40) diff --git a/packages/examples/src/path_edge.js b/packages/examples/src/path_edge.js index 660c60d290e..a56e689e89c 100644 --- a/packages/examples/src/path_edge.js +++ b/packages/examples/src/path_edge.js @@ -1,4 +1,4 @@ -export default part => { +export default (part) => { let { Point, points, Path, paths, Snippet, snippets } = part.shorthand() points.A = new Point(45, 60) diff --git a/packages/examples/src/path_end.js b/packages/examples/src/path_end.js index bbf861689b5..8885feb0958 100644 --- a/packages/examples/src/path_end.js +++ b/packages/examples/src/path_end.js @@ -1,4 +1,4 @@ -export default part => { +export default (part) => { let { Point, points, Path, paths, Snippet, snippets } = part.shorthand() points.A = new Point(45, 60) @@ -7,10 +7,7 @@ export default part => { points.C = new Point(90, 30) points.CCp1 = new Point(50, -30) - paths.demo = new Path() - .move(points.A) - .line(points.B) - .curve(points.BCp2, points.CCp1, points.C) + paths.demo = new Path().move(points.A).line(points.B).curve(points.BCp2, points.CCp1, points.C) snippets.end = new Snippet('notch', paths.demo.end()) diff --git a/packages/examples/src/path_intersects.js b/packages/examples/src/path_intersects.js index 2b7fbe07bba..9522f3aa44d 100644 --- a/packages/examples/src/path_intersects.js +++ b/packages/examples/src/path_intersects.js @@ -1,4 +1,4 @@ -export default part => { +export default (part) => { let { Point, points, Path, paths, Snippet, snippets } = part.shorthand() points.A = new Point(45, 60) diff --git a/packages/examples/src/path_intersectsx.js b/packages/examples/src/path_intersectsx.js index a1ab8671a03..7ea6990ebb2 100644 --- a/packages/examples/src/path_intersectsx.js +++ b/packages/examples/src/path_intersectsx.js @@ -1,4 +1,4 @@ -export default part => { +export default (part) => { let { Point, points, Path, paths, Snippet, snippets } = part.shorthand() points.A = new Point(95, 50) @@ -12,10 +12,7 @@ export default part => { points.top = new Point(60, -10) points.bot = new Point(60, 140) - paths.line = new Path() - .move(points.top) - .line(points.bot) - .attr('class', 'lining dashed') + paths.line = new Path().move(points.top).line(points.bot).attr('class', 'lining dashed') paths.demo = new Path() .move(points.A) diff --git a/packages/examples/src/path_intersectsy.js b/packages/examples/src/path_intersectsy.js index 213b51df42a..7e0c1215d7b 100644 --- a/packages/examples/src/path_intersectsy.js +++ b/packages/examples/src/path_intersectsy.js @@ -1,4 +1,4 @@ -export default part => { +export default (part) => { let { Point, points, Path, paths, Snippet, snippets } = part.shorthand() points.A = new Point(55, 40) @@ -12,10 +12,7 @@ export default part => { points.top = new Point(10, 58) points.bot = new Point(130, 58) - paths.line = new Path() - .move(points.top) - .line(points.bot) - .attr('class', 'lining dashed') + paths.line = new Path().move(points.top).line(points.bot).attr('class', 'lining dashed') paths.demo = new Path() .move(points.A) diff --git a/packages/examples/src/path_join.js b/packages/examples/src/path_join.js index 54f760139e2..54e445b708a 100644 --- a/packages/examples/src/path_join.js +++ b/packages/examples/src/path_join.js @@ -1,4 +1,4 @@ -export default part => { +export default (part) => { let { Point, points, Path, paths } = part.shorthand() points.A = new Point(45, 60) @@ -7,10 +7,7 @@ export default part => { points.C = new Point(90, 30) points.CCp1 = new Point(50, -30) - paths.path1 = new Path() - .move(points.A) - .line(points.B) - .attr('class', 'various') + paths.path1 = new Path().move(points.A).line(points.B).attr('class', 'various') paths.path2 = new Path() .move(points.B) diff --git a/packages/examples/src/path_length.js b/packages/examples/src/path_length.js index eba3eabd059..76fa4acfa5c 100644 --- a/packages/examples/src/path_length.js +++ b/packages/examples/src/path_length.js @@ -1,4 +1,4 @@ -export default part => { +export default (part) => { let { Point, points, Path, paths, macro } = part.shorthand() points.A = new Point(45, 60) @@ -7,10 +7,7 @@ export default part => { points.C = new Point(90, 30) points.CCp1 = new Point(50, -30) - paths.example = new Path() - .move(points.A) - .line(points.B) - .curve(points.BCp2, points.CCp1, points.C) + paths.example = new Path().move(points.A).line(points.B).curve(points.BCp2, points.CCp1, points.C) macro('pd', { path: paths.example, diff --git a/packages/examples/src/path_line.js b/packages/examples/src/path_line.js index 5072c8b5aab..ed2c7750bd3 100644 --- a/packages/examples/src/path_line.js +++ b/packages/examples/src/path_line.js @@ -1,6 +1,6 @@ import { box } from './shared' -export default part => { +export default (part) => { let { Point, points, Path, paths } = part.shorthand() points.from = new Point(10, 10) diff --git a/packages/examples/src/path_move.js b/packages/examples/src/path_move.js index bf2b315a801..28d8c6dc667 100644 --- a/packages/examples/src/path_move.js +++ b/packages/examples/src/path_move.js @@ -1,6 +1,6 @@ import { box } from './shared' -export default part => { +export default (part) => { let { Point, points, Path, paths } = part.shorthand() points.to = new Point(50, 10) diff --git a/packages/examples/src/path_offset.js b/packages/examples/src/path_offset.js index cc67a07bd76..e50ac0ce6ba 100644 --- a/packages/examples/src/path_offset.js +++ b/packages/examples/src/path_offset.js @@ -1,4 +1,4 @@ -export default part => { +export default (part) => { let { Point, points, Path, paths } = part.shorthand() points.A = new Point(45, 60) @@ -16,11 +16,7 @@ export default part => { paths.offset = paths.example.offset(-10).attr('class', 'interfacing') - paths.lineOffset = new Path() - .move(points.A) - .line(points.B) - .offset(-5) - .attr('class', 'various') + paths.lineOffset = new Path().move(points.A).line(points.B).offset(-5).attr('class', 'various') paths.curveOffset = new Path() .move(points.B) diff --git a/packages/examples/src/path_ops.js b/packages/examples/src/path_ops.js index 5d087377172..3b7a679fc63 100644 --- a/packages/examples/src/path_ops.js +++ b/packages/examples/src/path_ops.js @@ -1,7 +1,7 @@ -export default part => { +export default (part) => { let { Point, points, Path, paths, options } = part.shorthand() - const textClasses = label => + const textClasses = (label) => options.focus === label ? 'center text-xs fill-note' : 'center text-xs' points.A = new Point(10, 10) @@ -46,11 +46,7 @@ export default part => { .attr('data-text', 'Path.close()') .attr('data-text-class', textClasses('close')) - paths.example = paths.line - .join(paths.curve) - .join(paths._curve) - .join(paths.curve_) - .close() + paths.example = paths.line.join(paths.curve).join(paths._curve).join(paths.curve_).close() return part } diff --git a/packages/examples/src/path_reverse.js b/packages/examples/src/path_reverse.js index 8213a5ff75e..fad3da5be6d 100644 --- a/packages/examples/src/path_reverse.js +++ b/packages/examples/src/path_reverse.js @@ -1,4 +1,4 @@ -export default part => { +export default (part) => { let { Point, points, Path, paths } = part.shorthand() points.B = new Point(10, 30) diff --git a/packages/examples/src/path_shiftalong.js b/packages/examples/src/path_shiftalong.js index a752649c537..b94758d3b9a 100644 --- a/packages/examples/src/path_shiftalong.js +++ b/packages/examples/src/path_shiftalong.js @@ -1,4 +1,4 @@ -export default part => { +export default (part) => { let { Point, points, Path, paths, Snippet, snippets } = part.shorthand() points.A = new Point(45, 60) @@ -7,10 +7,7 @@ export default part => { points.C = new Point(90, 30) points.CCp1 = new Point(50, -30) - paths.example = new Path() - .move(points.A) - .line(points.B) - .curve(points.BCp2, points.CCp1, points.C) + paths.example = new Path().move(points.A).line(points.B).curve(points.BCp2, points.CCp1, points.C) points.x1 = paths.example .shiftAlong(20) diff --git a/packages/examples/src/path_shiftfractionalong.js b/packages/examples/src/path_shiftfractionalong.js index 7cd5f881306..d4ebe5d8672 100644 --- a/packages/examples/src/path_shiftfractionalong.js +++ b/packages/examples/src/path_shiftfractionalong.js @@ -1,4 +1,4 @@ -export default part => { +export default (part) => { let { Point, points, Path, paths, Snippet, snippets } = part.shorthand() points.A = new Point(45, 60) @@ -7,10 +7,7 @@ export default part => { points.C = new Point(90, 30) points.CCp1 = new Point(50, -30) - paths.example = new Path() - .move(points.A) - .line(points.B) - .curve(points.BCp2, points.CCp1, points.C) + paths.example = new Path().move(points.A).line(points.B).curve(points.BCp2, points.CCp1, points.C) points.x1 = paths.example .shiftFractionAlong(0.2) diff --git a/packages/examples/src/path_split.js b/packages/examples/src/path_split.js index fe09b6444c8..eaf3d7ee2ac 100644 --- a/packages/examples/src/path_split.js +++ b/packages/examples/src/path_split.js @@ -1,4 +1,4 @@ -export default part => { +export default (part) => { let { Point, points, Path, paths, Snippet, snippets } = part.shorthand() points.A = new Point(45, 60) diff --git a/packages/examples/src/path_start.js b/packages/examples/src/path_start.js index e9776e801a9..af502e1e5b2 100644 --- a/packages/examples/src/path_start.js +++ b/packages/examples/src/path_start.js @@ -1,4 +1,4 @@ -export default part => { +export default (part) => { let { Point, points, Path, paths, Snippet, snippets } = part.shorthand() points.A = new Point(45, 60) @@ -7,10 +7,7 @@ export default part => { points.C = new Point(90, 30) points.CCp1 = new Point(50, -30) - paths.example = new Path() - .move(points.A) - .line(points.B) - .curve(points.BCp2, points.CCp1, points.C) + paths.example = new Path().move(points.A).line(points.B).curve(points.BCp2, points.CCp1, points.C) snippets.start = new Snippet('notch', paths.example.start()) return part diff --git a/packages/examples/src/path_translate.js b/packages/examples/src/path_translate.js index e8ce08ad50f..5b1fbb0b79f 100644 --- a/packages/examples/src/path_translate.js +++ b/packages/examples/src/path_translate.js @@ -1,4 +1,4 @@ -export default part => { +export default (part) => { let { Point, points, Path, paths, macro } = part.shorthand() points.A = new Point(45, 60) @@ -7,10 +7,7 @@ export default part => { points.C = new Point(90, 30) points.CCp1 = new Point(50, -30) - paths.A = new Path() - .move(points.A) - .line(points.B) - .curve(points.BCp2, points.CCp1, points.C) + paths.A = new Path().move(points.A).line(points.B).curve(points.BCp2, points.CCp1, points.C) paths.B = paths.A.translate(60, 30) diff --git a/packages/examples/src/path_trim.js b/packages/examples/src/path_trim.js index 92dc94a03ef..60c18623f7c 100644 --- a/packages/examples/src/path_trim.js +++ b/packages/examples/src/path_trim.js @@ -1,4 +1,4 @@ -export default part => { +export default (part) => { let { Point, points, Path, paths } = part.shorthand() points.center = new Point(0, 0) diff --git a/packages/examples/src/plugin_dimension.js b/packages/examples/src/plugin_dimension.js index 33ad2d5ddbd..c3370e26fb0 100644 --- a/packages/examples/src/plugin_dimension.js +++ b/packages/examples/src/plugin_dimension.js @@ -1,4 +1,4 @@ -export default part => { +export default (part) => { let { Point, points, Path, paths, macro } = part.shorthand() points.A = new Point(0, 0) diff --git a/packages/examples/src/plugin_logo.js b/packages/examples/src/plugin_logo.js index 74adefbc4ad..775d7d162f7 100644 --- a/packages/examples/src/plugin_logo.js +++ b/packages/examples/src/plugin_logo.js @@ -1,6 +1,6 @@ import { box } from './shared' -export default part => { +export default (part) => { let { Point, snippets, Snippet } = part.shorthand() snippets.logo = new Snippet('logo', new Point(50, 30)) diff --git a/packages/examples/src/plugin_round.js b/packages/examples/src/plugin_round.js index ccb7bcc089a..4b6871fb228 100644 --- a/packages/examples/src/plugin_round.js +++ b/packages/examples/src/plugin_round.js @@ -1,4 +1,4 @@ -export default part => { +export default (part) => { let { Point, points, Path, paths, macro } = part.shorthand() points.topLeft = new Point(0, 0) diff --git a/packages/examples/src/plugin_scalebox.js b/packages/examples/src/plugin_scalebox.js index b75fb7d07d6..425dc5bf20a 100644 --- a/packages/examples/src/plugin_scalebox.js +++ b/packages/examples/src/plugin_scalebox.js @@ -1,4 +1,4 @@ -export default part => { +export default (part) => { let { Point, points, macro } = part.shorthand() points.anchor1 = new Point(0, 0) diff --git a/packages/examples/src/plugin_sprinkle.js b/packages/examples/src/plugin_sprinkle.js index b59c1974e49..cc75ff882e9 100644 --- a/packages/examples/src/plugin_sprinkle.js +++ b/packages/examples/src/plugin_sprinkle.js @@ -1,6 +1,6 @@ import { box } from './shared' -export default part => { +export default (part) => { let { Point, points, macro } = part.shorthand() points.a = new Point(10, 10) diff --git a/packages/examples/src/plugin_title.js b/packages/examples/src/plugin_title.js index d9e33c565f3..4448c27c374 100644 --- a/packages/examples/src/plugin_title.js +++ b/packages/examples/src/plugin_title.js @@ -1,6 +1,6 @@ import { box } from './shared' -export default part => { +export default (part) => { let { Point, points, macro } = part.shorthand() points.title = new Point(90, 45) diff --git a/packages/examples/src/point_angle.js b/packages/examples/src/point_angle.js index a914b28f4b7..cc8861f739e 100644 --- a/packages/examples/src/point_angle.js +++ b/packages/examples/src/point_angle.js @@ -1,4 +1,4 @@ -export default part => { +export default (part) => { let { Point, points, Path, paths } = part.shorthand() points.sun = new Point(10, 5) @@ -8,10 +8,7 @@ export default part => { .attr('data-text', points.sun.angle(points.moon) + '°') .attr('data-text-class', 'text-sm fill-note center') - paths.line = new Path() - .move(points.sun) - .line(points.moon) - .attr('class', 'dashed') + paths.line = new Path().move(points.sun).line(points.moon).attr('class', 'dashed') return part } diff --git a/packages/examples/src/point_attr.js b/packages/examples/src/point_attr.js index d578a5f3975..90de8bcca4a 100644 --- a/packages/examples/src/point_attr.js +++ b/packages/examples/src/point_attr.js @@ -1,6 +1,6 @@ import { box } from './shared' -export default part => { +export default (part) => { let { Point, points } = part.shorthand() points.anchor = new Point(100, 25) diff --git a/packages/examples/src/point_clone.js b/packages/examples/src/point_clone.js index b582a02cfd7..9706d31fd05 100644 --- a/packages/examples/src/point_clone.js +++ b/packages/examples/src/point_clone.js @@ -1,6 +1,6 @@ import { box } from './shared' -export default part => { +export default (part) => { let { Point, points, Snippet, snippets } = part.shorthand() points.A = new Point(25, 25) diff --git a/packages/examples/src/point_copy.js b/packages/examples/src/point_copy.js index 9b2f42354b6..06310e9ccee 100644 --- a/packages/examples/src/point_copy.js +++ b/packages/examples/src/point_copy.js @@ -1,6 +1,6 @@ import { box } from './shared' -export default part => { +export default (part) => { let { Point, points, Snippet, snippets } = part.shorthand() points.A = new Point(50, 25).attr('data-text', 'Point A').attr('data-text-class', 'text-xl') diff --git a/packages/examples/src/point_dist.js b/packages/examples/src/point_dist.js index ce7127348eb..076ad56a31d 100644 --- a/packages/examples/src/point_dist.js +++ b/packages/examples/src/point_dist.js @@ -1,4 +1,4 @@ -export default part => { +export default (part) => { let { Point, points, macro } = part.shorthand() points.from = new Point(10, 10) diff --git a/packages/examples/src/point_dx.js b/packages/examples/src/point_dx.js index 1dc68d73d54..8d6df632993 100644 --- a/packages/examples/src/point_dx.js +++ b/packages/examples/src/point_dx.js @@ -1,4 +1,4 @@ -export default part => { +export default (part) => { let { Point, points, macro } = part.shorthand() points.from = new Point(10, 10) diff --git a/packages/examples/src/point_dy.js b/packages/examples/src/point_dy.js index dd0b1d7c69b..f7ca3e92390 100644 --- a/packages/examples/src/point_dy.js +++ b/packages/examples/src/point_dy.js @@ -1,4 +1,4 @@ -export default part => { +export default (part) => { let { Point, points, macro } = part.shorthand() points.from = new Point(10, 10) diff --git a/packages/examples/src/point_flipx.js b/packages/examples/src/point_flipx.js index 6a5e4a407b0..a1a9061d8d2 100644 --- a/packages/examples/src/point_flipx.js +++ b/packages/examples/src/point_flipx.js @@ -1,4 +1,4 @@ -export default part => { +export default (part) => { let { Point, points, Path, paths } = part.shorthand() points.top = new Point(50, 10) @@ -39,10 +39,7 @@ export default part => { .line(points._out1) .close() - paths.mirror = new Path() - .move(points.top) - .line(points.bottom) - .attr('class', 'note dashed') + paths.mirror = new Path().move(points.top).line(points.bottom).attr('class', 'note dashed') return part } diff --git a/packages/examples/src/point_flipy.js b/packages/examples/src/point_flipy.js index b7b88dc9269..1fa64fc1946 100644 --- a/packages/examples/src/point_flipy.js +++ b/packages/examples/src/point_flipy.js @@ -1,4 +1,4 @@ -export default part => { +export default (part) => { let { Point, points, Path, paths } = part.shorthand() points.start = new Point(0, 50) diff --git a/packages/examples/src/point_rotate.js b/packages/examples/src/point_rotate.js index cd22ac38fc1..9648202a1e4 100644 --- a/packages/examples/src/point_rotate.js +++ b/packages/examples/src/point_rotate.js @@ -1,4 +1,4 @@ -export default part => { +export default (part) => { let { Point, points, Path, paths } = part.shorthand() points.sun = new Point(40, 40) diff --git a/packages/examples/src/point_shift.js b/packages/examples/src/point_shift.js index fdc29732b37..d63fc5c5bf3 100644 --- a/packages/examples/src/point_shift.js +++ b/packages/examples/src/point_shift.js @@ -1,6 +1,6 @@ import { box } from './shared' -export default part => { +export default (part) => { let { Point, points, macro } = part.shorthand() points.A = new Point(90, 40).attr('data-text', 'Point A').attr('data-text-class', 'right') diff --git a/packages/examples/src/point_shiftfractiontowards.js b/packages/examples/src/point_shiftfractiontowards.js index 4e4a608127d..a3990824c51 100644 --- a/packages/examples/src/point_shiftfractiontowards.js +++ b/packages/examples/src/point_shiftfractiontowards.js @@ -1,4 +1,4 @@ -export default part => { +export default (part) => { let { Point, points, Path, paths, macro } = part.shorthand() points.A = new Point(90, 70).attr('data-text', 'Point A') @@ -8,10 +8,7 @@ export default part => { .attr('data-text-class', 'center') .attr('data-text-lineheight', 6) - paths.direction = new Path() - .move(points.A) - .line(points.B) - .attr('class', 'note dashed') + paths.direction = new Path().move(points.A).line(points.B).attr('class', 'note dashed') macro('ld', { from: points.C, diff --git a/packages/examples/src/point_shiftoutwards.js b/packages/examples/src/point_shiftoutwards.js index 7217461cc00..5a718b30994 100644 --- a/packages/examples/src/point_shiftoutwards.js +++ b/packages/examples/src/point_shiftoutwards.js @@ -1,6 +1,6 @@ import { box } from './shared' -export default part => { +export default (part) => { let { Point, points, Path, paths, macro } = part.shorthand() points.A = new Point(90, 70).attr('data-text', 'Point A') @@ -9,10 +9,7 @@ export default part => { .attr('data-text', 'Point C is point A shifted 3cm\nbeyond point B') .attr('data-text-lineheight', 6) - paths.direction = new Path() - .move(points.A) - .line(points.C) - .attr('class', 'note dashed') + paths.direction = new Path().move(points.A).line(points.C).attr('class', 'note dashed') macro('ld', { from: points.C, diff --git a/packages/examples/src/point_shifttowards.js b/packages/examples/src/point_shifttowards.js index 2a642bdf7bf..6da52de18f7 100644 --- a/packages/examples/src/point_shifttowards.js +++ b/packages/examples/src/point_shifttowards.js @@ -1,6 +1,6 @@ import { box } from './shared' -export default part => { +export default (part) => { let { Point, points, Path, paths, macro } = part.shorthand() points.A = new Point(90, 70).attr('data-text', 'Point A') @@ -10,10 +10,7 @@ export default part => { .attr('data-text-class', 'center') .attr('data-text-lineheight', 6) - paths.direction = new Path() - .move(points.A) - .line(points.B) - .attr('class', 'note dashed') + paths.direction = new Path().move(points.A).line(points.B).attr('class', 'note dashed') macro('ld', { from: points.C, diff --git a/packages/examples/src/point_sitson.js b/packages/examples/src/point_sitson.js index 081bdf27390..4622aef6a3c 100644 --- a/packages/examples/src/point_sitson.js +++ b/packages/examples/src/point_sitson.js @@ -1,6 +1,6 @@ import { box } from './shared' -export default part => { +export default (part) => { let { Point, points, Snippet, snippets } = part.shorthand() let s diff --git a/packages/examples/src/point_sitsroughlyon.js b/packages/examples/src/point_sitsroughlyon.js index 84ccf042d9a..bfd76b657af 100644 --- a/packages/examples/src/point_sitsroughlyon.js +++ b/packages/examples/src/point_sitsroughlyon.js @@ -1,6 +1,6 @@ import { box } from './shared' -export default part => { +export default (part) => { let { Point, points, Snippet, snippets } = part.shorthand() box(part) diff --git a/packages/examples/src/point_translate.js b/packages/examples/src/point_translate.js index 878b943d992..b25fc631459 100644 --- a/packages/examples/src/point_translate.js +++ b/packages/examples/src/point_translate.js @@ -1,6 +1,6 @@ import { box } from './shared' -export default part => { +export default (part) => { let { Point, points, macro } = part.shorthand() points.A = new Point(20, 20).attr('data-text', 'Point A') diff --git a/packages/examples/src/settings_sa.js b/packages/examples/src/settings_sa.js index 99f62e0f7cf..4ac425f5fb2 100644 --- a/packages/examples/src/settings_sa.js +++ b/packages/examples/src/settings_sa.js @@ -1,4 +1,4 @@ -export default part => { +export default (part) => { let { Point, points, Path, paths } = part.shorthand() points.A = new Point(45, 60) diff --git a/packages/examples/src/snippet.js b/packages/examples/src/snippet.js index ab6e42c499c..586610e79d5 100644 --- a/packages/examples/src/snippet.js +++ b/packages/examples/src/snippet.js @@ -1,6 +1,6 @@ import { box } from './shared' -export default part => { +export default (part) => { let { Point, points, Snippet, snippets } = part.shorthand() points.anchor1 = new Point(20, 15) diff --git a/packages/examples/src/snippet_attr.js b/packages/examples/src/snippet_attr.js index cc5417a1393..9e0c2c15263 100644 --- a/packages/examples/src/snippet_attr.js +++ b/packages/examples/src/snippet_attr.js @@ -1,6 +1,6 @@ import { box } from './shared' -export default part => { +export default (part) => { let { Point, points, Snippet, snippets } = part.shorthand() points.anchor = new Point(50, 15) diff --git a/packages/examples/src/snippet_clone.js b/packages/examples/src/snippet_clone.js index 32bcf3d9827..baa56e708ec 100644 --- a/packages/examples/src/snippet_clone.js +++ b/packages/examples/src/snippet_clone.js @@ -1,6 +1,6 @@ import { box } from './shared' -export default part => { +export default (part) => { let { Point, points, Snippet, snippets } = part.shorthand() points.anchor = new Point(35, 35) diff --git a/packages/examples/src/utils_beamintersectscircle.js b/packages/examples/src/utils_beamintersectscircle.js index b23be2933e1..691ede57e1a 100644 --- a/packages/examples/src/utils_beamintersectscircle.js +++ b/packages/examples/src/utils_beamintersectscircle.js @@ -1,6 +1,6 @@ import { box } from './shared' -export default part => { +export default (part) => { let { Point, points, Path, paths, Snippet, snippets, utils } = part.shorthand() points.A = new Point(95, 45).attr('data-circle', 35).attr('data-circle-class', 'fabric') diff --git a/packages/examples/src/utils_beamintersectsx.js b/packages/examples/src/utils_beamintersectsx.js index 697a3462a52..5e7f0248a44 100644 --- a/packages/examples/src/utils_beamintersectsx.js +++ b/packages/examples/src/utils_beamintersectsx.js @@ -1,4 +1,4 @@ -export default part => { +export default (part) => { let { Point, points, Path, paths, Snippet, snippets, utils } = part.shorthand() points.A = new Point(10, 10) diff --git a/packages/examples/src/utils_beamintersectsy.js b/packages/examples/src/utils_beamintersectsy.js index 7eb84ad529b..16c44a12603 100644 --- a/packages/examples/src/utils_beamintersectsy.js +++ b/packages/examples/src/utils_beamintersectsy.js @@ -1,4 +1,4 @@ -export default part => { +export default (part) => { let { Point, points, Path, paths, Snippet, snippets, utils } = part.shorthand() points.A = new Point(10, 10) diff --git a/packages/examples/src/utils_beamsintersect.js b/packages/examples/src/utils_beamsintersect.js index f1cfa85a5cd..6ea9dbec414 100644 --- a/packages/examples/src/utils_beamsintersect.js +++ b/packages/examples/src/utils_beamsintersect.js @@ -1,4 +1,4 @@ -export default part => { +export default (part) => { let { Point, points, Path, paths, Snippet, snippets, utils } = part.shorthand() points.A = new Point(10, 10) diff --git a/packages/examples/src/utils_circlesintersect.js b/packages/examples/src/utils_circlesintersect.js index eea8f06bd38..86f15c0a94d 100644 --- a/packages/examples/src/utils_circlesintersect.js +++ b/packages/examples/src/utils_circlesintersect.js @@ -1,4 +1,4 @@ -export default part => { +export default (part) => { let { Point, points, Snippet, snippets, utils } = part.shorthand() points.A = new Point(10, 10).attr('data-circle', 15).attr('data-circle-class', 'fabric') diff --git a/packages/examples/src/utils_curveintersectsx.js b/packages/examples/src/utils_curveintersectsx.js index 63b6b666698..09eaffdf546 100644 --- a/packages/examples/src/utils_curveintersectsx.js +++ b/packages/examples/src/utils_curveintersectsx.js @@ -1,4 +1,4 @@ -export default part => { +export default (part) => { let { Point, points, Path, paths, utils, snippets, Snippet } = part.shorthand() points.start = new Point(10, 15) diff --git a/packages/examples/src/utils_curveintersectsy.js b/packages/examples/src/utils_curveintersectsy.js index 77b4dbe070b..bc5e7fc82c0 100644 --- a/packages/examples/src/utils_curveintersectsy.js +++ b/packages/examples/src/utils_curveintersectsy.js @@ -1,4 +1,4 @@ -export default part => { +export default (part) => { let { Point, points, Path, paths, utils, snippets, Snippet } = part.shorthand() points.start = new Point(10, 45) diff --git a/packages/examples/src/utils_curvesintersect.js b/packages/examples/src/utils_curvesintersect.js index 45aecba32f4..76472b0b2f8 100644 --- a/packages/examples/src/utils_curvesintersect.js +++ b/packages/examples/src/utils_curvesintersect.js @@ -1,4 +1,4 @@ -export default part => { +export default (part) => { let { Point, points, Path, paths, Snippet, snippets, utils } = part.shorthand() points.A = new Point(10, 10) diff --git a/packages/examples/src/utils_lineintersectscircle.js b/packages/examples/src/utils_lineintersectscircle.js index ba31020f7c4..a40e8ae6322 100644 --- a/packages/examples/src/utils_lineintersectscircle.js +++ b/packages/examples/src/utils_lineintersectscircle.js @@ -1,6 +1,6 @@ import { box } from './shared' -export default part => { +export default (part) => { let { Point, points, Path, paths, Snippet, snippets, utils } = part.shorthand() points.A = new Point(95, 45).attr('data-circle', 35).attr('data-circle-class', 'fabric') diff --git a/packages/examples/src/utils_lineintersectscurve.js b/packages/examples/src/utils_lineintersectscurve.js index 04c0725ac7f..9f099a08d56 100644 --- a/packages/examples/src/utils_lineintersectscurve.js +++ b/packages/examples/src/utils_lineintersectscurve.js @@ -1,4 +1,4 @@ -export default part => { +export default (part) => { let { Point, points, Path, paths, Snippet, snippets, utils } = part.shorthand() points.A = new Point(10, 10) diff --git a/packages/examples/src/utils_linesintersect.js b/packages/examples/src/utils_linesintersect.js index f3bedccd9a6..308270a6759 100644 --- a/packages/examples/src/utils_linesintersect.js +++ b/packages/examples/src/utils_linesintersect.js @@ -1,4 +1,4 @@ -export default part => { +export default (part) => { let { Point, points, Path, paths, Snippet, snippets, utils } = part.shorthand() points.A = new Point(10, 10) diff --git a/packages/examples/src/utils_pointonbeam.js b/packages/examples/src/utils_pointonbeam.js index 742a710b351..70d876c0859 100644 --- a/packages/examples/src/utils_pointonbeam.js +++ b/packages/examples/src/utils_pointonbeam.js @@ -1,4 +1,4 @@ -export default part => { +export default (part) => { let { Point, points, Path, paths, Snippet, snippets, utils } = part.shorthand() points.from1 = new Point(10, 10) @@ -24,22 +24,10 @@ export default part => { } else snippet = 'bnotch' snippets[part.getId()] = new Snippet(snippet, point) } - paths.line1 = new Path() - .move(points.from1) - .line(points.to1) - .attr('class', 'fabric stroke-lg') - paths.lne1 = new Path() - .move(points.to1) - .line(points.b1) - .attr('class', 'fabric dashed') - paths.line2 = new Path() - .move(points.from2) - .line(points.to2) - .attr('class', 'fabric stroke-lg') - paths.lne2 = new Path() - .move(points.to2) - .line(points.b2) - .attr('class', 'fabric dashed') + paths.line1 = new Path().move(points.from1).line(points.to1).attr('class', 'fabric stroke-lg') + paths.lne1 = new Path().move(points.to1).line(points.b1).attr('class', 'fabric dashed') + paths.line2 = new Path().move(points.from2).line(points.to2).attr('class', 'fabric stroke-lg') + paths.lne2 = new Path().move(points.to2).line(points.b2).attr('class', 'fabric dashed') return part } diff --git a/packages/examples/src/utils_pointoncurve.js b/packages/examples/src/utils_pointoncurve.js index 89df06ddc34..a05846e0d69 100644 --- a/packages/examples/src/utils_pointoncurve.js +++ b/packages/examples/src/utils_pointoncurve.js @@ -1,4 +1,4 @@ -export default part => { +export default (part) => { let { Point, points, Path, paths, Snippet, snippets, utils } = part.shorthand() points.start = new Point(10, 10) diff --git a/packages/examples/src/utils_pointonline.js b/packages/examples/src/utils_pointonline.js index 93ade4efcaf..03228b99b22 100644 --- a/packages/examples/src/utils_pointonline.js +++ b/packages/examples/src/utils_pointonline.js @@ -1,4 +1,4 @@ -export default part => { +export default (part) => { let { Point, points, Path, paths, Snippet, snippets, utils } = part.shorthand() points.from1 = new Point(10, 10) @@ -24,22 +24,10 @@ export default part => { } else snippet = 'bnotch' snippets[part.getId()] = new Snippet(snippet, point) } - paths.line1 = new Path() - .move(points.from1) - .line(points.to1) - .attr('class', 'fabric stroke-lg') - paths.lne1 = new Path() - .move(points.to1) - .line(points.b1) - .attr('class', 'fabric dashed') - paths.line2 = new Path() - .move(points.from2) - .line(points.to2) - .attr('class', 'fabric stroke-lg') - paths.lne2 = new Path() - .move(points.to2) - .line(points.b2) - .attr('class', 'fabric dashed') + paths.line1 = new Path().move(points.from1).line(points.to1).attr('class', 'fabric stroke-lg') + paths.lne1 = new Path().move(points.to1).line(points.b1).attr('class', 'fabric dashed') + paths.line2 = new Path().move(points.from2).line(points.to2).attr('class', 'fabric stroke-lg') + paths.lne2 = new Path().move(points.to2).line(points.b2).attr('class', 'fabric dashed') return part } diff --git a/packages/examples/src/utils_splitcurve.js b/packages/examples/src/utils_splitcurve.js index baf539e0834..8a77ec7b2a4 100644 --- a/packages/examples/src/utils_splitcurve.js +++ b/packages/examples/src/utils_splitcurve.js @@ -1,12 +1,9 @@ -export default part => { +export default (part) => { let { Point, points, Path, paths, utils } = part.shorthand() points.from = new Point(40, 10) points.to = new Point(40, 80) - paths.line = new Path() - .move(points.from) - .line(points.to) - .attr('class', 'lining dashed') + paths.line = new Path().move(points.from).line(points.to).attr('class', 'lining dashed') points.start = new Point(10, 15) points.cp1 = new Point(80, 10) diff --git a/packages/florent/src/briminterfacing.js b/packages/florent/src/briminterfacing.js index e20e9296c1f..73953dd33af 100644 --- a/packages/florent/src/briminterfacing.js +++ b/packages/florent/src/briminterfacing.js @@ -1,4 +1,4 @@ -export default function(part) { +export default function (part) { let { paperless, sa, complete, points, macro, paths, Path } = part.shorthand() paths.hint = paths.seam.clone().attr('class', 'dashed stroke-sm') @@ -10,11 +10,7 @@ export default function(part) { .attr('class', 'lining') points.outsetStart = paths.outset.shiftAlong(5) points.outsetEnd = paths.outset.reverse().shiftAlong(5) - paths.outset = paths.outset - .split(points.outsetStart) - .pop() - .split(points.outsetEnd) - .shift() + paths.outset = paths.outset.split(points.outsetStart).pop().split(points.outsetEnd).shift() paths.inset = new Path() .move(points.tipLeft) @@ -23,11 +19,7 @@ export default function(part) { .attr('class', 'various') points.insetStart = paths.inset.shiftAlong(5) points.insetEnd = paths.inset.reverse().shiftAlong(5) - paths.inset = paths.inset - .split(points.insetStart) - .pop() - .split(points.insetEnd) - .shift() + paths.inset = paths.inset.split(points.insetStart).pop().split(points.insetEnd).shift() paths.inset.render = false paths.outset.render = false diff --git a/packages/florent/src/brimtop.js b/packages/florent/src/brimtop.js index 76871cb01a3..20296e6583e 100644 --- a/packages/florent/src/brimtop.js +++ b/packages/florent/src/brimtop.js @@ -1,4 +1,4 @@ -export default function(part) { +export default function (part) { let { paperless, sa, complete, points, macro, paths, Path } = part.shorthand() paths.hint = new Path() @@ -12,11 +12,7 @@ export default function(part) { .curve(points.innerMidCp2, points.tipLeftCp1, points.tipLeft) .line(paths.seam.start()) - paths.seam = paths.hint - .offset(3) - .join(paths.rest) - .close() - .attr('class', 'fabric') + paths.seam = paths.hint.offset(3).join(paths.rest).close().attr('class', 'fabric') if (complete) { points.title = points.innerMid.shiftFractionTowards(points.outerMidCp2, 0.35) diff --git a/packages/florent/src/side.js b/packages/florent/src/side.js index 2d17feee45f..c520f87754c 100644 --- a/packages/florent/src/side.js +++ b/packages/florent/src/side.js @@ -1,4 +1,4 @@ -export default function(part) { +export default function (part) { let { paperless, sa, complete, points, macro, paths, Path, snippets, Snippet } = part.shorthand() // Clean up @@ -6,10 +6,7 @@ export default function(part) { if (i !== 'side') delete paths[i] } - paths.seam = paths.side - .clone() - .line(points.foldTop) - .attr('class', 'fabric') + paths.seam = paths.side.clone().line(points.foldTop).attr('class', 'fabric') paths.seam.render = true if (complete) { diff --git a/packages/hortensia/src/bottompanel.js b/packages/hortensia/src/bottompanel.js index b7ee21142fa..d1716ea37f8 100644 --- a/packages/hortensia/src/bottompanel.js +++ b/packages/hortensia/src/bottompanel.js @@ -1,4 +1,4 @@ -export default function(part) { +export default function (part) { let { store, options, @@ -14,8 +14,8 @@ export default function(part) { macro } = part.shorthand() - let w = store.get( 'bottomPanelLength' ); - let h = store.get( 'depth' ); + let w = store.get('bottomPanelLength') + let h = store.get('depth') points.topLeft = new Point(0, 0) points.topRight = new Point(w, 0) @@ -35,29 +35,27 @@ export default function(part) { if (complete) { points.logo = points.topLeft.shiftFractionTowards(points.bottomRight, 0.5) snippets.logo = new Snippet('logo', points.logo) - points.title = points.logo - .shift(-90, 50) - .attr("data-text-class", "center") + points.title = points.logo.shift(-90, 50).attr('data-text-class', 'center') - macro("title", { + macro('title', { at: points.title, nr: 3, - title: "BottomPanel" - }); - points.__titleNr.attr("data-text-class", "center"); - points.__titleName.attr("data-text-class", "center"); - points.__titlePattern.attr("data-text-class", "center"); + title: 'BottomPanel' + }) + points.__titleNr.attr('data-text-class', 'center') + points.__titleName.attr('data-text-class', 'center') + points.__titlePattern.attr('data-text-class', 'center') - let scaleBoxMove = 180 *options.size; - console.log('scaleBoxMove: ' +scaleBoxMove); - console.log('w: ' +w); - console.log('h: ' +h); + let scaleBoxMove = 180 * options.size + console.log('scaleBoxMove: ' + scaleBoxMove) + console.log('w: ' + w) + console.log('h: ' + h) - if( scaleBoxMove > 50 && w > 100 ) { - points.scaleBox = points.logo.shift(90, scaleBoxMove); - macro("scalebox", { + if (scaleBoxMove > 50 && w > 100) { + points.scaleBox = points.logo.shift(90, scaleBoxMove) + macro('scalebox', { at: points.scaleBox - }); + }) } if (sa) { diff --git a/packages/hortensia/src/bottomsidepanel.js b/packages/hortensia/src/bottomsidepanel.js index c71d465a4ad..e615705af1d 100644 --- a/packages/hortensia/src/bottomsidepanel.js +++ b/packages/hortensia/src/bottomsidepanel.js @@ -1,16 +1,15 @@ export default function (points, topMiddle, w, h, sizeRatio) { + const c = 0.551915024494 // circle constant + const cornerCP = 20 * sizeRatio - const c = 0.551915024494 // circle constant - const cornerCP = 20 * sizeRatio; - - points.bottomLeft = topMiddle.shift(180, w / 2).shift(270, h); - points.bottomLeftU = points.bottomLeft.shift(90, cornerCP); - points.bottomLeftUcp = points.bottomLeftU.shift(270, cornerCP * c); - points.bottomLeftR = points.bottomLeft.shift(0, cornerCP); - points.bottomLeftRcp = points.bottomLeftR.shift(180, cornerCP * c); - points.bottomRight = topMiddle.shift(0, w / 2).shift(270, h); - points.bottomRightU = points.bottomRight.shift(90, cornerCP); - points.bottomRightUcp = points.bottomRightU.shift(270, cornerCP * c); - points.bottomRightL = points.bottomRight.shift(180, cornerCP); - points.bottomRightLcp = points.bottomRightL.shift(0, cornerCP * c); -} \ No newline at end of file + points.bottomLeft = topMiddle.shift(180, w / 2).shift(270, h) + points.bottomLeftU = points.bottomLeft.shift(90, cornerCP) + points.bottomLeftUcp = points.bottomLeftU.shift(270, cornerCP * c) + points.bottomLeftR = points.bottomLeft.shift(0, cornerCP) + points.bottomLeftRcp = points.bottomLeftR.shift(180, cornerCP * c) + points.bottomRight = topMiddle.shift(0, w / 2).shift(270, h) + points.bottomRightU = points.bottomRight.shift(90, cornerCP) + points.bottomRightUcp = points.bottomRightU.shift(270, cornerCP * c) + points.bottomRightL = points.bottomRight.shift(180, cornerCP) + points.bottomRightLcp = points.bottomRightL.shift(0, cornerCP * c) +} diff --git a/packages/hortensia/src/frontpanel.js b/packages/hortensia/src/frontpanel.js index ac8949cd0fd..206dcbaf677 100644 --- a/packages/hortensia/src/frontpanel.js +++ b/packages/hortensia/src/frontpanel.js @@ -11,28 +11,28 @@ export default function (part) { complete, sa, paperless, - macro, - } = part.shorthand(); + macro + } = part.shorthand() - let w = store.get("frontPanelLength"); - let h = store.get("depth"); + let w = store.get('frontPanelLength') + let h = store.get('depth') - points.topLeft = new Point(0, 0); - points.topRight = new Point(w, 0); - points.bottomLeft = new Point(0, h); - points.bottomRight = new Point(w, h); + points.topLeft = new Point(0, 0) + points.topRight = new Point(w, 0) + points.bottomLeft = new Point(0, h) + points.bottomRight = new Point(w, h) paths.bottom = new Path() .move(points.topLeft) .line(points.bottomLeft) .attr('data-text', 'Bottom') - .attr("data-text-class", "center text-xs") + .attr('data-text-class', 'center text-xs') paths.top = new Path() .move(points.bottomRight) .line(points.topRight) .attr('data-text', 'Top') - .attr("data-text-class", "center text-xs") + .attr('data-text-class', 'center text-xs') //paths.seam = new Path() paths.seam = paths.bottom @@ -40,107 +40,98 @@ export default function (part) { .join(paths.top) .line(points.topLeft) .close() - .attr("class", "fabric"); + .attr('class', 'fabric') - let pctHandleVert = options.pctHandleVert; - let handleWidth = options.handleWidth; - let handleSpace = (h - handleWidth * 2) * (options.pctHandleSpace / 100); + let pctHandleVert = options.pctHandleVert + let handleWidth = options.handleWidth + let handleSpace = (h - handleWidth * 2) * (options.pctHandleSpace / 100) if (handleSpace > options.maxHandleSpaceWidth) { - handleSpace = options.maxHandleSpaceWidth; + handleSpace = options.maxHandleSpaceWidth } else if (handleSpace < options.minHandleSpaceWidth) { - handleSpace = options.minHandleSpaceWidth; + handleSpace = options.minHandleSpaceWidth if (handleSpace < h - handleWidth * 2) { - handleSpace = h - handleWidth * 2; + handleSpace = h - handleWidth * 2 } } - let handleVertPos = w * (pctHandleVert / 100); + let handleVertPos = w * (pctHandleVert / 100) if (handleVertPos + handleWidth * 2 > w) { - handleVertPos = w - handleWidth * 2; + handleVertPos = w - handleWidth * 2 } - points.attachPoint1TL = new Point(handleVertPos, 0 + h / 2 - handleSpace / 2); - points.attachPoint2TL = new Point( - handleVertPos, - h - h / 2 + handleSpace / 2 - handleWidth - ); - points.attachPoint2TLtemp = new Point( - handleVertPos, - h - h / 2 + handleSpace / 2 - ); + points.attachPoint1TL = new Point(handleVertPos, 0 + h / 2 - handleSpace / 2) + points.attachPoint2TL = new Point(handleVertPos, h - h / 2 + handleSpace / 2 - handleWidth) + points.attachPoint2TLtemp = new Point(handleVertPos, h - h / 2 + handleSpace / 2) points.attachPoint1BR = new Point( handleVertPos + handleWidth * 2, 0 + h / 2 - handleSpace / 2 + handleWidth - ); - points.attachPoint2BR = new Point( - handleVertPos + handleWidth * 2, - h - h / 2 + handleSpace / 2 - ); + ) + points.attachPoint2BR = new Point(handleVertPos + handleWidth * 2, h - h / 2 + handleSpace / 2) - macro("crossBox", { + macro('crossBox', { from: points.attachPoint1TL, to: points.attachPoint1BR, - text: "attachment", - }); + text: 'attachment' + }) - macro("crossBox", { + macro('crossBox', { from: points.attachPoint2TL, to: points.attachPoint2BR, - text: "attachment", - }); + text: 'attachment' + }) // Complete? if (complete) { - points.logo = points.topLeft.shiftFractionTowards(points.bottomRight, 0.5); - snippets.logo = new Snippet("logo", points.logo); - points.title = points.logo.shift(-90, 50).attr("data-text-class", "center"); + points.logo = points.topLeft.shiftFractionTowards(points.bottomRight, 0.5) + snippets.logo = new Snippet('logo', points.logo) + points.title = points.logo.shift(-90, 50).attr('data-text-class', 'center') - macro("title", { + macro('title', { at: points.title, nr: 2, - title: "FrontBackPanel", - }); - points.__titleNr.attr("data-text-class", "center"); - points.__titleName.attr("data-text-class", "center"); - points.__titlePattern.attr("data-text-class", "center"); + title: 'FrontBackPanel' + }) + points.__titleNr.attr('data-text-class', 'center') + points.__titleName.attr('data-text-class', 'center') + points.__titlePattern.attr('data-text-class', 'center') if (sa) { - paths.sa = paths.seam.offset(sa).attr("class", "fabric sa"); + paths.sa = paths.seam.offset(sa).attr('class', 'fabric sa') } } // Paperless? if (paperless) { - macro("hd", { + macro('hd', { from: points.bottomLeft, to: points.bottomRight, - y: points.bottomLeft.y + sa + 15, - }); - macro("hd", { + y: points.bottomLeft.y + sa + 15 + }) + macro('hd', { from: points.topLeft, to: points.attachPoint1TL, - y: points.attachPoint1TL.y, - }); - macro("hd", { + y: points.attachPoint1TL.y + }) + macro('hd', { from: points.topLeft, to: points.attachPoint2TLtemp, - y: points.attachPoint2TLtemp.y, - }); - macro("vd", { + y: points.attachPoint2TLtemp.y + }) + macro('vd', { from: points.bottomRight, to: points.topRight, - x: points.topRight.x + sa + 15, - }); - macro("vd", { + x: points.topRight.x + sa + 15 + }) + macro('vd', { from: points.topLeft, to: points.attachPoint1TL, - x: points.attachPoint1TL.x, - }); - macro("vd", { + x: points.attachPoint1TL.x + }) + macro('vd', { from: points.attachPoint2TLtemp, to: points.bottomLeft, - x: points.attachPoint2TLtemp.x, - }); + x: points.attachPoint2TLtemp.x + }) } - return part; + return part } diff --git a/packages/hortensia/src/index.js b/packages/hortensia/src/index.js index 5bd8368ffc8..73a0b5f34d1 100644 --- a/packages/hortensia/src/index.js +++ b/packages/hortensia/src/index.js @@ -1,4 +1,3 @@ - import freesewing from '@freesewing/core' import plugins from '@freesewing/plugin-bundle' // import theme from '@freesewing/plugin-theme' @@ -11,7 +10,7 @@ import draftSidepanelreinforcement from './sidepanelreinforcement' import draftStrap from './strap' // Create new design -const Pattern = new freesewing.Design(config, plugins ) +const Pattern = new freesewing.Design(config, plugins) // Attach the draft methods to the prototype Pattern.prototype.draftSidepanel = draftSidepanel diff --git a/packages/hortensia/src/sidepanel.js b/packages/hortensia/src/sidepanel.js index cec2f1995a1..8838e49b9f0 100644 --- a/packages/hortensia/src/sidepanel.js +++ b/packages/hortensia/src/sidepanel.js @@ -1,4 +1,3 @@ - import bottomsidepanel from './bottomsidepanel' export default function (part) { @@ -16,74 +15,81 @@ export default function (part) { paperless, macro } = part.shorthand() - - const c = 0.551915024494; // circle constant - const phi = 1.6180339887; - const zWidth = new Map([['Invisible',0],['#3',4.8],['#4',5.4],['#4.5',5.9],['#5',6.2],['#6',7],['#8',8],['#10',10.6]]); + const c = 0.551915024494 // circle constant + const phi = 1.6180339887 + + const zWidth = new Map([ + ['Invisible', 0], + ['#3', 4.8], + ['#4', 5.4], + ['#4.5', 5.9], + ['#5', 6.2], + ['#6', 7], + ['#8', 8], + ['#10', 10.6] + ]) + + const w = options.width * options.size + const sizeRatio = w / 230 + + const h = options.height * sizeRatio + const d = h * phi - const w = options.width *options.size; - const sizeRatio = (w / 230); - - const h = options.height * sizeRatio; - const d = h * phi; - const sideLength = h * 0.44 //options.sideFactor; - const shoulderCP = 50 * sizeRatio; - const topCP = 30 * sizeRatio; - - const topRadius = 60 * sizeRatio; + const shoulderCP = 50 * sizeRatio + const topCP = 30 * sizeRatio - const sidePanelReinforcementHeight = h / phi / phi / phi / phi; - const zipperWidth = zWidth.get( options.zipperSize ); - const zipperPanelWidth = sidePanelReinforcementHeight / phi; + const topRadius = 60 * sizeRatio + + const sidePanelReinforcementHeight = h / phi / phi / phi / phi + const zipperWidth = zWidth.get(options.zipperSize) + const zipperPanelWidth = sidePanelReinforcementHeight / phi // console.log( '---' ); // console.log( options.zipperSize ); // console.log( zipperWidth ); // console.log( '---' ); - - store.set( 'width', w ); - store.set( 'depth', d ); - store.set( 'sizeRatio', sizeRatio ); - store.set( 'sideLenght', sideLength ); - store.set( 'shoulderCP', shoulderCP ); - store.set( 'topCP', topCP ); - store.set( 'topRadius', topRadius ); - store.set( 'sidePanelReinforcementHeight', sidePanelReinforcementHeight ); - store.set( 'zipperWidth', zipperWidth ); - store.set( 'zipperPanelWidth', zipperPanelWidth ); - - console.log( 'zipperWidth: ' +zipperWidth ); - console.log( 'zipperPanelWidth: ' +zipperPanelWidth ); - - - points.topCenter = new Point(0, 0); - points.topCircleLeft = points.topCenter.shift(135, topRadius); - points.topCircleRight = points.topCenter.shift(45, topRadius); - points.topCircleLeftCPu = points.topCircleLeft.shift(45, topRadius * c); - points.topCircleRightCPu = points.topCircleRight.shift(135, topRadius * c); + store.set('width', w) + store.set('depth', d) + store.set('sizeRatio', sizeRatio) + store.set('sideLenght', sideLength) + store.set('shoulderCP', shoulderCP) + store.set('topCP', topCP) + store.set('topRadius', topRadius) + store.set('sidePanelReinforcementHeight', sidePanelReinforcementHeight) + store.set('zipperWidth', zipperWidth) + store.set('zipperPanelWidth', zipperPanelWidth) - points.topMiddle = points.topCenter.shift(90, topRadius); - points.topLeft = points.topMiddle.shift(180, w / 2); - points.topRight = points.topMiddle.shift(0, w / 2); - points.topMiddleCPL = points.topMiddle.shift(180, topCP); - points.topMiddleCPR = points.topMiddle.shift(0, topCP * 1.1); + console.log('zipperWidth: ' + zipperWidth) + console.log('zipperPanelWidth: ' + zipperPanelWidth) - bottomsidepanel(points, points.topMiddle, w, h, sizeRatio); + points.topCenter = new Point(0, 0) + points.topCircleLeft = points.topCenter.shift(135, topRadius) + points.topCircleRight = points.topCenter.shift(45, topRadius) + points.topCircleLeftCPu = points.topCircleLeft.shift(45, topRadius * c) + points.topCircleRightCPu = points.topCircleRight.shift(135, topRadius * c) - points.shoulderLeft = points.bottomLeft.shift(90, sideLength); - points.shoulderLeftCP = points.shoulderLeft.shift(90, shoulderCP); - points.shoulderRight = points.bottomRight.shift(90, sideLength); - points.shoulderRightCP = points.shoulderRight.shift(90, shoulderCP); + points.topMiddle = points.topCenter.shift(90, topRadius) + points.topLeft = points.topMiddle.shift(180, w / 2) + points.topRight = points.topMiddle.shift(0, w / 2) + points.topMiddleCPL = points.topMiddle.shift(180, topCP) + points.topMiddleCPR = points.topMiddle.shift(0, topCP * 1.1) + + bottomsidepanel(points, points.topMiddle, w, h, sizeRatio) + + points.shoulderLeft = points.bottomLeft.shift(90, sideLength) + points.shoulderLeftCP = points.shoulderLeft.shift(90, shoulderCP) + points.shoulderRight = points.bottomRight.shift(90, sideLength) + points.shoulderRightCP = points.shoulderRight.shift(90, shoulderCP) // points.topCircleLeftCPd = points.topCircleLeft.shiftTowards( points.shoulderLeft, topCP ); - points.topCircleLeftCPd = points.topCircleLeft.shift(225, topCP); - points.topCircleRightCPd = points.topCircleRight.shift(315, topCP); + points.topCircleLeftCPd = points.topCircleLeft.shift(225, topCP) + points.topCircleRightCPd = points.topCircleRight.shift(315, topCP) - points.bottomSeamLeft = points.bottomLeft.shift(90, sidePanelReinforcementHeight ); - points.bottomSeamRight = points.bottomRight.shift(90, sidePanelReinforcementHeight ); - points.bottomMiddle = points.bottomLeft.shift(0, w/2); + points.bottomSeamLeft = points.bottomLeft.shift(90, sidePanelReinforcementHeight) + points.bottomSeamRight = points.bottomRight.shift(90, sidePanelReinforcementHeight) + points.bottomMiddle = points.bottomLeft.shift(0, w / 2) let pBottom = new Path() .move(points.bottomLeftU) @@ -96,71 +102,71 @@ export default function (part) { .move(points.bottomSeamLeft) .join(pBottom) .line(points.bottomSeamRight) - + let pTop = new Path() .move(points.topCircleRight) .curve(points.topCircleRightCPu, points.topCircleLeftCPu, points.topCircleLeft) - - let topCircleLength = pTop.length(); - - points.topZipperRight = pTop.shiftAlong( (topCircleLength/2) -(zipperWidth/2)) - points.topZipperLeft = pTop.shiftAlong( (topCircleLength/2) +(zipperWidth/2)) - points.topZipperPanelRight = pTop.shiftAlong( (topCircleLength/2) -(zipperPanelWidth/2)) - points.topZipperPanelLeft = pTop.shiftAlong( (topCircleLength/2) +(zipperPanelWidth/2)) - - store.set( 'bottomPanelLength', pBottomPanel.length() ); - console.log( 'bottomPanelLength: ' +pBottomPanel.length() ); + + let topCircleLength = pTop.length() + + points.topZipperRight = pTop.shiftAlong(topCircleLength / 2 - zipperWidth / 2) + points.topZipperLeft = pTop.shiftAlong(topCircleLength / 2 + zipperWidth / 2) + points.topZipperPanelRight = pTop.shiftAlong(topCircleLength / 2 - zipperPanelWidth / 2) + points.topZipperPanelLeft = pTop.shiftAlong(topCircleLength / 2 + zipperPanelWidth / 2) + + store.set('bottomPanelLength', pBottomPanel.length()) + console.log('bottomPanelLength: ' + pBottomPanel.length()) let pSidesAndTop = new Path() .move(points.bottomSeamRight) .line(points.shoulderRight) .curve(points.shoulderRightCP, points.topCircleRightCPd, points.topCircleRight) - .join( pTop ) + .join(pTop) .curve(points.topCircleLeftCPd, points.shoulderLeftCP, points.shoulderLeft) .line(points.bottomSeamLeft) - let frontPanelLength = (pSidesAndTop.length() -zipperPanelWidth) /2; + let frontPanelLength = (pSidesAndTop.length() - zipperPanelWidth) / 2 - store.set( 'frontPanelLength', frontPanelLength ); - console.log( 'frontPanelLength: ' +frontPanelLength ); + store.set('frontPanelLength', frontPanelLength) + console.log('frontPanelLength: ' + frontPanelLength) paths.seam = new Path() .move(points.bottomRightU) - .join( pSidesAndTop ) + .join(pSidesAndTop) .join(pBottom) .close() .attr('class', 'fabric') - - + // Complete? if (complete) { - if( options.size > .4 ) { - points.logo = points.topMiddle.shiftFractionTowards(points.bottomMiddle, 0.30) + if (options.size > 0.4) { + points.logo = points.topMiddle.shiftFractionTowards(points.bottomMiddle, 0.3) snippets.logo = new Snippet('logo', points.logo) } - - points.title = points.topMiddle.shiftFractionTowards(points.bottomMiddle, 0.60) - .attr("data-text-class", "center") - macro("title", { + points.title = points.topMiddle + .shiftFractionTowards(points.bottomMiddle, 0.6) + .attr('data-text-class', 'center') + + macro('title', { at: points.title, nr: 1, - title: "SidePanel" - }); - - points.__titleNr.attr("data-text-class", "center"); - points.__titleName.attr("data-text-class", "center"); - points.__titlePattern.attr("data-text-class", "center"); + title: 'SidePanel' + }) + + points.__titleNr.attr('data-text-class', 'center') + points.__titleName.attr('data-text-class', 'center') + points.__titlePattern.attr('data-text-class', 'center') // points.__titleFor.attr("data-text-class", "center"); - snippets.topNotch = new Snippet('notch', points.topMiddle); - snippets.zipperLeft = new Snippet('notch', points.topZipperLeft); - snippets.zipperRight = new Snippet('notch', points.topZipperRight); - snippets.zipperPanelLeft = new Snippet('notch', points.topZipperPanelLeft); - snippets.zipperPanelRight = new Snippet('notch', points.topZipperPanelRight); - snippets.bottomLeft = new Snippet('notch', points.bottomSeamLeft); - snippets.bottomRight = new Snippet('notch', points.bottomSeamRight); - snippets.bottomMiddle = new Snippet('notch', points.bottomMiddle); + snippets.topNotch = new Snippet('notch', points.topMiddle) + snippets.zipperLeft = new Snippet('notch', points.topZipperLeft) + snippets.zipperRight = new Snippet('notch', points.topZipperRight) + snippets.zipperPanelLeft = new Snippet('notch', points.topZipperPanelLeft) + snippets.zipperPanelRight = new Snippet('notch', points.topZipperPanelRight) + snippets.bottomLeft = new Snippet('notch', points.bottomSeamLeft) + snippets.bottomRight = new Snippet('notch', points.bottomSeamRight) + snippets.bottomMiddle = new Snippet('notch', points.bottomMiddle) if (sa) { paths.sa = paths.seam.offset(sa).attr('class', 'fabric sa') diff --git a/packages/hortensia/src/sidepanelreinforcement.js b/packages/hortensia/src/sidepanelreinforcement.js index 7949ffa994e..61f554f889c 100644 --- a/packages/hortensia/src/sidepanelreinforcement.js +++ b/packages/hortensia/src/sidepanelreinforcement.js @@ -1,4 +1,3 @@ - import bottomsidepanel from './bottomsidepanel' export default function (part) { @@ -17,15 +16,15 @@ export default function (part) { macro } = part.shorthand() - const w = store.get('width'); - const h = store.get('sidePanelReinforcementHeight'); - const sizeRatio = store.get( 'sizeRatio' ); + const w = store.get('width') + const h = store.get('sidePanelReinforcementHeight') + const sizeRatio = store.get('sizeRatio') - points.topMiddle = new Point(0, 0); - points.topLeft = points.topMiddle.shift(180, w / 2); - points.topRight = points.topMiddle.shift(0, w / 2); + points.topMiddle = new Point(0, 0) + points.topLeft = points.topMiddle.shift(180, w / 2) + points.topRight = points.topMiddle.shift(0, w / 2) - bottomsidepanel(points, points.topMiddle, w, h, sizeRatio); + bottomsidepanel(points, points.topMiddle, w, h, sizeRatio) paths.seam = new Path() .move(points.topMiddle) @@ -41,17 +40,18 @@ export default function (part) { // Complete? if (complete) { - points.title = points.topLeft.shiftFractionTowards(points.bottomRight, 0.5) + points.title = points.topLeft + .shiftFractionTowards(points.bottomRight, 0.5) .attr('data-text-class', 'center') - macro("title", { + macro('title', { at: points.title, nr: 4, - title: "SidePanelReinforcement", + title: 'SidePanelReinforcement', scale: 0.25 - }); - points.__titleNr.attr("data-text-class", "center"); - points.__titleName.attr("data-text-class", "center"); - points.__titlePattern.attr("data-text-class", "center"); + }) + points.__titleNr.attr('data-text-class', 'center') + points.__titleName.attr('data-text-class', 'center') + points.__titlePattern.attr('data-text-class', 'center') if (sa) { paths.sa = paths.seam.offset(sa).attr('class', 'fabric sa') diff --git a/packages/hortensia/src/strap.js b/packages/hortensia/src/strap.js index d233eaaf997..2cabf39b8e4 100644 --- a/packages/hortensia/src/strap.js +++ b/packages/hortensia/src/strap.js @@ -1,4 +1,4 @@ -export default function(part) { +export default function (part) { let { store, options, @@ -12,16 +12,16 @@ export default function(part) { sa, paperless, macro - } = part.shorthand(); + } = part.shorthand() - let w = options.handleWidth; - let h = store.get( 'depth' ) * options.strapLength; - if( sa > w *.80 ) { - sa = w *.80; + let w = options.handleWidth + let h = store.get('depth') * options.strapLength + if (sa > w * 0.8) { + sa = w * 0.8 } - console.log( w ); - console.log( h ); - console.log( sa ); + console.log(w) + console.log(h) + console.log(sa) points.topLeft = new Point(-w, 0) points.topMiddle = new Point(0, 0) @@ -43,22 +43,22 @@ export default function(part) { .move(points.topMiddle) .line(points.bottomMiddle) .attr('data-text', 'FoldLine') - .attr("data-text-class", "center text-xs") + .attr('data-text-class', 'center text-xs') .attr('class', 'lining dashed') // Complete? if (complete) { points.title = points.topMiddle.shiftFractionTowards(points.bottomMiddle, 0.25) - macro("title", { + macro('title', { at: points.title, nr: 5, - title: "BottomPanel", + title: 'BottomPanel', rotation: 90, scale: 0.25 - }); - points.__titleNr.attr("data-text-class", "center"); - points.__titleName.attr("data-text-class", "center"); - points.__titlePattern.attr("data-text-class", "center"); + }) + points.__titleNr.attr('data-text-class', 'center') + points.__titleName.attr('data-text-class', 'center') + points.__titlePattern.attr('data-text-class', 'center') if (sa) { paths.sa = paths.seam.offset(sa).attr('class', 'fabric sa') diff --git a/packages/hortensia/src/zipperpanel.js b/packages/hortensia/src/zipperpanel.js index a859c6783b5..b0a37adb2cb 100644 --- a/packages/hortensia/src/zipperpanel.js +++ b/packages/hortensia/src/zipperpanel.js @@ -1,4 +1,4 @@ -export default function(part) { +export default function (part) { let { store, options, @@ -12,14 +12,14 @@ export default function(part) { sa, paperless, macro - } = part.shorthand(); + } = part.shorthand() - let z = store.get( 'zipperWidth' ); - let w = (store.get( 'zipperPanelWidth' ) -z) /2; - let h = store.get( 'depth' ); - console.log( z ); - console.log( w ); - console.log( h ); + let z = store.get('zipperWidth') + let w = (store.get('zipperPanelWidth') - z) / 2 + let h = store.get('depth') + console.log(z) + console.log(w) + console.log(h) points.topLeft = new Point(0, 0) points.topRight = new Point(w, 0) diff --git a/packages/huey/src/back.js b/packages/huey/src/back.js index 8423c8d1aeb..14ac9a874ad 100644 --- a/packages/huey/src/back.js +++ b/packages/huey/src/back.js @@ -64,7 +64,7 @@ export default function (part) { to: points.cbHem, grainline: true }) - macro('scalebox', { at: new Point(points.armholePitch.x/2, points.cbWaist.y) }) + macro('scalebox', { at: new Point(points.armholePitch.x / 2, points.cbWaist.y) }) if (sa) { paths.sa = paths.hemBase.offset(options.ribbing ? sa : 3 * sa).join(paths.saBase.offset(sa)) paths.sa diff --git a/packages/huey/src/index.js b/packages/huey/src/index.js index da411d3d43c..11b8862daef 100644 --- a/packages/huey/src/index.js +++ b/packages/huey/src/index.js @@ -15,19 +15,19 @@ import draftCuff from './cuff' const Pattern = new freesewing.Design(config, plugins) // Attach draft methods from Brian to prototype -Pattern.prototype.draftBase = function(part) { +Pattern.prototype.draftBase = function (part) { return new Brian(this.settings).draftBase(part) } -Pattern.prototype.draftFrontBase = function(part) { +Pattern.prototype.draftFrontBase = function (part) { return new Brian(this.settings).draftFront(part) } -Pattern.prototype.draftBackBase = function(part) { +Pattern.prototype.draftBackBase = function (part) { return new Brian(this.settings).draftBack(part) } -Pattern.prototype.draftSleevecap = function(part) { +Pattern.prototype.draftSleevecap = function (part) { return new Brian(this.settings).draftSleevecap(part) } -Pattern.prototype.draftSleeveBase = function(part) { +Pattern.prototype.draftSleeveBase = function (part) { return new Brian(this.settings).draftSleeve(part) } diff --git a/packages/huey/src/pocket.js b/packages/huey/src/pocket.js index 41ed68ada0a..f2abeda937b 100644 --- a/packages/huey/src/pocket.js +++ b/packages/huey/src/pocket.js @@ -1,4 +1,4 @@ -export default function(part) { +export default function (part) { let { macro, Path, diff --git a/packages/huey/src/sleeve.js b/packages/huey/src/sleeve.js index 2db615f064e..b617b9eabcc 100644 --- a/packages/huey/src/sleeve.js +++ b/packages/huey/src/sleeve.js @@ -1,4 +1,4 @@ -export default function(part) { +export default function (part) { let { Point, Path, @@ -37,10 +37,7 @@ export default function(part) { paths.saBase.render = false paths.hemBase.render = false - paths.seam = paths.saBase - .join(paths.hemBase) - .close() - .attr('class', 'fabric') + paths.seam = paths.saBase.join(paths.hemBase).close().attr('class', 'fabric') // Complete? if (complete) { diff --git a/packages/hugo/src/index.js b/packages/hugo/src/index.js index a3b0b8a109b..960adbfef53 100644 --- a/packages/hugo/src/index.js +++ b/packages/hugo/src/index.js @@ -17,19 +17,19 @@ import draftCuff from './cuff' const Pattern = new freesewing.Design(config, plugins) // Attach draft methods to prototype -Pattern.prototype.draftBase = function(part) { +Pattern.prototype.draftBase = function (part) { return new Brian(this.settings).draftBase(part) } -Pattern.prototype.draftFrontBase = function(part) { +Pattern.prototype.draftFrontBase = function (part) { return new Brian(this.settings).draftFront(part) } -Pattern.prototype.draftBackBase = function(part) { +Pattern.prototype.draftBackBase = function (part) { return new Brian(this.settings).draftBack(part) } -Pattern.prototype.draftSleeveBase = function(part) { +Pattern.prototype.draftSleeveBase = function (part) { return new Brian(this.settings).draftSleeve(part) } -Pattern.prototype.draftSleevecap = function(part) { +Pattern.prototype.draftSleevecap = function (part) { return new Brian(this.settings).draftSleevecap(part) } Pattern.prototype.draftBack = draftBack diff --git a/packages/hugo/src/pocketfacing.js b/packages/hugo/src/pocketfacing.js index bdd7b050e45..d02547f36e5 100644 --- a/packages/hugo/src/pocketfacing.js +++ b/packages/hugo/src/pocketfacing.js @@ -1,4 +1,4 @@ -export default function(part) { +export default function (part) { // Remove clutter let facing = part.paths.facing part.paths = {} @@ -26,10 +26,7 @@ export default function(part) { .line(points.facingEnd) .offset(sa * -1) .attr('class', 'fabric sa') - paths.sa - .line(points.facingEnd) - .move(points.saStart) - .line(paths.sa.start()) + paths.sa.line(points.facingEnd).move(points.saStart).line(paths.sa.start()) } } diff --git a/packages/jaeger/src/chestpocketbag.js b/packages/jaeger/src/chestpocketbag.js index 4018722e3ff..86f134c056b 100644 --- a/packages/jaeger/src/chestpocketbag.js +++ b/packages/jaeger/src/chestpocketbag.js @@ -1,4 +1,4 @@ -export default function(part) { +export default function (part) { let { paperless, sa, diff --git a/packages/jaeger/src/chestpocketwelt.js b/packages/jaeger/src/chestpocketwelt.js index 0830560c22f..a61292d886b 100644 --- a/packages/jaeger/src/chestpocketwelt.js +++ b/packages/jaeger/src/chestpocketwelt.js @@ -1,4 +1,4 @@ -export default function(part) { +export default function (part) { let { paperless, sa, diff --git a/packages/jaeger/src/collar.js b/packages/jaeger/src/collar.js index ac686528027..a4f574d846f 100644 --- a/packages/jaeger/src/collar.js +++ b/packages/jaeger/src/collar.js @@ -5,7 +5,7 @@ * experience, or more tailoring exprience. */ -export default function(part) { +export default function (part) { let { paperless, sa, snippets, complete, points, options, macro, paths, Path } = part.shorthand() // Add extra fabric for collar roll diff --git a/packages/jaeger/src/frontbase.js b/packages/jaeger/src/frontbase.js index 5ea4fda8d91..c631c0c3231 100644 --- a/packages/jaeger/src/frontbase.js +++ b/packages/jaeger/src/frontbase.js @@ -1,6 +1,6 @@ import { backSideBoundary } from './shared' -export default function(part) { +export default function (part) { let { store, points, utils, options, Point, paths, Path } = part.shorthand() /** diff --git a/packages/jaeger/src/index.js b/packages/jaeger/src/index.js index 7ca3acadfc9..da8bd1e673d 100644 --- a/packages/jaeger/src/index.js +++ b/packages/jaeger/src/index.js @@ -25,22 +25,22 @@ import draftUnderSleeve from './undersleeve' const Pattern = new freesewing.Design(config, [plugins, buttons]) // Attach draft methods from Bent to prototype -Pattern.prototype.draftBentBase = function(part) { +Pattern.prototype.draftBentBase = function (part) { return new Bent(this.settings).draftBase(part) } -Pattern.prototype.draftBentFront = function(part) { +Pattern.prototype.draftBentFront = function (part) { return new Bent(this.settings).draftFront(part) } -Pattern.prototype.draftBentBack = function(part) { +Pattern.prototype.draftBentBack = function (part) { return new Bent(this.settings).draftBack(part) } -Pattern.prototype.draftBentSleeve = function(part) { +Pattern.prototype.draftBentSleeve = function (part) { return new Bent(this.settings).draftSleeve(part) } -Pattern.prototype.draftBentTopSleeve = function(part) { +Pattern.prototype.draftBentTopSleeve = function (part) { return new Bent(this.settings).draftTopSleeve(part) } -Pattern.prototype.draftBentUnderSleeve = function(part) { +Pattern.prototype.draftBentUnderSleeve = function (part) { return new Bent(this.settings).draftUnderSleeve(part) } diff --git a/packages/jaeger/src/innerpocketbag.js b/packages/jaeger/src/innerpocketbag.js index 28ebf30b30c..bc3e4e84f59 100644 --- a/packages/jaeger/src/innerpocketbag.js +++ b/packages/jaeger/src/innerpocketbag.js @@ -1,4 +1,4 @@ -export default function(part) { +export default function (part) { let { paperless, sa, diff --git a/packages/jaeger/src/innerpocketwelt.js b/packages/jaeger/src/innerpocketwelt.js index 99bab668c24..f2c7e6cc856 100644 --- a/packages/jaeger/src/innerpocketwelt.js +++ b/packages/jaeger/src/innerpocketwelt.js @@ -1,4 +1,4 @@ -export default function(part) { +export default function (part) { let { paperless, sa, store, complete, points, macro, Point, paths, Path } = part.shorthand() let width = store.get('innerPocketWidth') diff --git a/packages/jaeger/src/pocket.js b/packages/jaeger/src/pocket.js index 566c456f7a8..e5626debf31 100644 --- a/packages/jaeger/src/pocket.js +++ b/packages/jaeger/src/pocket.js @@ -1,4 +1,4 @@ -export default function(part) { +export default function (part) { let { paperless, sa, @@ -66,10 +66,7 @@ export default function(part) { .close() .attr('class', 'fabric') } - paths.fold = new Path() - .move(points.topLeft) - .line(points.topRight) - .attr('class', 'fabric dashed') + paths.fold = new Path().move(points.topLeft).line(points.topRight).attr('class', 'fabric dashed') if (complete) { // Title diff --git a/packages/jaeger/src/pocketlining.js b/packages/jaeger/src/pocketlining.js index 7de0acf461a..4eee3199fe0 100644 --- a/packages/jaeger/src/pocketlining.js +++ b/packages/jaeger/src/pocketlining.js @@ -1,4 +1,4 @@ -export default function(part) { +export default function (part) { let { paperless, sa, snippets, complete, points, options, macro, paths, Path } = part.shorthand() // Adapt length diff --git a/packages/jaeger/src/topsleeve.js b/packages/jaeger/src/topsleeve.js index 9d28a2a32dd..ed64a31fee9 100644 --- a/packages/jaeger/src/topsleeve.js +++ b/packages/jaeger/src/topsleeve.js @@ -102,7 +102,7 @@ export default function (part) { .attr('class', 'fabric lashed') if (complete) { - macro('scalebox', { at: points.elbowCenter, }) + macro('scalebox', { at: points.elbowCenter }) // Notches macro('sprinkle', { snippet: 'notch', diff --git a/packages/jaeger/src/undercollar.js b/packages/jaeger/src/undercollar.js index f4cef200724..0c70704384f 100644 --- a/packages/jaeger/src/undercollar.js +++ b/packages/jaeger/src/undercollar.js @@ -5,7 +5,7 @@ * experience, or more tailoring exprience. */ -export default function(part) { +export default function (part) { let { paperless, sa, snippets, complete, points, macro, paths, Path } = part.shorthand() // Clean up @@ -32,10 +32,7 @@ export default function(part) { }) if (sa) { - paths.sa1 = new Path() - .move(points.collarstandCbTop) - .line(points.collarCbTop) - .offset(sa) + paths.sa1 = new Path().move(points.collarstandCbTop).line(points.collarCbTop).offset(sa) paths.sa2 = new Path() .move(points.collarstandTip) .line(points.notch) diff --git a/packages/penelope/src/front.js b/packages/penelope/src/front.js index 9f163cb9393..4614d7021ce 100644 --- a/packages/penelope/src/front.js +++ b/packages/penelope/src/front.js @@ -1,6 +1,6 @@ import { BuildMainShape } from './shape' -export default function(part) { +export default function (part) { let { options, /*measurements,*/ @@ -52,12 +52,7 @@ export default function(part) { if (sa) { paths.sa = new Path() .move(points.lHem) - .join( - paths.bottom - .join(paths.sideSeam) - .join(paths.waistSA) - .offset(sa) - ) + .join(paths.bottom.join(paths.sideSeam).join(paths.waistSA).offset(sa)) .line(points.lWaist) .attr('class', 'fabric sa') } diff --git a/packages/penelope/src/utils.js b/packages/penelope/src/utils.js index 4badda88c82..e9ad16c192c 100644 --- a/packages/penelope/src/utils.js +++ b/packages/penelope/src/utils.js @@ -137,11 +137,7 @@ function addDartToCurve(part, curvePath, distance, dartSize, dartDepth) { .curve(rightDartCP, curvePaths[1].ops[1].cp2, curvePaths[1].ops[1].to) .setRender(false) - let dart = new part.Path() - .move(dartLeft) - .line(dartBottom) - .line(dartRight) - .setRender(false) + let dart = new part.Path().move(dartLeft).line(dartBottom).line(dartRight).setRender(false) let curveWithDart = { left: curveLeftOfDart, diff --git a/packages/plugin-banner/src/index.js b/packages/plugin-banner/src/index.js index bf4a778b1fe..c08dfaa1ad2 100644 --- a/packages/plugin-banner/src/index.js +++ b/packages/plugin-banner/src/index.js @@ -4,13 +4,13 @@ export default { name: name, version: version, hooks: { - preRender: function(svg) { + preRender: function (svg) { if (svg.attributes.get('freesewing:plugin-banner') === false) svg.attributes.set('freesewing:plugin-banner', version) } }, macros: { - banner: function(so) { + banner: function (so) { let defaults = { text: [], dy: -1, spaces: 8, repeat: 25 } so = { ...defaults, ...so } this.paths[so.path].attr('data-text-dy', so.dy).attr('data-text-class', 'center') diff --git a/packages/plugin-buttons/src/index.js b/packages/plugin-buttons/src/index.js index cf49396747d..2425ee84ee9 100644 --- a/packages/plugin-buttons/src/index.js +++ b/packages/plugin-buttons/src/index.js @@ -7,7 +7,7 @@ export default { name: name, version: version, hooks: { - preRender: function(svg) { + preRender: function (svg) { 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 49bef2b88ff..0eb1a2417bd 100644 --- a/packages/plugin-cutonfold/src/index.js +++ b/packages/plugin-cutonfold/src/index.js @@ -5,7 +5,7 @@ export default { name: name, version: version, hooks: { - preRender: function(svg) { + preRender: function (svg) { if (svg.attributes.get('freesewing:plugin-cutonfold') === false) { svg.attributes.set('freesewing:plugin-cutonfold', version) svg.defs += markers @@ -13,7 +13,7 @@ export default { } }, macros: { - cutonfold: function(so) { + cutonfold: function (so) { if (so === false) { delete this.points.cutonfoldFrom delete this.points.cutonfoldTo diff --git a/packages/plugin-flip/src/index.js b/packages/plugin-flip/src/index.js index 3f2cae9ce9e..f9c669a82a8 100644 --- a/packages/plugin-flip/src/index.js +++ b/packages/plugin-flip/src/index.js @@ -4,13 +4,13 @@ export default { name: name, version: version, hooks: { - preRender: function(svg) { + preRender: function (svg) { if (svg.attributes.get('freesewing:plugin-flip') === false) svg.attributes.set('freesewing:plugin-flip', version) } }, macros: { - flip: function() { + flip: function () { let flipped = null let ops = ['from', 'to', 'cp1', 'cp2'] for (let id in this.points) { diff --git a/packages/plugin-gore/src/index.js b/packages/plugin-gore/src/index.js index 1ccfb7826e5..1498ab2d59a 100644 --- a/packages/plugin-gore/src/index.js +++ b/packages/plugin-gore/src/index.js @@ -4,13 +4,13 @@ export default { name: name, version: version, hooks: { - preRender: function(svg) { + preRender: function (svg) { if (svg.attributes.get('freesewing:plugin-gore') === false) svg.attributes.set('freesewing:plugin-gore', version) } }, macros: { - gore: function(so) { + gore: function (so) { let from = so.from let goreNumber = so.goreNumber //number of gores for the complete sphere let radius = so.radius //radius of the sphere diff --git a/packages/plugin-grainline/src/index.js b/packages/plugin-grainline/src/index.js index 582512f863f..9cf6064012a 100644 --- a/packages/plugin-grainline/src/index.js +++ b/packages/plugin-grainline/src/index.js @@ -5,7 +5,7 @@ export default { name: name, version: version, hooks: { - preRender: function(svg) { + preRender: function (svg) { if (svg.attributes.get('freesewing:plugin-grainline') === false) { svg.attributes.set('freesewing:plugin-grainline', version) svg.defs += markers @@ -13,7 +13,7 @@ export default { } }, macros: { - grainline: function(so) { + grainline: function (so) { if (so === false) { delete this.points.grainlineFrom delete this.points.grainlineTo diff --git a/packages/plugin-i18n/src/index.js b/packages/plugin-i18n/src/index.js index 5fe64fb1dc2..45df941cfb4 100644 --- a/packages/plugin-i18n/src/index.js +++ b/packages/plugin-i18n/src/index.js @@ -4,12 +4,12 @@ export default { name: name, version: version, hooks: { - preRender: function(svg) { + preRender: function (svg) { if (svg.attributes.get('freesewing:plugin-i18n') === false) { svg.attributes.set('freesewing:plugin-i18n', version) } }, - insertText: function(locale, text, data) { + insertText: function (locale, text, data) { if (data === false) { console.log( "No data was passed to the i18n plugin. This plugin won't do much without injecting data into it" diff --git a/packages/plugin-logo/src/index.js b/packages/plugin-logo/src/index.js index 3a69cbaa4a4..4280f680650 100644 --- a/packages/plugin-logo/src/index.js +++ b/packages/plugin-logo/src/index.js @@ -5,7 +5,7 @@ export default { name: name, version: version, hooks: { - preRender: function(svg) { + preRender: function (svg) { if (svg.attributes.get('freesewing:plugin-logo') === false) { svg.attributes.set('freesewing:plugin-logo', version) svg.defs += logo diff --git a/packages/plugin-round/src/index.js b/packages/plugin-round/src/index.js index 1f32c5dff0f..db493cd6fb4 100644 --- a/packages/plugin-round/src/index.js +++ b/packages/plugin-round/src/index.js @@ -4,13 +4,13 @@ export default { name: name, version: version, hooks: { - preRender: function(svg) { + preRender: function (svg) { if (svg.attributes.get('freesewing:plugin-round') === false) svg.attributes.set('freesewing:plugin-round', version) } }, macros: { - round: function(so) { + round: function (so) { const C = 0.55191502449 // Find angle between points let from = so.from diff --git a/packages/plugin-scalebox/src/index.js b/packages/plugin-scalebox/src/index.js index d81974e65b4..0f49613f5b4 100644 --- a/packages/plugin-scalebox/src/index.js +++ b/packages/plugin-scalebox/src/index.js @@ -6,7 +6,7 @@ export default { name: name, version: version, hooks: { - preRender: function(svg) { + preRender: function (svg) { svg.attributes.set('freesewing:plugin-scalebox', version) } }, diff --git a/packages/plugin-scalebox/src/miniscale.js b/packages/plugin-scalebox/src/miniscale.js index 8bc3ed2262e..fe78be72939 100644 --- a/packages/plugin-scalebox/src/miniscale.js +++ b/packages/plugin-scalebox/src/miniscale.js @@ -1,4 +1,4 @@ -export default function(so) { +export default function (so) { // Passing `false` will remove the miniscale if (so === false) { for (let id of [ diff --git a/packages/plugin-scalebox/src/scalebox.js b/packages/plugin-scalebox/src/scalebox.js index 1564e3af943..3c022a62877 100644 --- a/packages/plugin-scalebox/src/scalebox.js +++ b/packages/plugin-scalebox/src/scalebox.js @@ -1,4 +1,4 @@ -export default function(so) { +export default function (so) { // Passing `false` will remove the scalebox if (so === false) { for (let id of [ @@ -94,8 +94,7 @@ export default function(so) { if (typeof so.text === 'string') { this.points.__scaleboxText.attr('data-text', so.text) } else { - this.points.__scaleboxText - .attr('data-text', 'supportFreesewingBecomeAPatron') + this.points.__scaleboxText.attr('data-text', 'supportFreesewingBecomeAPatron') this.points.__scaleboxLink = this.points.__scaleboxLink .attr('data-text', 'freesewing.org/patrons/join') .attr('data-text-class', 'text-xs fill-note') diff --git a/packages/plugin-sprinkle/src/index.js b/packages/plugin-sprinkle/src/index.js index be34881b646..da9aa3c4599 100644 --- a/packages/plugin-sprinkle/src/index.js +++ b/packages/plugin-sprinkle/src/index.js @@ -4,13 +4,13 @@ export default { name: name, version: version, hooks: { - preRender: function(svg) { + preRender: function (svg) { if (svg.attributes.get('freesewing:plugin-sprinkle') === false) svg.attributes.set('freesewing:plugin-sprinkle', version) } }, macros: { - sprinkle: function(so) { + 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 355354e4b03..c2104615f06 100644 --- a/packages/plugin-svgattr/src/index.js +++ b/packages/plugin-svgattr/src/index.js @@ -4,7 +4,7 @@ export default { name: name, version: version, hooks: { - preRender: function(svg, attributes) { + preRender: function (svg, attributes) { if (svg.attributes.get('freesewing:plugin-svgattr') === false) { 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-validate/src/index.js b/packages/plugin-validate/src/index.js index 3326ec13079..71f7d9a018b 100644 --- a/packages/plugin-validate/src/index.js +++ b/packages/plugin-validate/src/index.js @@ -5,7 +5,7 @@ export default { name: name, version: version, hooks: { - preDraft: function(pattern) { + preDraft: function (pattern) { if (typeof pattern.settings.measurements === 'undefined') return pattern.debug({ type: 'error', @@ -35,7 +35,7 @@ export default { } } }, - postDraft: function(pattern) { + postDraft: function (pattern) { for (let partId in pattern.parts) { let part = pattern.parts[partId] let { debug } = part.shorthand() diff --git a/packages/plugin-validate/src/validate.js b/packages/plugin-validate/src/validate.js index 72b9eb923b4..46e7ce8b0e9 100644 --- a/packages/plugin-validate/src/validate.js +++ b/packages/plugin-validate/src/validate.js @@ -1,6 +1,6 @@ const validate = {} -validate.point = function(point, partId, pointId, debug) { +validate.point = function (point, partId, pointId, debug) { if (typeof point !== 'object') { debug({ type: 'error', @@ -47,7 +47,7 @@ validate.point = function(point, partId, pointId, debug) { return true } -validate.text = function(type, item, partId, itemId, debug) { +validate.text = function (type, item, partId, itemId, debug) { let text = item.attributes.getAsArray('data-text') if (text === false) return true else { @@ -86,7 +86,7 @@ validate.text = function(type, item, partId, itemId, debug) { return true } -validate.path = function(path, partId, pathId, debug) { +validate.path = function (path, partId, pathId, debug) { if (typeof path !== 'object') { debug({ type: 'error', @@ -173,7 +173,7 @@ validate.path = function(path, partId, pathId, debug) { return true } -validate.snippet = function(snippet, partId, snippetId, debug) { +validate.snippet = function (snippet, partId, snippetId, debug) { if (typeof snippet !== 'object') return false if (!validate.point(snippet.anchor, partId, '_unknown_', debug)) return false if (typeof snippet.attributes !== 'object') return false diff --git a/packages/remark-jargon/src/index.js b/packages/remark-jargon/src/index.js index 9aea9b85341..7888872310e 100644 --- a/packages/remark-jargon/src/index.js +++ b/packages/remark-jargon/src/index.js @@ -1,11 +1,11 @@ import visit from 'unist-util-visit' -export default options => { +export default (options) => { if (!options || !options.jargon) { throw Error('Required "jargon" option is missing in remark-jargon configuration') } - const isJargon = node => { + const isJargon = (node) => { if ( node.children.length === 1 && node.children[0].type === 'text' && @@ -16,7 +16,7 @@ export default options => { return false } - const visitor = node => { + const visitor = (node) => { if (isJargon(node)) { let term = node.children[0].value let html = options.jargon[term.toLowerCase()] @@ -35,7 +35,7 @@ export default options => { } } - const transform = tree => { + const transform = (tree) => { visit(tree, 'emphasis', visitor) } diff --git a/packages/rendertest/src/circles.js b/packages/rendertest/src/circles.js index 2981925f37c..5ac2a6a2cfb 100644 --- a/packages/rendertest/src/circles.js +++ b/packages/rendertest/src/circles.js @@ -1,4 +1,4 @@ -export default function(part) { +export default function (part) { let { Point, Path, points, paths, store } = part.shorthand() let y = store.get('y') @@ -7,10 +7,7 @@ export default function(part) { points.crl = new Point(0, y) points.crr = new Point(w, y) - paths.circles = new Path() - .move(points.crl) - .line(points.crr) - .attr('data-text', 'circles') + paths.circles = new Path().move(points.crl).line(points.crr).attr('data-text', 'circles') y += w / 2 for (let i = 1; i < 50; i++) { points['cr' + i] = new Point(w / 2, y) diff --git a/packages/rendertest/src/colors.js b/packages/rendertest/src/colors.js index c932fd26550..695b20f5082 100644 --- a/packages/rendertest/src/colors.js +++ b/packages/rendertest/src/colors.js @@ -1,4 +1,4 @@ -export default function(part) { +export default function (part) { let { Point, Path, points, paths, store } = part.shorthand() let y = store.get('y') @@ -45,10 +45,7 @@ export default function(part) { y += 10 points.ftl = new Point(0, y) points.ftr = new Point(w, y) - paths.snip = new Path() - .move(points.ftl) - .line(points.ftr) - .attr('data-text', 'fill') + paths.snip = new Path().move(points.ftl).line(points.ftr).attr('data-text', 'fill') y += 15 for (let i of colors) { let h = 10 diff --git a/packages/rendertest/src/index.js b/packages/rendertest/src/index.js index 9c7070ce72e..0f9da07a6c9 100644 --- a/packages/rendertest/src/index.js +++ b/packages/rendertest/src/index.js @@ -8,6 +8,6 @@ import draftTest from './test' const Pattern = new freesewing.Design(config, plugins) // Attach draft methods to prototype -Pattern.prototype.draftTest = part => draftTest(part) +Pattern.prototype.draftTest = (part) => draftTest(part) export default Pattern diff --git a/packages/rendertest/src/macros.js b/packages/rendertest/src/macros.js index 5c9d843285b..0f4ac0bcc01 100644 --- a/packages/rendertest/src/macros.js +++ b/packages/rendertest/src/macros.js @@ -1,4 +1,4 @@ -export default function(part) { +export default function (part) { let { macro, Point, Path, points, paths, store } = part.shorthand() let y = store.get('y') @@ -6,10 +6,7 @@ export default function(part) { y += 10 points.ml = new Point(0, y) points.mr = new Point(w, y) - paths.macros = new Path() - .move(points.ml) - .line(points.mr) - .attr('data-text', 'macros') + paths.macros = new Path().move(points.ml).line(points.mr).attr('data-text', 'macros') y += 40 macro('title', { diff --git a/packages/rendertest/src/snippets.js b/packages/rendertest/src/snippets.js index e971a6a893c..725b2724f7e 100644 --- a/packages/rendertest/src/snippets.js +++ b/packages/rendertest/src/snippets.js @@ -1,4 +1,4 @@ -export default function(part) { +export default function (part) { let { Point, Path, points, paths, snippets, Snippet, store } = part.shorthand() let y = store.get('y') @@ -14,10 +14,7 @@ export default function(part) { y += 10 points.tl = new Point(0, y) points.tr = new Point(w, y) - paths.texts = new Path() - .move(points.tl) - .line(points.tr) - .attr('data-text', 'snippets') + paths.texts = new Path().move(points.tl).line(points.tr).attr('data-text', 'snippets') y += 10 points['sl1'] = new Point(w * 0.25, y) points['sl2'] = new Point(w * 0.5, y) diff --git a/packages/rendertest/src/test.js b/packages/rendertest/src/test.js index b6ba1d56650..64b621be9f4 100644 --- a/packages/rendertest/src/test.js +++ b/packages/rendertest/src/test.js @@ -4,7 +4,7 @@ import text from './text' import snippets from './snippets' import macros from './macros' -export default function(part) { +export default function (part) { let { macro, store, options, Path, paths, Point } = part.shorthand() store.set('y', 0) store.set('w', options.width) diff --git a/packages/rendertest/src/text.js b/packages/rendertest/src/text.js index 69b08a4ae56..2fe8316c8d5 100644 --- a/packages/rendertest/src/text.js +++ b/packages/rendertest/src/text.js @@ -1,4 +1,4 @@ -export default function(part) { +export default function (part) { let { Point, Path, points, paths, store } = part.shorthand() let y = store.get('y') @@ -7,10 +7,7 @@ export default function(part) { y += 10 points.tl = new Point(0, y) points.tr = new Point(w, y) - paths.text = new Path() - .move(points.tl) - .line(points.tr) - .attr('data-text', 'text') + paths.text = new Path().move(points.tl).line(points.tr).attr('data-text', 'text') y += 10 points.tlc = new Point(0, y) points.trc = new Point(w, y) diff --git a/packages/sandy/src/curved-waistband.js b/packages/sandy/src/curved-waistband.js index 28d92c0c34d..9fb4199163a 100644 --- a/packages/sandy/src/curved-waistband.js +++ b/packages/sandy/src/curved-waistband.js @@ -1,6 +1,6 @@ import draftRingSector from './shared' -export default function(part) { +export default function (part) { /** * The curved waistband is just a ring sector with external * and intenal radius and angle calculated from measurements diff --git a/packages/sandy/src/index.js b/packages/sandy/src/index.js index ba090ff6a35..8c749862d4d 100644 --- a/packages/sandy/src/index.js +++ b/packages/sandy/src/index.js @@ -9,7 +9,7 @@ import draftWaistband from './waistband' const Pattern = new freesewing.Design(config, plugins) // Attach draft methods to prototype -Pattern.prototype.draftSkirt = part => draftSkirt(part) -Pattern.prototype.draftWaistband = part => draftWaistband(part) +Pattern.prototype.draftSkirt = (part) => draftSkirt(part) +Pattern.prototype.draftWaistband = (part) => draftWaistband(part) export default Pattern diff --git a/packages/sandy/src/straight-waistband.js b/packages/sandy/src/straight-waistband.js index 27d77df4060..a21d73adc13 100644 --- a/packages/sandy/src/straight-waistband.js +++ b/packages/sandy/src/straight-waistband.js @@ -1,4 +1,4 @@ -export default function(part) { +export default function (part) { /** * The straight waistband is just a rectangle with the width * of double the waistband width, since it will be folded diff --git a/packages/shin/src/waistband.js b/packages/shin/src/waistband.js index 0822c36429b..b00609fe610 100644 --- a/packages/shin/src/waistband.js +++ b/packages/shin/src/waistband.js @@ -1,4 +1,4 @@ -export default function(part) { +export default function (part) { let { store, macro, diff --git a/packages/simon/src/buttonplacket.js b/packages/simon/src/buttonplacket.js index f2b0f442b59..1fb9a789412 100644 --- a/packages/simon/src/buttonplacket.js +++ b/packages/simon/src/buttonplacket.js @@ -1,6 +1,6 @@ import { addButtons } from './shared' -export default part => { +export default (part) => { let { utils, sa, @@ -49,10 +49,7 @@ export default part => { .line(points.placketTopEdge) .line(points.placketBottomEdge) - paths.seam = paths.saBase - .clone() - .close() - .attr('class', 'fabric') + paths.seam = paths.saBase.clone().close().attr('class', 'fabric') // Complete pattern? if (complete) { diff --git a/packages/simon/src/cuff-barrel-angled.js b/packages/simon/src/cuff-barrel-angled.js index e457a53c041..00a57bf55ff 100644 --- a/packages/simon/src/cuff-barrel-angled.js +++ b/packages/simon/src/cuff-barrel-angled.js @@ -1,6 +1,6 @@ import { draftBarrelCuff, decorateBarrelCuff, paperlessBarrelCuff } from './shared' -export default part => { +export default (part) => { let { store, sa, points, Path, paths, complete, paperless, macro } = part.shorthand() draftBarrelCuff(part) diff --git a/packages/simon/src/cuff-barrel-rounded.js b/packages/simon/src/cuff-barrel-rounded.js index 091656f2311..afc45d3088b 100644 --- a/packages/simon/src/cuff-barrel-rounded.js +++ b/packages/simon/src/cuff-barrel-rounded.js @@ -1,6 +1,6 @@ import { draftBarrelCuff, decorateBarrelCuff, paperlessBarrelCuff } from './shared' -export default part => { +export default (part) => { let { store, sa, points, Path, paths, complete, paperless, macro } = part.shorthand() draftBarrelCuff(part) diff --git a/packages/simon/src/cuff-barrel-straight.js b/packages/simon/src/cuff-barrel-straight.js index 235f7aa9741..039f7b49aae 100644 --- a/packages/simon/src/cuff-barrel-straight.js +++ b/packages/simon/src/cuff-barrel-straight.js @@ -1,6 +1,6 @@ import { draftBarrelCuff, decorateBarrelCuff, paperlessBarrelCuff } from './shared' -export default part => { +export default (part) => { let { sa, points, Path, paths, complete, paperless } = part.shorthand() draftBarrelCuff(part) diff --git a/packages/simon/src/cuff-french-angled.js b/packages/simon/src/cuff-french-angled.js index 79b97ffe1f9..fdb58e68248 100644 --- a/packages/simon/src/cuff-french-angled.js +++ b/packages/simon/src/cuff-french-angled.js @@ -1,6 +1,6 @@ import { draftFrenchCuff, decorateFrenchCuff, paperlessFrenchCuff } from './shared' -export default part => { +export default (part) => { let { store, sa, points, Path, paths, complete, paperless } = part.shorthand() draftFrenchCuff(part) @@ -28,10 +28,7 @@ export default part => { .close() .attr('class', 'fabric') - paths.fold = new Path() - .move(points.midLeft) - .line(points.midRight) - .attr('class', 'dotted') + paths.fold = new Path().move(points.midLeft).line(points.midRight).attr('class', 'dotted') // Complete pattern? if (complete) { diff --git a/packages/simon/src/cuff-french-rounded.js b/packages/simon/src/cuff-french-rounded.js index a03fad4fff8..36267ad973d 100644 --- a/packages/simon/src/cuff-french-rounded.js +++ b/packages/simon/src/cuff-french-rounded.js @@ -1,6 +1,6 @@ import { draftFrenchCuff, decorateFrenchCuff, paperlessFrenchCuff } from './shared' -export default part => { +export default (part) => { let { store, sa, points, Path, paths, complete, paperless, macro } = part.shorthand() draftFrenchCuff(part) let height = store.get('cuffHeight') @@ -46,10 +46,7 @@ export default part => { .close() .attr('class', 'fabric') - paths.fold = new Path() - .move(points.midLeft) - .line(points.midRight) - .attr('class', 'dotted') + paths.fold = new Path().move(points.midLeft).line(points.midRight).attr('class', 'dotted') // Complete pattern? if (complete) { diff --git a/packages/simon/src/cuff-french-straight.js b/packages/simon/src/cuff-french-straight.js index fbed2df25ca..d31e48c2fd2 100644 --- a/packages/simon/src/cuff-french-straight.js +++ b/packages/simon/src/cuff-french-straight.js @@ -1,6 +1,6 @@ import { draftFrenchCuff, decorateFrenchCuff, paperlessFrenchCuff } from './shared' -export default part => { +export default (part) => { let { sa, points, Path, paths, complete, paperless } = part.shorthand() draftFrenchCuff(part) @@ -14,10 +14,7 @@ export default part => { .close() .attr('class', 'fabric') - paths.fold = new Path() - .move(points.midLeft) - .line(points.midRight) - .attr('class', 'dotted') + paths.fold = new Path().move(points.midLeft).line(points.midRight).attr('class', 'dotted') // Complete pattern? if (complete) { diff --git a/packages/simon/src/cuff.js b/packages/simon/src/cuff.js index 1fb92ab15c4..33d3f1cc9bb 100644 --- a/packages/simon/src/cuff.js +++ b/packages/simon/src/cuff.js @@ -5,7 +5,7 @@ import straightFrenchCuff from './cuff-french-straight' import angledFrenchCuff from './cuff-french-angled' import roundedFrenchCuff from './cuff-french-rounded' -export default part => { +export default (part) => { let { options } = part.shorthand() switch (options.cuffStyle) { case 'roundedBarrelCuff': diff --git a/packages/simon/src/front.js b/packages/simon/src/front.js index 712f547134c..3eb8793b327 100644 --- a/packages/simon/src/front.js +++ b/packages/simon/src/front.js @@ -110,15 +110,7 @@ export default (part) => { 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 7ba4baf9fd9..acd2c52aa4b 100644 --- a/packages/simon/src/frontleft-classic-cuton.js +++ b/packages/simon/src/frontleft-classic-cuton.js @@ -1,6 +1,6 @@ import { addButtonHoles } from './shared' -export default part => { +export default (part) => { let { sa, Point, @@ -33,10 +33,7 @@ export default part => { points.placketTopEdge = points.placketTopOuterEdgeFold.shift(180, width) points.placketBottomEdge = points.placketBottomOuterEdgeFold.shift(180, width) - paths.seam - .line(points.placketTopEdge) - .line(points.placketBottomEdge) - .close() + paths.seam.line(points.placketTopEdge).line(points.placketBottomEdge).close() // Complete pattern? if (complete) { @@ -66,7 +63,7 @@ export default part => { .line(points.placketTopOuterEdgeOver) .attr('class', 'dotted') .attr('data-text', 'matchHere') - .attr("data-text-class", "text-xs center") + .attr('data-text-class', 'text-xs center') paths.placketOuterEdgeUnder = new Path() .move(points.placketTopOuterEdgeUnder) .line(points.placketBottomOuterEdgeUnder) diff --git a/packages/simon/src/frontleft-classic-seperate.js b/packages/simon/src/frontleft-classic-seperate.js index 5aadcc5b316..f2741df8c62 100644 --- a/packages/simon/src/frontleft-classic-seperate.js +++ b/packages/simon/src/frontleft-classic-seperate.js @@ -1,4 +1,4 @@ -export default part => { +export default (part) => { let { utils, sa, diff --git a/packages/simon/src/frontleft-seamless.js b/packages/simon/src/frontleft-seamless.js index 369a72b4dd9..2914e77b5b5 100644 --- a/packages/simon/src/frontleft-seamless.js +++ b/packages/simon/src/frontleft-seamless.js @@ -1,6 +1,6 @@ import { addButtonHoles } from './shared' -export default part => { +export default (part) => { let { sa, points, Path, paths, complete, paperless, macro, options } = part.shorthand() let width = options.buttonholePlacketWidth points.placketCfNeck = points.cfNeck @@ -11,24 +11,18 @@ export default part => { points.placketBottomFold2 = points.cfHem.shift(180, width * 1.5) points.placketBottomEdge = points.cfHem.shift(180, width * 2.5) - paths.seam - .line(points.placketTopEdge) - .line(points.placketBottomEdge) - .close() + paths.seam.line(points.placketTopEdge).line(points.placketBottomEdge).close() // Complete pattern? if (complete) { // Placket help lines - paths.frontCenter = new Path() - .move(points.cfNeck) - .line(points.cfHem) - .attr('class', 'help') + paths.frontCenter = new Path().move(points.cfNeck).line(points.cfHem).attr('class', 'help') paths.placketFold1 = new Path() .move(points.placketBottomFold1) .line(points.placketTopFold1) .attr('class', 'dotted') .attr('data-text', 'matchHere') - .attr("data-text-class", "text-xs center") + .attr('data-text-class', 'text-xs center') paths.placketFold2 = new Path() .move(points.placketBottomFold2) .line(points.placketTopFold2) diff --git a/packages/simon/src/frontleft.js b/packages/simon/src/frontleft.js index 68ad31e24c6..e7e590be508 100644 --- a/packages/simon/src/frontleft.js +++ b/packages/simon/src/frontleft.js @@ -3,7 +3,7 @@ import frontLeftClassicSeperate from './frontleft-classic-seperate' import frontLeftClassicCuton from './frontleft-classic-cuton' import frontLeftSeamless from './frontleft-seamless' -export default part => { +export default (part) => { let { sa, options, complete, paperless, points, macro } = part.shorthand() if (complete && paperless) { diff --git a/packages/simon/src/frontright-classic-cuton.js b/packages/simon/src/frontright-classic-cuton.js index 3b5b1818ce0..ecfa0b4cc5d 100644 --- a/packages/simon/src/frontright-classic-cuton.js +++ b/packages/simon/src/frontright-classic-cuton.js @@ -1,6 +1,6 @@ import { addButtons } from './shared' -export default part => { +export default (part) => { let { utils, sa, @@ -29,25 +29,18 @@ export default part => { points.placketBottomOut = points.cfHem.shift(0, width / 2) points.placketBottomEdge = points.cfHem.shift(0, width * 1.5) - paths.seam - .line(points.placketTopEdge) - .line(points.placketBottomEdge) - .line(points.cfHem) - .close() + paths.seam.line(points.placketTopEdge).line(points.placketBottomEdge).line(points.cfHem).close() // Complete pattern? if (complete) { // Placket help lines - paths.frontCenter = new Path() - .move(points.cfNeck) - .line(points.cfHem) - .attr('class', 'help') + paths.frontCenter = new Path().move(points.cfNeck).line(points.cfHem).attr('class', 'help') paths.placketInnerFold = new Path() .move(points.placketBottomIn) .line(points.placketTopIn) .attr('class', 'dotted') .attr('data-text', 'matchHere') - .attr("data-text-class", "text-xs center") + .attr('data-text-class', 'text-xs center') paths.placketOuterFold = new Path() .move(points.placketTopOut) .line(points.placketBottomOut) diff --git a/packages/simon/src/frontright-classic-seperate.js b/packages/simon/src/frontright-classic-seperate.js index 630bf7ea1f5..051209282f2 100644 --- a/packages/simon/src/frontright-classic-seperate.js +++ b/packages/simon/src/frontright-classic-seperate.js @@ -1,4 +1,4 @@ -export default part => { +export default (part) => { let { snippets, utils, diff --git a/packages/simon/src/frontright-seamless.js b/packages/simon/src/frontright-seamless.js index ba8fa4ca137..0850a06c41a 100644 --- a/packages/simon/src/frontright-seamless.js +++ b/packages/simon/src/frontright-seamless.js @@ -1,6 +1,6 @@ import { addButtons } from './shared' -export default part => { +export default (part) => { let { sa, Point, points, Path, paths, complete, paperless, macro, options } = part.shorthand() let width = options.buttonPlacketWidth @@ -12,19 +12,12 @@ export default part => { points.placketBottomEdge = points.cfHem.shift(0, width * 2.5) points.placketBottomMatch = points.cfHem.shift(180, width / 2) points.placketTopMatch = points.cfNeck.shift(180, width / 2) - paths.seam - .line(points.placketTopEdge) - .line(points.placketBottomEdge) - .line(points.cfHem) - .close() + paths.seam.line(points.placketTopEdge).line(points.placketBottomEdge).line(points.cfHem).close() // Complete pattern? if (complete) { // Placket help lines - paths.frontCenter = new Path() - .move(points.cfNeck) - .line(points.cfHem) - .attr('class', 'help') + paths.frontCenter = new Path().move(points.cfNeck).line(points.cfHem).attr('class', 'help') paths.placketFold1 = new Path() .move(points.placketTopFold1) .line(points.placketBottomFold1) @@ -38,7 +31,7 @@ export default part => { .line(points.placketTopMatch) .attr('class', 'stroke-sm help') .attr('data-text', 'matchHere') - .attr("data-text-class", "text-xs center") + .attr('data-text-class', 'text-xs center') macro('sprinkle', { snippet: 'notch', on: [ diff --git a/packages/simon/src/frontright.js b/packages/simon/src/frontright.js index 2c1028e63f4..a735f81e6e6 100644 --- a/packages/simon/src/frontright.js +++ b/packages/simon/src/frontright.js @@ -3,7 +3,7 @@ import frontRightClassicSeperate from './frontright-classic-seperate' import frontRightClassicCuton from './frontright-classic-cuton' import frontRightSeamless from './frontright-seamless' -export default part => { +export default (part) => { let { sa, options, complete, paperless, points, macro, paths } = part.shorthand() macro('flip') if (complete) { diff --git a/packages/simon/src/index.js b/packages/simon/src/index.js index 8e7b0f6ba38..9d2b22be3c2 100644 --- a/packages/simon/src/index.js +++ b/packages/simon/src/index.js @@ -23,16 +23,16 @@ import draftCuff from './cuff' const Pattern = new freesewing.Design(config, [plugins, flipPlugin, buttonPlugin]) // Attach draft methods to prototype -Pattern.prototype.draftBase = function(part) { +Pattern.prototype.draftBase = function (part) { return new Brian(this.settings).draftBase(part) } -Pattern.prototype.draftFrontBase = function(part) { +Pattern.prototype.draftFrontBase = function (part) { return new Brian(this.settings).draftFront(part) } -Pattern.prototype.draftBackBase = function(part) { +Pattern.prototype.draftBackBase = function (part) { return new Brian(this.settings).draftBack(part) } -Pattern.prototype.draftSleeveBase = function(part) { +Pattern.prototype.draftSleeveBase = function (part) { let brian = new Brian(this.settings) return brian.draftSleeve(brian.draftSleevecap(part)) } diff --git a/packages/simon/src/sleeveplacket-overlap.js b/packages/simon/src/sleeveplacket-overlap.js index 82dcf37d61d..ac618a5a33a 100644 --- a/packages/simon/src/sleeveplacket-overlap.js +++ b/packages/simon/src/sleeveplacket-overlap.js @@ -1,4 +1,4 @@ -export default part => { +export default (part) => { let { measurements, sa, diff --git a/packages/simon/src/sleeveplacket-underlap.js b/packages/simon/src/sleeveplacket-underlap.js index 90e668f5cd5..abd8538f2f6 100644 --- a/packages/simon/src/sleeveplacket-underlap.js +++ b/packages/simon/src/sleeveplacket-underlap.js @@ -1,4 +1,4 @@ -export default part => { +export default (part) => { let { measurements, sa, diff --git a/packages/simon/src/yoke.js b/packages/simon/src/yoke.js index 3c419fc0ba8..619f6650725 100644 --- a/packages/simon/src/yoke.js +++ b/packages/simon/src/yoke.js @@ -1,4 +1,4 @@ -export default part => { +export default (part) => { let { sa, Point, @@ -66,10 +66,7 @@ export default part => { if (sa) { paths.sa = paths.saBase.offset(sa).attr('class', 'fabric sa') if (options.splitYoke) { - paths.sa = paths.sa - .line(points.cbNeck) - .move(points.cbYoke) - .line(paths.sa.start()) + paths.sa = paths.sa.line(points.cbNeck).move(points.cbYoke).line(paths.sa.start()) } } } diff --git a/packages/simone/src/fba-front.js b/packages/simone/src/fba-front.js index 6ff382e11ad..68b122bd9cc 100644 --- a/packages/simone/src/fba-front.js +++ b/packages/simone/src/fba-front.js @@ -280,16 +280,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) diff --git a/packages/simone/src/index.js b/packages/simone/src/index.js index c41a83f3588..25cedbe6e51 100644 --- a/packages/simone/src/index.js +++ b/packages/simone/src/index.js @@ -13,16 +13,16 @@ import draftFbaFront from './fba-front' const Pattern = new freesewing.Design(config, [plugins, flipPlugin, buttonPlugin, bustPlugin]) // Attach draft methods to prototype -Pattern.prototype.draftBase = function(part) { +Pattern.prototype.draftBase = function (part) { return new Brian(this.settings).draftBase(part) } -Pattern.prototype.draftFrontBase = function(part) { +Pattern.prototype.draftFrontBase = function (part) { return new Brian(this.settings).draftFront(part) } -Pattern.prototype.draftBackBase = function(part) { +Pattern.prototype.draftBackBase = function (part) { return new Brian(this.settings).draftBack(part) } -Pattern.prototype.draftSleeveBase = function(part) { +Pattern.prototype.draftSleeveBase = function (part) { let brian = new Brian(this.settings) return brian.draftSleeve(brian.draftSleevecap(part)) } @@ -45,7 +45,7 @@ let simonParts = [ ] for (let Part of simonParts) { - Pattern.prototype[`draft${Part}`] = function(part) { + Pattern.prototype[`draft${Part}`] = function (part) { let simon = new Simon(this.settings) return simon[`draft${Part}`](part) } diff --git a/packages/sven/src/index.js b/packages/sven/src/index.js index 17c3cc82851..bf055d9613a 100644 --- a/packages/sven/src/index.js +++ b/packages/sven/src/index.js @@ -12,16 +12,16 @@ import draftWaistband from './waistband' const Pattern = new freesewing.Design(config, plugins) // Attach draft methods to prototype -Pattern.prototype.draftBase = function(part) { +Pattern.prototype.draftBase = function (part) { return new Brian(this.settings).draftBase(part) } -Pattern.prototype.draftFrontBase = function(part) { +Pattern.prototype.draftFrontBase = function (part) { return new Brian(this.settings).draftFront(part) } -Pattern.prototype.draftBackBase = function(part) { +Pattern.prototype.draftBackBase = function (part) { return new Brian(this.settings).draftBack(part) } -Pattern.prototype.draftSleeveBase = function(part) { +Pattern.prototype.draftSleeveBase = function (part) { let brian = new Brian(this.settings) return brian.draftSleeve(brian.draftSleevecap(part)) } diff --git a/packages/sven/src/sleeve.js b/packages/sven/src/sleeve.js index 4cfdd136f7a..9ba1cc148b3 100644 --- a/packages/sven/src/sleeve.js +++ b/packages/sven/src/sleeve.js @@ -1,4 +1,4 @@ -export default part => { +export default (part) => { let { store, sa, points, paths, Path, complete, paperless, macro, options } = part.shorthand() if (options.ribbing) { @@ -33,10 +33,7 @@ export default part => { paths.saBase.render = false paths.hemBase.render = false paths.sa = paths.saBase.offset(sa).join(paths.hemBase.offset(sa * (options.ribbing ? 1 : 3))) - paths.sa - .line(paths.sa.start()) - .close() - .attr('class', 'fabric sa') + paths.sa.line(paths.sa.start()).close().attr('class', 'fabric sa') } } diff --git a/packages/tamiko/src/index.js b/packages/tamiko/src/index.js index 734b34046e5..1ea6bdec811 100644 --- a/packages/tamiko/src/index.js +++ b/packages/tamiko/src/index.js @@ -8,6 +8,6 @@ import draftTop from './top' const Pattern = new freesewing.Design(config, plugins) // Part draft method -Pattern.prototype.draftTop = part => draftTop(part) +Pattern.prototype.draftTop = (part) => draftTop(part) export default Pattern diff --git a/packages/theo/src/back-outer-pocket-bag.js b/packages/theo/src/back-outer-pocket-bag.js index 9eb1a8bc89a..e3bb84fde44 100644 --- a/packages/theo/src/back-outer-pocket-bag.js +++ b/packages/theo/src/back-outer-pocket-bag.js @@ -1,4 +1,4 @@ -export default function(part) { +export default function (part) { let { macro, points, Path, paths, complete, sa, paperless } = part.shorthand() // Make bag 2cm longer diff --git a/packages/theo/src/back-pocket-interfacing.js b/packages/theo/src/back-pocket-interfacing.js index ff178fb4598..0b9e776129b 100644 --- a/packages/theo/src/back-pocket-interfacing.js +++ b/packages/theo/src/back-pocket-interfacing.js @@ -1,4 +1,4 @@ -export default function(part) { +export default function (part) { let { macro, points, paths, complete, paperless } = part.shorthand() paths.seam.attributes.set('class', 'interfacing') diff --git a/packages/theo/src/belt-loop.js b/packages/theo/src/belt-loop.js index 713290adb3b..dcf334819f8 100644 --- a/packages/theo/src/belt-loop.js +++ b/packages/theo/src/belt-loop.js @@ -1,4 +1,4 @@ -export default function(part) { +export default function (part) { let { options, Point, points, Path, paths, complete, paperless, macro } = part.shorthand() let height = options.waistbandWidth + 30 diff --git a/packages/theo/src/fly-piece.js b/packages/theo/src/fly-piece.js index f6453cb1f4a..7f488892c61 100644 --- a/packages/theo/src/fly-piece.js +++ b/packages/theo/src/fly-piece.js @@ -1,4 +1,4 @@ -export default function(part) { +export default function (part) { let { snippets, Point, macro, points, Path, paths, complete, sa, paperless } = part.shorthand() // Clean up paths from paperless dimensions for (let id in paths) delete paths[id] diff --git a/packages/theo/src/fly-shield.js b/packages/theo/src/fly-shield.js index 292353e7851..5fec25feda1 100644 --- a/packages/theo/src/fly-shield.js +++ b/packages/theo/src/fly-shield.js @@ -1,4 +1,4 @@ -export default function(part) { +export default function (part) { let { macro, points, Path, paths, complete, sa, paperless } = part.shorthand() // Add points to make shift not impact curves diff --git a/packages/theo/src/front-pocket-bag.js b/packages/theo/src/front-pocket-bag.js index e759ad310cf..75bf289a239 100644 --- a/packages/theo/src/front-pocket-bag.js +++ b/packages/theo/src/front-pocket-bag.js @@ -1,4 +1,4 @@ -export default function(part) { +export default function (part) { let { Point, points, @@ -39,24 +39,15 @@ export default function(part) { .close() .attr('class', 'lining') - paths.flyEdge = new Path() - .move(points[-40]) - .line(points[814]) - .attr('class', 'lining lashed') + paths.flyEdge = new Path().move(points[-40]).line(points[814]).attr('class', 'lining lashed') - paths.pocket = new Path() - .move(points[60]) - .line(points[61]) - .attr('class', 'lining lashed') + paths.pocket = new Path().move(points[60]).line(points[61]).attr('class', 'lining lashed') // Complete pattern? if (complete) { if (sa) { paths.sa = paths.seam.offset(-1 * sa).attr('class', 'lining sa') - paths.flyEdeSa = new Path() - .move(points[816]) - .line(points[818]) - .attr('class', 'lining sa') + paths.flyEdeSa = new Path().move(points[816]).line(points[818]).attr('class', 'lining sa') } points.title = points.dartTip.clone() macro('title', { at: points.title, title: 'frontPocketBag', nr: 9 }) diff --git a/packages/theo/src/index.js b/packages/theo/src/index.js index a64489f66be..86b2853d87f 100644 --- a/packages/theo/src/index.js +++ b/packages/theo/src/index.js @@ -24,22 +24,22 @@ import draftBeltLoop from './belt-loop' const Pattern = new freesewing.Design(config, plugins) // Attach draft methods to prototype -Pattern.prototype.draftBack = part => draftBack(part) -Pattern.prototype.draftFront = part => draftFront(part) -Pattern.prototype.draftWaistbandInterfacingLeft = part => draftWaistbandInterfacingLeft(part) -Pattern.prototype.draftWaistbandInterfacingRight = part => draftWaistbandInterfacingRight(part) -Pattern.prototype.draftWaistbandLiningLeft = part => draftWaistbandLiningLeft(part) -Pattern.prototype.draftWaistbandLiningRight = part => draftWaistbandLiningRight(part) -Pattern.prototype.draftWaistbandLeft = part => draftWaistbandLeft(part) -Pattern.prototype.draftWaistbandRight = part => draftWaistbandRight(part) -Pattern.prototype.draftFlyPiece = part => draftFlyPiece(part) -Pattern.prototype.draftFlyShield = part => draftFlyShield(part) -Pattern.prototype.draftSidePiece = part => draftSidePiece(part) -Pattern.prototype.draftFrontPocketBag = part => draftFrontPocketBag(part) -Pattern.prototype.draftBackInnerPocketBag = part => draftBackInnerPocketBag(part) -Pattern.prototype.draftBackOuterPocketBag = part => draftBackOuterPocketBag(part) -Pattern.prototype.draftBackPocketFacing = part => draftBackPocketFacing(part) -Pattern.prototype.draftBackPocketInterfacing = part => draftBackPocketInterfacing(part) -Pattern.prototype.draftBeltLoop = part => draftBeltLoop(part) +Pattern.prototype.draftBack = (part) => draftBack(part) +Pattern.prototype.draftFront = (part) => draftFront(part) +Pattern.prototype.draftWaistbandInterfacingLeft = (part) => draftWaistbandInterfacingLeft(part) +Pattern.prototype.draftWaistbandInterfacingRight = (part) => draftWaistbandInterfacingRight(part) +Pattern.prototype.draftWaistbandLiningLeft = (part) => draftWaistbandLiningLeft(part) +Pattern.prototype.draftWaistbandLiningRight = (part) => draftWaistbandLiningRight(part) +Pattern.prototype.draftWaistbandLeft = (part) => draftWaistbandLeft(part) +Pattern.prototype.draftWaistbandRight = (part) => draftWaistbandRight(part) +Pattern.prototype.draftFlyPiece = (part) => draftFlyPiece(part) +Pattern.prototype.draftFlyShield = (part) => draftFlyShield(part) +Pattern.prototype.draftSidePiece = (part) => draftSidePiece(part) +Pattern.prototype.draftFrontPocketBag = (part) => draftFrontPocketBag(part) +Pattern.prototype.draftBackInnerPocketBag = (part) => draftBackInnerPocketBag(part) +Pattern.prototype.draftBackOuterPocketBag = (part) => draftBackOuterPocketBag(part) +Pattern.prototype.draftBackPocketFacing = (part) => draftBackPocketFacing(part) +Pattern.prototype.draftBackPocketInterfacing = (part) => draftBackPocketInterfacing(part) +Pattern.prototype.draftBeltLoop = (part) => draftBeltLoop(part) export default Pattern diff --git a/packages/theo/src/side-piece.js b/packages/theo/src/side-piece.js index 50fe5ac70cb..8094499c85a 100644 --- a/packages/theo/src/side-piece.js +++ b/packages/theo/src/side-piece.js @@ -1,4 +1,4 @@ -export default function(part) { +export default function (part) { let { macro, Point, points, Path, paths, complete, sa, paperless, snippets } = part.shorthand() // Clean up paths from paperless dimensions for (let id in paths) delete paths[id] diff --git a/packages/theo/src/waistband-left.js b/packages/theo/src/waistband-left.js index cd0458b996c..d382f8070aa 100644 --- a/packages/theo/src/waistband-left.js +++ b/packages/theo/src/waistband-left.js @@ -1,4 +1,4 @@ -export default function(part) { +export default function (part) { let { Point, points, macro, paths, complete, sa, paperless } = part.shorthand() paths.seam.attributes.set('class', 'fabric') diff --git a/packages/theo/src/waistband-lining-left.js b/packages/theo/src/waistband-lining-left.js index 8821a0b1894..6c0a669af90 100644 --- a/packages/theo/src/waistband-lining-left.js +++ b/packages/theo/src/waistband-lining-left.js @@ -1,4 +1,4 @@ -export default function(part) { +export default function (part) { let { Point, snippets, diff --git a/packages/theo/src/waistband-lining-right.js b/packages/theo/src/waistband-lining-right.js index 52dde06cfa8..1dbd7dea0ef 100644 --- a/packages/theo/src/waistband-lining-right.js +++ b/packages/theo/src/waistband-lining-right.js @@ -1,4 +1,4 @@ -export default function(part) { +export default function (part) { let { Point, macro, diff --git a/packages/theo/src/waistband-right.js b/packages/theo/src/waistband-right.js index cdff4725c3e..78ec11a7be3 100644 --- a/packages/theo/src/waistband-right.js +++ b/packages/theo/src/waistband-right.js @@ -1,4 +1,4 @@ -export default function(part) { +export default function (part) { let { Point, points, macro, paths, complete, sa, paperless } = part.shorthand() paths.seam.attributes.set('class', 'fabric') diff --git a/packages/trayvon/src/fabrictail.js b/packages/trayvon/src/fabrictail.js index adf5f970779..9f64a30e7df 100644 --- a/packages/trayvon/src/fabrictail.js +++ b/packages/trayvon/src/fabrictail.js @@ -1,6 +1,6 @@ import { calculateHelpers, draftTieShape, seamAllowance, tieShapeDimensions } from './shared' -export default part => { +export default (part) => { let { Path, complete, macro, options, paths, points, paperless, sa, store } = part.shorthand() calculateHelpers(part) diff --git a/packages/trayvon/src/fabrictip.js b/packages/trayvon/src/fabrictip.js index aca11899b8a..63bcd3f2d32 100644 --- a/packages/trayvon/src/fabrictip.js +++ b/packages/trayvon/src/fabrictip.js @@ -1,6 +1,6 @@ import { calculateHelpers, draftTieShape, seamAllowance, tieShapeDimensions } from './shared' -export default part => { +export default (part) => { let { Path, Snippet, diff --git a/packages/trayvon/src/index.js b/packages/trayvon/src/index.js index aebc6fef02c..f1dcd579a80 100644 --- a/packages/trayvon/src/index.js +++ b/packages/trayvon/src/index.js @@ -14,12 +14,12 @@ import draftLoop from './loop' const Pattern = new freesewing.Design(config, plugins) // Attach draft methods to prototype -Pattern.prototype.draftInterfacingTip = part => draftInterfacingTip(part) -Pattern.prototype.draftInterfacingTail = part => draftInterfacingTail(part) -Pattern.prototype.draftFabricTip = part => draftFabricTip(part) -Pattern.prototype.draftFabricTail = part => draftFabricTail(part) -Pattern.prototype.draftLiningTip = part => draftLiningTip(part) -Pattern.prototype.draftLiningTail = part => draftLiningTail(part) -Pattern.prototype.draftLoop = part => draftLoop(part) +Pattern.prototype.draftInterfacingTip = (part) => draftInterfacingTip(part) +Pattern.prototype.draftInterfacingTail = (part) => draftInterfacingTail(part) +Pattern.prototype.draftFabricTip = (part) => draftFabricTip(part) +Pattern.prototype.draftFabricTail = (part) => draftFabricTail(part) +Pattern.prototype.draftLiningTip = (part) => draftLiningTip(part) +Pattern.prototype.draftLiningTail = (part) => draftLiningTail(part) +Pattern.prototype.draftLoop = (part) => draftLoop(part) export default Pattern diff --git a/packages/trayvon/src/interfacingtail.js b/packages/trayvon/src/interfacingtail.js index 816a9900cad..d9ecbca9e64 100644 --- a/packages/trayvon/src/interfacingtail.js +++ b/packages/trayvon/src/interfacingtail.js @@ -1,6 +1,6 @@ import { draftTieShape, tieShapeDimensions, calculateHelpers } from './shared' -export default part => { +export default (part) => { let { options, paths, points, macro, complete, paperless, Path, store } = part.shorthand() calculateHelpers(part) diff --git a/packages/trayvon/src/interfacingtip.js b/packages/trayvon/src/interfacingtip.js index 6659a8917cb..fec3630b424 100644 --- a/packages/trayvon/src/interfacingtip.js +++ b/packages/trayvon/src/interfacingtip.js @@ -1,6 +1,6 @@ import { draftTieShape, tieShapeDimensions, calculateHelpers } from './shared' -export default part => { +export default (part) => { let { options, paths, points, macro, complete, paperless, Path } = part.shorthand() calculateHelpers(part) diff --git a/packages/trayvon/src/liningtail.js b/packages/trayvon/src/liningtail.js index 43af42df9a9..cf7331c0c3f 100644 --- a/packages/trayvon/src/liningtail.js +++ b/packages/trayvon/src/liningtail.js @@ -1,6 +1,6 @@ import { calculateHelpers, draftTieShape, seamAllowance, tieShapeDimensions } from './shared' -export default part => { +export default (part) => { let { Path, Snippet, diff --git a/packages/trayvon/src/liningtip.js b/packages/trayvon/src/liningtip.js index f861f74e0bb..8d15b58dd97 100644 --- a/packages/trayvon/src/liningtip.js +++ b/packages/trayvon/src/liningtip.js @@ -1,6 +1,6 @@ import { calculateHelpers, draftTieShape, tieShapeDimensions, seamAllowance } from './shared' -export default part => { +export default (part) => { let { Path, Snippet, diff --git a/packages/trayvon/src/loop.js b/packages/trayvon/src/loop.js index 1e978cad838..c2f12c5025c 100644 --- a/packages/trayvon/src/loop.js +++ b/packages/trayvon/src/loop.js @@ -1,4 +1,4 @@ -export default part => { +export default (part) => { let { points, Point, paths, Path, complete, paperless, store, macro } = part.shorthand() points.topLeft = new Point(0, 0) diff --git a/packages/tutorial/src/step1.js b/packages/tutorial/src/step1.js index b22cbb1053f..ce26efd6995 100644 --- a/packages/tutorial/src/step1.js +++ b/packages/tutorial/src/step1.js @@ -1,4 +1,4 @@ -export default function(part) { +export default function (part) { let { options, Point, diff --git a/packages/tutorial/src/step10.js b/packages/tutorial/src/step10.js index 9baae925f57..eea72ff4ef6 100644 --- a/packages/tutorial/src/step10.js +++ b/packages/tutorial/src/step10.js @@ -1,4 +1,4 @@ -export default function(part) { +export default function (part) { let { points, Path, paths, macro } = part.shorthand() macro('round', { diff --git a/packages/tutorial/src/step11.js b/packages/tutorial/src/step11.js index c7d9a2f3447..400503b919b 100644 --- a/packages/tutorial/src/step11.js +++ b/packages/tutorial/src/step11.js @@ -1,4 +1,4 @@ -export default function(part) { +export default function (part) { let { Point, points, paths, macro, complete, snippets, Snippet } = part.shorthand() // Complete? diff --git a/packages/tutorial/src/step4.js b/packages/tutorial/src/step4.js index b978c6b866f..34cf59f8fef 100644 --- a/packages/tutorial/src/step4.js +++ b/packages/tutorial/src/step4.js @@ -1,4 +1,4 @@ -export default function(part) { +export default function (part) { let { points, Path, paths } = part.shorthand() points.rightCp2 = points.rightCp1.flipY() diff --git a/packages/tutorial/src/step6.js b/packages/tutorial/src/step6.js index f0ba47421f1..5ee4e72a5b9 100644 --- a/packages/tutorial/src/step6.js +++ b/packages/tutorial/src/step6.js @@ -1,4 +1,4 @@ -export default function(part) { +export default function (part) { let { Point, points, Path, paths } = part.shorthand() points.edgeLeft = new Point(points.topLeft.x, points.left.y) diff --git a/packages/tutorial/src/step7.js b/packages/tutorial/src/step7.js index b3ac3e9eb85..d1b4b94c278 100644 --- a/packages/tutorial/src/step7.js +++ b/packages/tutorial/src/step7.js @@ -1,4 +1,4 @@ -export default function(part) { +export default function (part) { let { Point, points, macro } = part.shorthand() let strap = points.edgeTop.dy(points.top) diff --git a/packages/tutorial/src/step8.js b/packages/tutorial/src/step8.js index af7b618cffb..ee046983a5b 100644 --- a/packages/tutorial/src/step8.js +++ b/packages/tutorial/src/step8.js @@ -1,4 +1,4 @@ -export default function(part) { +export default function (part) { let { points, Path, paths, macro } = part.shorthand() let rotateThese = [ diff --git a/packages/tutorial/src/step9.js b/packages/tutorial/src/step9.js index 3135b297371..3251d60ce32 100644 --- a/packages/tutorial/src/step9.js +++ b/packages/tutorial/src/step9.js @@ -1,4 +1,4 @@ -export default function(part) { +export default function (part) { let { points, Path, paths } = part.shorthand() points.edgeTopRightCp = points.edgeTopLeftCp.flipX() diff --git a/packages/waralee/src/mini.js b/packages/waralee/src/mini.js index 4f7258e136d..0f610ddc486 100644 --- a/packages/waralee/src/mini.js +++ b/packages/waralee/src/mini.js @@ -2,7 +2,7 @@ // To keep you from printing it completely, you could print this part in paperless mode // and only have a single sheet with all the dimensions on it. -export default function(part) { +export default function (part) { let { options, /*measurements, diff --git a/packages/waralee/src/pants.js b/packages/waralee/src/pants.js index e6ad6053618..3238c87b2d8 100644 --- a/packages/waralee/src/pants.js +++ b/packages/waralee/src/pants.js @@ -1,4 +1,4 @@ -export default function(part) { +export default function (part) { let { options, points,