From 1812f70f3f6b099ec7b849a8ca2f7936fae40773 Mon Sep 17 00:00:00 2001
From: joostdecock <joost@joost.at>
Date: Sun, 11 Sep 2022 16:11:49 +0200
Subject: [PATCH] chore(paco): Port to v3 stage 2

---
 designs/paco/src/back.mjs                     | 30 ++++++++---------
 designs/paco/src/backpocketbag.mjs            | 16 ++++++---
 designs/paco/src/backpocketwelt.mjs           | 17 +++++++---
 .../paco/src/backpocketweltinterfacing.mjs    | 14 ++++++--
 designs/paco/src/cuff.mjs                     | 16 +++++++--
 designs/paco/src/front.mjs                    | 33 +++++++++----------
 designs/paco/src/frontpocketbag.mjs           | 16 ++++++---
 designs/paco/src/waistband.mjs                | 17 +++++++---
 8 files changed, 104 insertions(+), 55 deletions(-)

diff --git a/designs/paco/src/back.mjs b/designs/paco/src/back.mjs
index b9dfa403d50..b4c9a0d9e83 100644
--- a/designs/paco/src/back.mjs
+++ b/designs/paco/src/back.mjs
@@ -2,7 +2,20 @@ import { back as titanBack } from '@freesewing/titan'
 import { pctBasedOn } from '@freesewing/core'
 import { elastics, smallSteps } from '@freesewing/snapseries'
 
-function pacoBack(part) {
+function pacoBack({
+  store,
+  sa,
+  points,
+  Path,
+  paths,
+  options,
+  measurements,
+  complete,
+  paperless,
+  macro,
+  absoluteOptions,
+  part,
+}) {
   /*
    * Helper method to draw the inseam path
    */
@@ -45,21 +58,6 @@ function pacoBack(part) {
       .close()
   }
 
-  // Shorthand call
-  let {
-    store,
-    sa,
-    points,
-    Path,
-    paths,
-    options,
-    measurements,
-    complete,
-    paperless,
-    macro,
-    absoluteOptions,
-  } = part.shorthand()
-
   // Adapt bottom leg width based on heel & heel ease
   let quarterHeel = (measurements.heel * (1 + options.heelEase) * options.legBalance) / 2
   points.floorOut = points.floor.shift(0, quarterHeel)
diff --git a/designs/paco/src/backpocketbag.mjs b/designs/paco/src/backpocketbag.mjs
index 4ea59f9dd88..6d6041854f3 100644
--- a/designs/paco/src/backpocketbag.mjs
+++ b/designs/paco/src/backpocketbag.mjs
@@ -1,9 +1,17 @@
 import { back } from './back.mjs'
 
-function pacoBackPocketBag(part) {
-  const { sa, points, Path, paths, snippets, options, complete, paperless, macro } =
-    part.shorthand()
-
+function pacoBackPocketBag({
+  sa,
+  points,
+  Path,
+  paths,
+  snippets,
+  options,
+  complete,
+  paperless,
+  macro,
+  part,
+}) {
   // Don't bother of we're not drafting back pockets
   if (!options.backPockets) {
     part.render = false
diff --git a/designs/paco/src/backpocketwelt.mjs b/designs/paco/src/backpocketwelt.mjs
index afc2debea2f..cf2c94e210f 100644
--- a/designs/paco/src/backpocketwelt.mjs
+++ b/designs/paco/src/backpocketwelt.mjs
@@ -1,9 +1,18 @@
 import { backPocketBag } from './backpocketbag.mjs'
 
-function pacoBackPocketWelt(part) {
-  const { sa, Point, points, Path, paths, snippets, options, complete, paperless, macro } =
-    part.shorthand()
-
+function pacoBackPocketWelt({
+  sa,
+  Point,
+  points,
+  Path,
+  paths,
+  snippets,
+  options,
+  complete,
+  paperless,
+  macro,
+  part,
+}) {
   // Don't bother of we're not drafting back pockets
   if (!options.backPockets) {
     part.render = false
diff --git a/designs/paco/src/backpocketweltinterfacing.mjs b/designs/paco/src/backpocketweltinterfacing.mjs
index 38df316850f..74540a70f97 100644
--- a/designs/paco/src/backpocketweltinterfacing.mjs
+++ b/designs/paco/src/backpocketweltinterfacing.mjs
@@ -1,8 +1,16 @@
 import { backPocketWelt } from './backpocketwelt.mjs'
 
-function pacoBackPocketWeltInterfacing(part) {
-  const { points, Path, paths, snippets, options, complete, paperless, macro } = part.shorthand()
-
+function pacoBackPocketWeltInterfacing({
+  points,
+  Path,
+  paths,
+  snippets,
+  options,
+  complete,
+  paperless,
+  macro,
+  part,
+}) {
   // Don't bother of we're not drafting back pockets
   if (!options.backPockets) {
     part.render = false
diff --git a/designs/paco/src/cuff.mjs b/designs/paco/src/cuff.mjs
index 07c7bfd0c10..fa404025eaf 100644
--- a/designs/paco/src/cuff.mjs
+++ b/designs/paco/src/cuff.mjs
@@ -1,8 +1,18 @@
 import { front } from './front.mjs'
 
-function pacoCuff(part) {
-  const { store, sa, Point, points, Path, paths, options, complete, paperless, macro } =
-    part.shorthand()
+function pacoCuff({
+  store,
+  sa,
+  Point,
+  points,
+  Path,
+  paths,
+  options,
+  complete,
+  paperless,
+  macro,
+  part,
+}) {
   if (!options.elasticatedHem) {
     part.render = false
     return part
diff --git a/designs/paco/src/front.mjs b/designs/paco/src/front.mjs
index 363489f3d60..904def4f2bc 100644
--- a/designs/paco/src/front.mjs
+++ b/designs/paco/src/front.mjs
@@ -1,7 +1,22 @@
 import { front as titanFront } from '@freesewing/titan'
 import { back } from './back.mjs'
 
-function pacoFront(part) {
+function pacoFront({
+  utils,
+  store,
+  sa,
+  Point,
+  points,
+  Path,
+  paths,
+  options,
+  measurements,
+  complete,
+  paperless,
+  macro,
+  absoluteOptions,
+  part,
+}) {
   /*
    * Helper method to draw the inseam path
    */
@@ -54,22 +69,6 @@ function pacoFront(part) {
    */
   const outseamDelta = () => drawOutseam(true).length() - store.get('pacoOutseamBack')
 
-  let {
-    utils,
-    store,
-    sa,
-    Point,
-    points,
-    Path,
-    paths,
-    options,
-    measurements,
-    complete,
-    paperless,
-    macro,
-    absoluteOptions,
-  } = part.shorthand()
-
   // Adapt bottom leg based on heel and heel ease
   let quarterHeel = (measurements.heel * (1 + options.heelEase) * (1 - options.legBalance)) / 2
   points.floorOut = points.floor.shift(180, quarterHeel)
diff --git a/designs/paco/src/frontpocketbag.mjs b/designs/paco/src/frontpocketbag.mjs
index bc425249fc9..bb3d0415c5d 100644
--- a/designs/paco/src/frontpocketbag.mjs
+++ b/designs/paco/src/frontpocketbag.mjs
@@ -1,9 +1,17 @@
 import { front } from './front.mjs'
 
-function pacoFrontPocketBag(part) {
-  const { sa, points, Path, paths, snippets, options, complete, paperless, macro } =
-    part.shorthand()
-
+function pacoFrontPocketBag({
+  sa,
+  points,
+  Path,
+  paths,
+  snippets,
+  options,
+  complete,
+  paperless,
+  macro,
+  part,
+}) {
   // Don't bother of we're not drafting front pockets
   if (!options.frontPockets) {
     part.render = false
diff --git a/designs/paco/src/waistband.mjs b/designs/paco/src/waistband.mjs
index a9a4f10c45a..4831ba32e08 100644
--- a/designs/paco/src/waistband.mjs
+++ b/designs/paco/src/waistband.mjs
@@ -1,9 +1,18 @@
 import { back } from './back.mjs'
 
-function pacoWaistband(part) {
-  const { utils, store, sa, Point, points, Path, paths, complete, paperless, macro } =
-    part.shorthand()
-
+function pacoWaistband({
+  utils,
+  store,
+  sa,
+  Point,
+  points,
+  Path,
+  paths,
+  complete,
+  paperless,
+  macro,
+  part,
+}) {
   points.topLeft = new Point(0, 0)
   points.midLeft = new Point(0, store.get('waistbandWidth'))
   points.bottomLeft = new Point(0, store.get('waistbandWidth') * 2)