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

---
 designs/sven/src/cuff.mjs      |  6 +++---
 designs/sven/src/frontback.mjs | 28 ++++++++++++++--------------
 designs/sven/src/shared.mjs    | 10 ++++++----
 designs/sven/src/sleeve.mjs    |  7 ++-----
 designs/sven/src/waistband.mjs |  6 +++---
 5 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/designs/sven/src/cuff.mjs b/designs/sven/src/cuff.mjs
index a927b92e352..f165ead7e0b 100644
--- a/designs/sven/src/cuff.mjs
+++ b/designs/sven/src/cuff.mjs
@@ -2,12 +2,12 @@ import { draftRibbing } from './shared.mjs'
 import { ribbing } from './frontback.mjs'
 import { sleeve } from './sleeve.mjs'
 
-function svenCuff(part) {
-  const { measurements, sa, points, complete, paperless, macro, options } = part.shorthand()
+function svenCuff(params) {
+  const { measurements, sa, points, complete, paperless, macro, options, part } = params
 
   if (!options.ribbing) return part
   const length = measurements.wrist * (1 + options.cuffEase) * (1 - options.ribbingStretch)
-  draftRibbing(part, length)
+  draftRibbing(params, length)
 
   // Complete pattern?
   if (complete) {
diff --git a/designs/sven/src/frontback.mjs b/designs/sven/src/frontback.mjs
index 44ef4168ae8..8398c6ee14e 100644
--- a/designs/sven/src/frontback.mjs
+++ b/designs/sven/src/frontback.mjs
@@ -1,19 +1,19 @@
 import { front as brianFront, back as brianBack } from '@freesewing/brian'
 
-function svenFrontBack(part) {
-  const {
-    store,
-    measurements,
-    sa,
-    Point,
-    points,
-    Path,
-    paths,
-    complete,
-    paperless,
-    macro,
-    options,
-  } = part.shorthand()
+function svenFrontBack({
+  store,
+  measurements,
+  sa,
+  Point,
+  points,
+  Path,
+  paths,
+  complete,
+  paperless,
+  macro,
+  options,
+  part,
+}) {
   let front = true
   if (typeof points.cfHem === 'undefined') front = false
 
diff --git a/designs/sven/src/shared.mjs b/designs/sven/src/shared.mjs
index 245636fa911..7f0d76ad4aa 100644
--- a/designs/sven/src/shared.mjs
+++ b/designs/sven/src/shared.mjs
@@ -1,5 +1,5 @@
-export const draftRibbing = function (part, length) {
-  const {
+export const draftRibbing = function (
+  {
     store,
     measurements,
     options,
@@ -12,8 +12,10 @@ export const draftRibbing = function (part, length) {
     paperless,
     macro,
     units,
-  } = part.shorthand()
-
+    part,
+  },
+  length
+) {
   let height = (measurements.hpsToWaistBack + measurements.waistToHips) * options.ribbingHeight
   if (part.context.settings.sample) store.set('ribbingHeight', height)
   else store.setIfUnset('ribbingHeight', height)
diff --git a/designs/sven/src/sleeve.mjs b/designs/sven/src/sleeve.mjs
index 0f70a68a7fa..ef757ee26f3 100644
--- a/designs/sven/src/sleeve.mjs
+++ b/designs/sven/src/sleeve.mjs
@@ -1,9 +1,7 @@
 import { sleeve as brianSleeve } from '@freesewing/brian'
 import { ribbing, front, back } from './frontback.mjs'
 
-function svenSleeve(part) {
-  const { store, sa, points, paths, Path, complete, paperless, macro, options } = part.shorthand()
-
+function svenSleeve({ store, sa, points, paths, Path, complete, paperless, macro, options, part }) {
   if (options.ribbing) {
     const ribbingHeight = store.get('ribbingHeight')
     points.wristLeft = points.wristLeft.shift(90, ribbingHeight)
@@ -11,7 +9,6 @@ function svenSleeve(part) {
     points.centerWrist = points.centerWrist.shift(90, ribbingHeight)
   }
 
-
   paths.seam = new Path()
     .move(points.wristRight)
     .line(points.bicepsRight)
@@ -76,7 +73,7 @@ export const sleeve = {
   name: 'sven.sleeve',
   from: brianSleeve,
   hideDependencies: true,
-  after: [ front, back ],
+  after: [front, back],
   options: {
     ribbing,
     cuffEase: { pct: 20, min: 0, max: 200, menu: 'fit' },
diff --git a/designs/sven/src/waistband.mjs b/designs/sven/src/waistband.mjs
index b5e789c9283..f2c21b5c97d 100644
--- a/designs/sven/src/waistband.mjs
+++ b/designs/sven/src/waistband.mjs
@@ -2,13 +2,13 @@ import { draftRibbing } from './shared.mjs'
 import { ribbing, hipsEase } from './frontback.mjs'
 import { ribbingStretch } from './cuff.mjs'
 
-function svenWaistband(part) {
-  const { measurements, sa, points, complete, paperless, macro, options } = part.shorthand()
+function svenWaistband(params) {
+  const { measurements, sa, points, complete, paperless, macro, options, part } = params
 
   if (!options.ribbing) return part
 
   let length = measurements.hips * (1 + options.hipsEase) * (1 - options.ribbingStretch)
-  draftRibbing(part, length)
+  draftRibbing(params, length)
 
   // Complete pattern?
   if (complete) {