Merge pull request #22 from gw2efficiency/update-prerequisites

Update prerequisites from recipe-nesting
gw2efficiency · Sep 5, 2024 · 52beccd · 52beccd
2 parents 2baf337 + acb06b7
commit 52beccd
Show file tree

Hide file tree

Showing 19 changed files with 581 additions and 168 deletions.
diff --git a/package.json b/package.json
@@ -23,7 +23,7 @@
     "@devoxa/eslint-config": "2.0.5",
     "@devoxa/flocky": "^1.3.1",
     "@devoxa/prettier-config": "1.0.0",
-    "@gw2efficiency/recipe-nesting": "^3.0.4",
+    "@gw2efficiency/recipe-nesting": "^3.1.0",
     "@types/jest": "27.0.1",
     "@types/node": "15.12.5",
     "eslint": "7.32.0",

diff --git a/src/craftingSteps.ts b/src/craftingSteps.ts
@@ -1,3 +1,4 @@
+import { Prerequisites } from '@gw2efficiency/recipe-nesting'
 import { RecipeTreeWithCraftFlags } from './types'
 
 export function craftingSteps(tree: RecipeTreeWithCraftFlags) {
@@ -43,7 +44,7 @@ interface CraftingStep {
   minRating: number | null
   disciplines: Array<string>
   merchant?: { name: string; locations: Array<string> }
-  recipeId?: number
+  prerequisites: Prerequisites
   components: Array<{ id: number; type: 'Item' | 'Recipe' | 'Currency'; quantity: number }>
 }
 
@@ -85,7 +86,7 @@ function craftingStepsInner(
       minRating: tree.min_rating,
       disciplines: tree.disciplines,
       merchant: tree.merchant,
-      recipeId: tree.recipe_id,
+      prerequisites: tree.prerequisites,
       components: treeComponents.map((component) => ({
         id: component.id,
         type: component.type,

diff --git a/src/types.ts b/src/types.ts
@@ -1,12 +1,8 @@
 import type { NestedRecipe as NestedRecipeTree } from '@gw2efficiency/recipe-nesting'
 
-type ExtendRecipeTree<TBaseTree, TProperties> = Omit<
-  TBaseTree,
-  'type' | 'components' | 'recipe_id'
-> & {
+type ExtendRecipeTree<TBaseTree, TProperties> = Omit<TBaseTree, 'type' | 'components'> & {
   type: 'Recipe' | 'Item' | 'Currency'
   components?: Array<ExtendRecipeTree<TBaseTree, TProperties>>
-  recipe_id?: number
 } & TProperties
 
 export type RecipeTree = ExtendRecipeTree<NestedRecipeTree, { __never?: never }>

diff --git a/tests/__snapshots__/calculateTreeCraftFlags.spec.ts.snap b/tests/__snapshots__/calculateTreeCraftFlags.spec.ts.snap
@@ -17,6 +17,7 @@ Object {
       "id": 2,
       "min_rating": null,
       "output": 1,
+      "prerequisites": Array [],
       "quantity": 1,
       "totalQuantity": 1,
       "type": "Recipe",
@@ -34,6 +35,7 @@ Object {
       "id": 3,
       "min_rating": null,
       "output": 1,
+      "prerequisites": Array [],
       "quantity": 2,
       "totalQuantity": 2,
       "type": "Recipe",
@@ -51,6 +53,7 @@ Object {
       "id": 4,
       "min_rating": null,
       "output": 1,
+      "prerequisites": Array [],
       "quantity": 2,
       "totalQuantity": 2,
       "type": "Recipe",
@@ -68,6 +71,7 @@ Object {
       "id": 5,
       "min_rating": null,
       "output": 1,
+      "prerequisites": Array [],
       "quantity": 2,
       "totalQuantity": 2,
       "type": "Recipe",
@@ -82,6 +86,7 @@ Object {
   "id": 1,
   "min_rating": null,
   "output": 1,
+  "prerequisites": Array [],
   "quantity": 1,
   "totalQuantity": 1,
   "type": "Recipe",

diff --git a/tests/__snapshots__/calculateTreePrices.spec.ts.snap b/tests/__snapshots__/calculateTreePrices.spec.ts.snap
@@ -15,6 +15,7 @@ Object {
       "id": 2,
       "min_rating": null,
       "output": 1,
+      "prerequisites": Array [],
       "quantity": 1,
       "totalQuantity": 1,
       "type": "Item",
@@ -30,6 +31,7 @@ Object {
       "id": 3,
       "min_rating": null,
       "output": 1,
+      "prerequisites": Array [],
       "quantity": 2,
       "totalQuantity": 2,
       "type": "Item",
@@ -45,6 +47,7 @@ Object {
       "id": 1,
       "min_rating": null,
       "output": 1,
+      "prerequisites": Array [],
       "quantity": 10,
       "totalQuantity": 10,
       "type": "Currency",
@@ -60,6 +63,7 @@ Object {
       "id": 2,
       "min_rating": null,
       "output": 1,
+      "prerequisites": Array [],
       "quantity": 10,
       "totalQuantity": 10,
       "type": "Currency",
@@ -73,6 +77,7 @@ Object {
   "id": 1,
   "min_rating": null,
   "output": 1,
+  "prerequisites": Array [],
   "quantity": 1,
   "totalQuantity": 1,
   "type": "Recipe",
@@ -96,6 +101,7 @@ Object {
       "id": 2,
       "min_rating": null,
       "output": 1,
+      "prerequisites": Array [],
       "quantity": 1,
       "totalQuantity": 1,
       "type": "Item",
@@ -112,6 +118,7 @@ Object {
       "id": 3,
       "min_rating": null,
       "output": 1,
+      "prerequisites": Array [],
       "quantity": 2,
       "totalQuantity": 2,
       "type": "Item",
@@ -126,6 +133,7 @@ Object {
   "id": 1,
   "min_rating": null,
   "output": 1,
+  "prerequisites": Array [],
   "quantity": 1,
   "totalQuantity": 1,
   "type": "Recipe",
@@ -148,6 +156,7 @@ Object {
       "id": 2,
       "min_rating": null,
       "output": 1,
+      "prerequisites": Array [],
       "quantity": 1,
       "totalQuantity": 1,
       "type": "Item",
@@ -167,6 +176,7 @@ Object {
           "id": 4,
           "min_rating": null,
           "output": 1,
+          "prerequisites": Array [],
           "quantity": 50,
           "totalQuantity": 50,
           "type": "Item",
@@ -182,6 +192,7 @@ Object {
           "id": 5,
           "min_rating": null,
           "output": 1,
+          "prerequisites": Array [],
           "quantity": 2,
           "totalQuantity": 2,
           "type": "Item",
@@ -195,6 +206,7 @@ Object {
       "id": 3,
       "min_rating": null,
       "output": 1,
+      "prerequisites": Array [],
       "quantity": 2,
       "totalQuantity": 2,
       "type": "Recipe",
@@ -208,6 +220,7 @@ Object {
   "id": 1,
   "min_rating": null,
   "output": 1,
+  "prerequisites": Array [],
   "quantity": 1,
   "totalQuantity": 1,
   "type": "Recipe",