From 7bf70f12d3b8cd4fb0439e03e16bb731ca0fad6c Mon Sep 17 00:00:00 2001
From: joostdecock <joost@joost.at>
Date: Sun, 11 Sep 2022 15:48:48 +0200
Subject: [PATCH] chore(jaeger): Port to v3 stage 2

---
 designs/jaeger/src/back.mjs            | 35 +++++++++++++-------------
 designs/jaeger/src/backbase.mjs        |  3 +--
 designs/jaeger/src/chestpocketbag.mjs  | 17 ++++++++++---
 designs/jaeger/src/chestpocketwelt.mjs | 17 ++++++++++---
 designs/jaeger/src/collar.mjs          | 17 ++++++++++---
 designs/jaeger/src/collarstand.mjs     | 29 +++++++++++----------
 designs/jaeger/src/front.mjs           | 35 +++++++++++++-------------
 designs/jaeger/src/frontbase.mjs       |  4 +--
 designs/jaeger/src/innerpocketbag.mjs  | 17 ++++++++++---
 designs/jaeger/src/innerpocketwelt.mjs | 15 ++++++++---
 designs/jaeger/src/pocket.mjs          | 17 ++++++++++---
 designs/jaeger/src/pocketlining.mjs    | 16 +++++++++---
 designs/jaeger/src/side.mjs            | 31 +++++++++++------------
 designs/jaeger/src/topsleeve.mjs       | 17 ++++++++++---
 designs/jaeger/src/undercollar.mjs     | 14 ++++++++---
 designs/jaeger/src/undersleeve.mjs     | 17 ++++++++++---
 16 files changed, 191 insertions(+), 110 deletions(-)

diff --git a/designs/jaeger/src/back.mjs b/designs/jaeger/src/back.mjs
index b0cb43e934a..62a16e18b83 100644
--- a/designs/jaeger/src/back.mjs
+++ b/designs/jaeger/src/back.mjs
@@ -1,24 +1,23 @@
 import { backBase } from './backbase.mjs'
 import { backVent, backVentLength } from './options.mjs'
 
-function jaegerBack(part) {
-  const {
-    paperless,
-    sa,
-    snippets,
-    Snippet,
-    utils,
-    store,
-    complete,
-    points,
-    measurements,
-    options,
-    macro,
-    Point,
-    paths,
-    Path,
-  } = part.shorthand()
-
+function jaegerBack({
+  paperless,
+  sa,
+  snippets,
+  Snippet,
+  utils,
+  store,
+  complete,
+  points,
+  measurements,
+  options,
+  macro,
+  Point,
+  paths,
+  Path,
+  part,
+}) {
   // Back vent(s)
   let ventY = points.cbHips.y - points.cbWaistCp2.dy(points.cbHips) * options.backVentLength
   if (options.backVent === 1) {
diff --git a/designs/jaeger/src/backbase.mjs b/designs/jaeger/src/backbase.mjs
index 5f2abe949fe..ee16e225ab4 100644
--- a/designs/jaeger/src/backbase.mjs
+++ b/designs/jaeger/src/backbase.mjs
@@ -10,9 +10,8 @@ import {
   reduceHipsStandardFraction,
 } from './options.mjs'
 
-function jaegerBackBase(part) {
+function jaegerBackBase({ store, points, measurements, options, Point, paths, Path, part }) {
   calculateRatios(part)
-  let { store, points, measurements, options, Point, paths, Path } = part.shorthand()
 
   /**
    * Shaping the back seam
diff --git a/designs/jaeger/src/chestpocketbag.mjs b/designs/jaeger/src/chestpocketbag.mjs
index b38f3477db6..f049458e15d 100644
--- a/designs/jaeger/src/chestpocketbag.mjs
+++ b/designs/jaeger/src/chestpocketbag.mjs
@@ -1,9 +1,18 @@
 import { front } from './front.mjs'
 
-function jaegerChestPocketBag(part) {
-  const { paperless, sa, store, complete, points, options, macro, Point, paths, Path } =
-    part.shorthand()
-
+function jaegerChestPocketBag({
+  paperless,
+  sa,
+  store,
+  complete,
+  points,
+  options,
+  macro,
+  Point,
+  paths,
+  Path,
+  part,
+}) {
   const width = store.get('chestPocketWidth')
   const welt = store.get('chestPocketWeltHeight')
   const height = width * options.chestPocketDepth
diff --git a/designs/jaeger/src/chestpocketwelt.mjs b/designs/jaeger/src/chestpocketwelt.mjs
index b1f1ee3d677..3e0d0f7ccb2 100644
--- a/designs/jaeger/src/chestpocketwelt.mjs
+++ b/designs/jaeger/src/chestpocketwelt.mjs
@@ -1,9 +1,18 @@
 import { front } from './front.mjs'
 
-function jaegerChestPocketWelt(part) {
-  let { paperless, sa, store, complete, points, options, macro, Point, paths, Path } =
-    part.shorthand()
-
+function jaegerChestPocketWelt({
+  paperless,
+  sa,
+  store,
+  complete,
+  points,
+  options,
+  macro,
+  Point,
+  paths,
+  Path,
+  part,
+}) {
   let width = store.get('chestPocketWidth')
   let height = store.get('chestPocketWeltHeight')
   let angle = options.chestPocketAngle
diff --git a/designs/jaeger/src/collar.mjs b/designs/jaeger/src/collar.mjs
index f35f13a4d5c..866761464f7 100644
--- a/designs/jaeger/src/collar.mjs
+++ b/designs/jaeger/src/collar.mjs
@@ -8,10 +8,19 @@ import { collarRoll } from './options.mjs'
  * experience, or more tailoring exprience.
  */
 
-function jaegerCollar(part) {
-  const { paperless, sa, snippets, complete, points, options, macro, paths, Path, store } =
-    part.shorthand()
-
+function jaegerCollar({
+  paperless,
+  sa,
+  snippets,
+  complete,
+  points,
+  options,
+  macro,
+  paths,
+  Path,
+  store,
+  part,
+}) {
   // Add extra fabric for collar roll
   store.set('collarRoll', points.collarstandCbTop.dist(points.collarCbTop) * options.collarRoll)
   points.collarCbTopRoll = points.collarCbTop.shift(-90, store.get('collarRoll'))
diff --git a/designs/jaeger/src/collarstand.mjs b/designs/jaeger/src/collarstand.mjs
index 40667644a5b..c36c36bdc0b 100644
--- a/designs/jaeger/src/collarstand.mjs
+++ b/designs/jaeger/src/collarstand.mjs
@@ -9,21 +9,20 @@ import { collarSpread } from './options.mjs'
  * experience, or more tailoring exprience.
  */
 
-function jaegerCollarStand(part) {
-  const {
-    paperless,
-    sa,
-    store,
-    complete,
-    points,
-    measurements,
-    options,
-    macro,
-    snippets,
-    paths,
-    Path,
-  } = part.shorthand()
-
+function jaegerCollarStand({
+  paperless,
+  sa,
+  store,
+  complete,
+  points,
+  measurements,
+  options,
+  macro,
+  snippets,
+  paths,
+  Path,
+  part,
+}) {
   // Only keep what's relevant from the front part
   const collarPoints = [
     'notch',
diff --git a/designs/jaeger/src/front.mjs b/designs/jaeger/src/front.mjs
index 935c46871c0..dfa367d04ec 100644
--- a/designs/jaeger/src/front.mjs
+++ b/designs/jaeger/src/front.mjs
@@ -27,24 +27,23 @@ import {
   lapelReduction,
 } from './options.mjs'
 
-function jaegerFront(part) {
-  const {
-    paperless,
-    sa,
-    snippets,
-    Snippet,
-    utils,
-    store,
-    complete,
-    points,
-    measurements,
-    options,
-    macro,
-    Point,
-    paths,
-    Path,
-  } = part.shorthand()
-
+function jaegerFront({
+  paperless,
+  sa,
+  snippets,
+  Snippet,
+  utils,
+  store,
+  complete,
+  points,
+  measurements,
+  options,
+  macro,
+  Point,
+  paths,
+  Path,
+  part,
+}) {
   // Front closure overlap
   points.neckEdge = points.cfNeck.shift(180, measurements.chest * options.frontOverlap)
   points.hemEdge = new Point(points.neckEdge.x, points.cfHem.y)
diff --git a/designs/jaeger/src/frontbase.mjs b/designs/jaeger/src/frontbase.mjs
index 621aead2cb1..f5e0549db8a 100644
--- a/designs/jaeger/src/frontbase.mjs
+++ b/designs/jaeger/src/frontbase.mjs
@@ -16,9 +16,7 @@ import {
   reduceHipsStandardFraction,
 } from './options.mjs'
 
-function jaegerFrontBase(part) {
-  let { store, points, utils, options, Point, paths, Path } = part.shorthand()
-
+function jaegerFrontBase({ store, points, utils, options, Point, paths, Path, part }) {
   /**
    * Add side part from back to front, draw front style line
    */
diff --git a/designs/jaeger/src/innerpocketbag.mjs b/designs/jaeger/src/innerpocketbag.mjs
index 3b777b0d8d9..335b52971f8 100644
--- a/designs/jaeger/src/innerpocketbag.mjs
+++ b/designs/jaeger/src/innerpocketbag.mjs
@@ -1,9 +1,18 @@
 import { front } from './front.mjs'
 
-function jaegerInnerPocketBag(part) {
-  const { paperless, sa, store, complete, points, options, macro, Point, paths, Path } =
-    part.shorthand()
-
+function jaegerInnerPocketBag({
+  paperless,
+  sa,
+  store,
+  complete,
+  points,
+  options,
+  macro,
+  Point,
+  paths,
+  Path,
+  part,
+}) {
   const width = store.get('innerPocketWidth')
   const welt = store.get('innerPocketWeltHeight')
   const height = width * options.innerPocketDepth
diff --git a/designs/jaeger/src/innerpocketwelt.mjs b/designs/jaeger/src/innerpocketwelt.mjs
index 0b0a71138de..bc05e5b0dab 100644
--- a/designs/jaeger/src/innerpocketwelt.mjs
+++ b/designs/jaeger/src/innerpocketwelt.mjs
@@ -1,8 +1,17 @@
 import { front } from './front.mjs'
 
-function jaegerInnerPocketWelt(part) {
-  const { paperless, sa, store, complete, points, macro, Point, paths, Path } = part.shorthand()
-
+function jaegerInnerPocketWelt({
+  paperless,
+  sa,
+  store,
+  complete,
+  points,
+  macro,
+  Point,
+  paths,
+  Path,
+  part,
+}) {
   const width = store.get('innerPocketWidth')
   const height = store.get('innerPocketWeltHeight')
 
diff --git a/designs/jaeger/src/pocket.mjs b/designs/jaeger/src/pocket.mjs
index 338a9dfd36a..291fcc41f85 100644
--- a/designs/jaeger/src/pocket.mjs
+++ b/designs/jaeger/src/pocket.mjs
@@ -2,10 +2,19 @@ import { frontBase } from './frontbase.mjs'
 import { backBase } from './backbase.mjs'
 import { pocketFoldover } from './options.mjs'
 
-function jaegerPocket(part) {
-  const { paperless, sa, store, complete, points, options, macro, Point, paths, Path } =
-    part.shorthand()
-
+function jaegerPocket({
+  paperless,
+  sa,
+  store,
+  complete,
+  points,
+  options,
+  macro,
+  Point,
+  paths,
+  Path,
+  part,
+}) {
   const width = store.get('pocketWidth')
   const depth = store.get('pocketDepth')
 
diff --git a/designs/jaeger/src/pocketlining.mjs b/designs/jaeger/src/pocketlining.mjs
index aa0ac1ee0c2..b18e260e05b 100644
--- a/designs/jaeger/src/pocketlining.mjs
+++ b/designs/jaeger/src/pocketlining.mjs
@@ -1,9 +1,17 @@
 import { pocket } from './pocket.mjs'
 
-function jaegerPocketLining(part) {
-  const { paperless, sa, snippets, complete, points, options, macro, paths, Path } =
-    part.shorthand()
-
+function jaegerPocketLining({
+  paperless,
+  sa,
+  snippets,
+  complete,
+  points,
+  options,
+  macro,
+  paths,
+  Path,
+  part,
+}) {
   // Adapt length
   points.topLeft = points.edgeLeft.flipY(points.topLeft)
   points.topRight = points.edgeRight.flipY(points.topRight)
diff --git a/designs/jaeger/src/side.mjs b/designs/jaeger/src/side.mjs
index 0c6dc74d097..f51df751c6f 100644
--- a/designs/jaeger/src/side.mjs
+++ b/designs/jaeger/src/side.mjs
@@ -2,22 +2,21 @@ import { frontBase } from './frontbase.mjs'
 import { backBase } from './backbase.mjs'
 import { backVent, backVentLength } from './options.mjs'
 
-function jaegerSide(part) {
-  const {
-    paperless,
-    sa,
-    snippets,
-    Snippet,
-    utils,
-    complete,
-    points,
-    measurements,
-    options,
-    macro,
-    paths,
-    Path,
-  } = part.shorthand()
-
+function jaegerSide({
+  paperless,
+  sa,
+  snippets,
+  Snippet,
+  utils,
+  complete,
+  points,
+  measurements,
+  options,
+  macro,
+  paths,
+  Path,
+  part,
+}) {
   // Double back vent
   if (options.backVent === 2) {
     let ventY = points.bsHips.y - points.bsWaistCp1.dy(points.bsHips) * options.backVentLength
diff --git a/designs/jaeger/src/topsleeve.mjs b/designs/jaeger/src/topsleeve.mjs
index a18e0e339ba..69ccc29106d 100644
--- a/designs/jaeger/src/topsleeve.mjs
+++ b/designs/jaeger/src/topsleeve.mjs
@@ -1,10 +1,19 @@
 import { topSleeve as bentTopSleeve } from '@freesewing/bent'
 import { sleeveVentLength, sleeveVentWidth } from './options.mjs'
 
-function jaegerTopSleeve(part) {
-  const { paperless, sa, utils, complete, points, measurements, options, macro, paths, Path } =
-    part.shorthand()
-
+function jaegerTopSleeve({
+  paperless,
+  sa,
+  utils,
+  complete,
+  points,
+  measurements,
+  options,
+  macro,
+  paths,
+  Path,
+  part,
+}) {
   // Vent
   let slope = 15
   let width = measurements.wrist * (1 + options.cuffEase) * options.sleeveVentWidth
diff --git a/designs/jaeger/src/undercollar.mjs b/designs/jaeger/src/undercollar.mjs
index ec80c0fd1e2..19be11e0fb6 100644
--- a/designs/jaeger/src/undercollar.mjs
+++ b/designs/jaeger/src/undercollar.mjs
@@ -7,9 +7,17 @@ import { collarStand } from './collarstand.mjs'
  * experience, or more tailoring exprience.
  */
 
-function jaegerUnderCollar(part) {
-  const { paperless, sa, snippets, complete, points, macro, paths, Path } = part.shorthand()
-
+function jaegerUnderCollar({
+  paperless,
+  sa,
+  snippets,
+  complete,
+  points,
+  macro,
+  paths,
+  Path,
+  part,
+}) {
   // Clean up
   for (let i of Object.keys(paths)) delete paths[i]
   for (let i of Object.keys(snippets)) delete snippets[i]
diff --git a/designs/jaeger/src/undersleeve.mjs b/designs/jaeger/src/undersleeve.mjs
index 8f4e8287b0c..c6fb6ea9988 100644
--- a/designs/jaeger/src/undersleeve.mjs
+++ b/designs/jaeger/src/undersleeve.mjs
@@ -1,10 +1,19 @@
 import { underSleeve as bentUnderSleeve } from '@freesewing/bent'
 import { sleeveVentLength, sleeveVentWidth } from './options.mjs'
 
-function jaegerUnderSleeve(part) {
-  const { paperless, sa, utils, complete, points, measurements, options, macro, paths, Path } =
-    part.shorthand()
-
+function jaegerUnderSleeve({
+  paperless,
+  sa,
+  utils,
+  complete,
+  points,
+  measurements,
+  options,
+  macro,
+  paths,
+  Path,
+  part,
+}) {
   // Vent
   let slope = 15
   let width = measurements.wrist * (1 + options.cuffEase) * options.sleeveVentWidth