@juice789/tf2items 1.0.19 → 1.0.21

package/blanket.js

@@ -22,7 +22,6 @@ const {
     allPass,
     converge,
     concat,
-    of,
     unnest,
     pick,
     mergeRight
@@ -54,7 +53,7 @@ const unboxSkinsRemap = when(
         compose(//is an unbox skin
             allPass([
                 has('texture'),
-                complement(propEq)('item_name', 'War Paint')
+                complement(propEq)('War Paint', 'item_name')
             ]),
             prop(__, items),
             prop('defindex')
@@ -63,17 +62,17 @@ const unboxSkinsRemap = when(
     converge(
         concat,
         [
-            of,
+            Array.of,
             compose(
-                of,
+                Array.of,
                 chain(assoc('defindex'), compose(
                     prop('defindex'),//change defindex from unbox skin defindex to weapon defindex
                     defaultTo({}),
                     nth(0),
                     values,
                     ({ item_name }) => pickBy(allPass([
-                        propEq('item_quality', 6),
-                        propEq('item_name', item_name)
+                        propEq(6, 'item_quality'),
+                        propEq(item_name, 'item_name')
                     ]), items),
                     prop(__, items),
                     prop('defindex')
@@ -87,7 +86,7 @@ const warPaintRemap = when(
     allPass([
         complement(has)('texture'),
         compose(
-            propEq('item_name', 'War Paint'),
+            propEq('War Paint', 'item_name'),
             prop(__, items),
             prop('defindex')
         ),

package/fromEconItem.js

@@ -33,7 +33,6 @@ const {
     complement,
     either,
     concat,
-    of,
     path,
     equals,
     pick,
@@ -56,7 +55,7 @@ const removeStrings = curry((string, strings) => compose(
 
 const findTag = uncurryN(2, (tagName) => compose(
     prop('name'),
-    find(propEq('category_name', tagName)),
+    find(propEq(tagName, 'category_name')),
     map(renameKeys({
         localized_category_name: 'category_name',
         localized_tag_name: 'name'
@@ -114,7 +113,7 @@ const craft = ifElse(
 )
 
 const australium = allPass([
-    pathEq(['app_data', 'quality'], '11'),
+    pathEq('11', ['app_data', 'quality']),
     marketHashIncludes('Australium')
 ])
 
@@ -156,9 +155,9 @@ const killstreakTier = compose(
 
 const effect = ifElse(
     allPass([
-        pathEq(['app_data', 'quality'], '5'),
+        pathEq('5', ['app_data', 'quality']),
         compose(
-            find(propEq('color', 'ffd700')),
+            find(propEq('ffd700', 'color')),
             propOr([], 'descriptions')
         )
     ]),
@@ -166,14 +165,14 @@ const effect = ifElse(
         propOr('-1', __, invertObj(particleEffects)),
         replace('★ Unusual Effect: ', ''),
         prop('value'),
-        find(propEq('color', 'ffd700')),
+        find(propEq('ffd700', 'color')),
         propOr([], 'descriptions')
     ),
     always(null)
 )
 
 const elevated = allPass([
-    complement(pathEq)(['app_data', 'quality'], '11'),
+    complement(pathEq)('11', ['app_data', 'quality']),
     compose(
         includes('Strange'),
         ({ app_data, market_hash_name }) => replace(items[app_data.def_index].item_name, '', market_hash_name)
@@ -182,7 +181,7 @@ const elevated = allPass([
 
 const uncraftable = compose(
     Boolean,
-    find(propEq('value', '( Not Usable in Crafting )')),
+    find(propEq('( Not Usable in Crafting )', 'value')),
     propOr([], 'descriptions')
 )
 
@@ -236,8 +235,8 @@ const target = ifElse(
         find(__, values(items)),
         allPass,
         concat([propSatisfies(complement(includes)(__, [0, 15]), 'item_quality')]),
-        of,
-        propEq('item_name'),
+        Array.of,
+        propEq(__, 'item_name'),
         ({ market_hash_name, defindex }) => removeStrings(market_hash_name, [
             'Strangifier',
             'Unusual',
@@ -275,8 +274,8 @@ const output = ({ recipe, market_hash_name, killstreakTier }) => {
                 find(__, values(items)),
                 allPass,
                 concat([propSatisfies(complement(includes)(__, [0, 15]), 'item_quality')]),
-                of,
-                propEq('item_name'),
+                Array.of,
+                propEq(__, 'item_name'),
                 removeStrings(__, ['Chemistry Set', "Collector's"])
             )(market_hash_name)
         default:
@@ -357,7 +356,7 @@ const fromEconItemOther = compose(
 )
 
 const fromEconItem = ifElse(
-    propEq('appid', 440),
+    propEq(440, 'appid'),
     fromEconItem440,
     fromEconItemOther
 )

package/fromListingV1.js

@@ -64,8 +64,8 @@ const effect = findValue(effectOptions)
 
 const elevated = cond(
     [
-        [complement(propEq)('quality', 11), hasPath(['attributes', '214'])],
-        [propEq('quality', 11), compose(isWeaponEffect, effect)],
+        [complement(propEq)(11, 'quality'), hasPath(['attributes', '214'])],
+        [propEq(11, 'quality'), compose(isWeaponEffect, effect)],
         [T, F]
     ]
 )
@@ -172,7 +172,7 @@ const remap = (fn1, fn2) => when(
 
 const remapStrangifier = remap(
     compose(
-        propEq('item_name', 'Strangifier'),
+        propEq('Strangifier', 'item_name'),
         prop(__, items),
         prop('defindex')
     ),
@@ -193,12 +193,12 @@ const remapStrangifier = remap(
 
 const strangifierSets = pickBy(allPass([
     has('td'),
-    propEq('item_name', 'Chemistry Set')
+    propEq('Chemistry Set', 'item_name')
 ]), items)
 
 const remapStrangifierSet = remap(
     allPass([
-        propEq('defindex', 20001),
+        propEq(20001, 'defindex'),
         prop('output'),
         prop('target')
     ]),
@@ -220,12 +220,12 @@ const remapStrangifierSet = remap(
 const collectorSets = pickBy(allPass([
     complement(prop)('td'),
     prop('od'),
-    propEq('item_name', 'Chemistry Set'),
+    propEq('Chemistry Set', 'item_name'),
 ]), items)
 
 const remapCollectorSet = remap(
     allPass([
-        propEq('defindex', 20001),
+        propEq(20001, 'defindex'),
         complement(prop)('target')
     ]),
     compose(
@@ -282,15 +282,15 @@ const remapWeapon = when(
 )
 
 const decodeSkinQuality = cond([
-    [allPass([propEq('quality', 15), compose(isWeaponEffect, prop('effect'))]), assoc('quality', 5)], //decorated + effect = unusual
-    [allPass([propEq('quality', 11), compose(isWeaponEffect, prop('effect'))]), assoc('quality', 5)], //strange + effect = unusual
-    [allPass([propEq('quality', 15), complement(prop)('effect'), prop('elevated')]), assoc('quality', 11)], //decorated + elevated = strange
+    [allPass([propEq(15, 'quality'), compose(isWeaponEffect, prop('effect'))]), assoc('quality', 5)], //decorated + effect = unusual
+    [allPass([propEq(11, 'quality'), compose(isWeaponEffect, prop('effect'))]), assoc('quality', 5)], //strange + effect = unusual
+    [allPass([propEq(15, 'quality'), complement(prop)('effect'), prop('elevated')]), assoc('quality', 11)], //decorated + elevated = strange
     [T, identity]
 ])
 
 const unboxedSkins = map(
     (item) => assoc('item_name', textures[item.texture] + ' ' + item.item_name, item),
-    pickBy(propEq('item_quality', 15), items)
+    pickBy(propEq(15, 'item_quality'), items)
 )
 
 const unboxSkinsRemap = remap(
@@ -300,7 +300,7 @@ const unboxSkinsRemap = remap(
         flatten,
         toPairs,
         ({ defindex, texture }) => pickBy(
-            propEq('item_name', textures[texture] + ' ' + items[defindex].item_name),
+            propEq(textures[texture] + ' ' + items[defindex].item_name, 'item_name'),
             unboxedSkins
         )
     )
@@ -340,7 +340,7 @@ const promoIndex = {
 const promoRemap = when(
     allPass([
         compose(has(__, promoIndex), prop('defindex')),
-        propEq('quality', 1)
+        propEq(1, 'quality')
     ]),
     chain(assoc('defindex'), compose(prop(__, promoIndex), prop('defindex')))
 )

package/fromListingV2.js

@@ -42,19 +42,19 @@ const elevated = cond(
 
 const killstreakTier = propOr(null, 'killstreakTier')
 
-const festivized = propEq('festivized', true)
+const festivized = propEq(true, 'festivized')
 
 const texture = pathOr(null, ['texture', 'id'])
 
 const wear = pathOr(null, ['wearTier', 'id'])
 
-const australium = propEq('australium', true)
+const australium = propEq(true, 'australium')
 
 const series = propOr(null, 'crateSeries')
 
 const target = ifElse(
     allPass([
-        pathEq(['recipe', 'targetItem'], null),
+        pathEq(null, ['recipe', 'targetItem']),
         compose(equals(3), length, split('-'), prop('priceindex'))
     ]),
     compose(nth(2), split('-'), prop('priceindex')),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@juice789/tf2items",
-  "version": "1.0.19",
+  "version": "1.0.21",
   "description": "tf2 item schema thingys",
   "main": "app.js",
   "scripts": {
@@ -20,10 +20,10 @@
     "url": "https://github.com/juice789/tf2items/issues"
   },
   "peerDependencies": {
-    "axios": "^1.6.2",
-    "ramda": "^0.28.0",
-    "ramda-adjunct": "^3.4.0",
-    "redux-saga": "^1.2.3",
+    "axios": "^1.7.2",
+    "ramda": "^0.30.1",
+    "ramda-adjunct": "^5.0.1",
+    "redux-saga": "^1.3.0",
     "vdf": "^0.0.2"
   },
   "devDependencies": {