@juice789/tf2items 1.0.31 → 1.0.33

package/blanket.js

@@ -24,9 +24,9 @@ const {
     concat,
     unnest,
     pick,
-    mergeRight
+    mergeRight,
+    renameKeys
 } = require('ramda')
-const { renameKeys } = require('ramda-adjunct')
 
 const { safeItems: items } = require('./schemaItems.js')
 const { skuFromItem, itemFromSku } = require('./sku.js')

package/fetchTextures.js

@@ -1,13 +1,12 @@
 const { call, getContext } = require('redux-saga/effects')
 const vdf = require('vdf')
 
-const { path, compose, pickBy, startsWith, reduce, replace, __ } = require('ramda')
-const { renameKeysWith } = require('ramda-adjunct')
+const { path, compose, pickBy, startsWith, reduce, replace, __, mapKeys } = require('ramda')
 
 const sanitizeTexture = reduce((all, curr) => replace(curr, '', all), __, ['9_', '_field { field_number: 2 }'])
 
 const transformTextures = compose(
-    renameKeysWith(sanitizeTexture),
+    mapKeys(sanitizeTexture),
     pickBy((val, key) => startsWith('9', key) && isNaN(val[0])),
     path(['lang', 'Tokens'])
 )

package/fetchTfEnglish.js

@@ -1,13 +1,12 @@
 const { call, getContext } = require('redux-saga/effects')
 const vdf = require('vdf')
-const { toLower } = require('ramda')
-const { renameKeysWith } = require('ramda-adjunct')
+const { toLower, mapKeys } = require('ramda')
 
 function* fetchTfEnglish() {
     const { fetchTfEnglish } = yield getContext('api')
     const english = yield call(fetchTfEnglish)
     const englishVdf = vdf.parse(english)
-    return renameKeysWith(toLower, englishVdf.lang.Tokens)
+    return mapKeys(toLower, englishVdf.lang.Tokens)
 }
 
 module.exports = { fetchTfEnglish }

package/fromEconItem.js

@@ -40,14 +40,17 @@ const {
     isEmpty,
     join,
     filter,
-    omit
+    omit,
+    last,
+    defaultTo,
+    renameKeys
 } = require('ramda')
 
 const { safeItems: items } = require('./schemaItems.js')
 const { particleEffects, textures } = require('./schema.json')
 const { qualityNames, wears, paintDefindex, spellDefindex } = require('./schemaHelper.json')
 const { skuFromItem } = require('./sku.js')
-const { renameKeys } = require('ramda-adjunct')
+const { skuFromItem753 } = require('./sku753.js')
 
 const marketHashIncludes = curry((string, { market_hash_name }) => market_hash_name.indexOf(string) !== -1)
 
@@ -57,8 +60,8 @@ const removeStrings = curry((string, strings) => compose(
     reduce((all, curr) => replace(curr, '', all), string || '')
 )(strings))
 
-const findTag = uncurryN(2, (tagName) => compose(
-    prop('name'),
+const findTag = uncurryN(3, (tagName, displayProp) => compose(
+    prop(displayProp),
     find(propEq(tagName, 'category_name')),
     map(renameKeys({
         localized_category_name: 'category_name',
@@ -69,7 +72,11 @@ const findTag = uncurryN(2, (tagName) => compose(
 
 const old_id = ({ new_assetid, rollback_new_assetid, assetid }) => (new_assetid || rollback_new_assetid) ? assetid : null
 
-const id = ({ new_assetid, rollback_new_assetid, assetid }) => new_assetid || rollback_new_assetid || assetid
+const id = ({ new_assetid, rollback_new_assetid, assetid }) => new_assetid || rollback_new_assetid || assetid || null
+
+const old_contextid = ({ new_contextid, rollback_new_contextid, contextid }) => (new_contextid || rollback_new_contextid) ? contextid : null
+
+const contextid = ({ new_contextid, rollback_new_contextid, contextid }) => new_contextid || rollback_new_contextid || contextid || null
 
 const recipe = compose(
     find(__, ['Fabricator', 'Strangifier Chemistry Set', 'Chemistry Set']),
@@ -77,7 +84,7 @@ const recipe = compose(
 )
 
 const series = ifElse(
-    compose(equals('Crate'), findTag('Type')),
+    compose(equals('Crate'), findTag('Type', 'name')),
     ifElse(
         marketHashIncludes('#'),
         compose(
@@ -116,11 +123,11 @@ const australium = allPass([
 const wear = compose(
     prop(__, invertObj(wears)),
     removeStrings(__, ['(', ')']),
-    findTag('Exterior')
+    findTag('Exterior', 'name')
 )
 
 const texture = ifElse(
-    findTag('Exterior'),
+    findTag('Exterior', 'name'),
     compose(
         propOr('-1', __, invertObj(textures)),
         ({ app_data, market_hash_name }) => removeStrings(market_hash_name, [
@@ -205,7 +212,7 @@ const setQuality = when(
     compose(complement(Boolean), path(['app_data', 'quality'])),
     chain(
         assocPath(['app_data', 'quality']),
-        compose(prop(__, invertObj(qualityNames)), findTag('Quality'))
+        compose(prop(__, invertObj(qualityNames)), findTag('Quality', 'name'))
     )
 )
 
@@ -230,7 +237,9 @@ const propsTf2_1 = {
     halloweenSpell,
     paintColor,
     id,
-    old_id
+    old_id,
+    contextid,
+    old_contextid
 }
 
 const isTarget = either(
@@ -315,6 +324,17 @@ const propsOtherGame = {
     old_id
 }
 
+const props753 = {
+    market_hash_name: prop('market_hash_name'),
+    border: compose(last, defaultTo(''), findTag('Card Border', 'internal_name')),
+    game: compose(nth(1), split('_'), findTag('Game', 'internal_name')),
+    type: compose(last, findTag('Item Type', 'internal_name')),
+    id,
+    old_id,
+    contextid,
+    old_contextid
+}
+
 const keyRemap = when(
     compose(
         includes(__, ['5021', '5049', '5067', '5072', '5073', '5079', '5081', '5628', '5631', '5632', '5713', '5716', '5717', '5762', '5791', '5792']), //old keys that turned into regular keys
@@ -362,7 +382,7 @@ const defaultOptions440 = {
 }
 
 const fromEconItem440 = ({ omitProps = [], uncraftRemapDefindex = [] } = defaultOptions440) => compose(
-    pick(['sku', 'id', 'old_id']),
+    pick(['sku', 'id', 'old_id', 'contextid', 'old_contextid']),
     chain(assoc('sku'), skuFromItem),
     uncraftRemap(uncraftRemapDefindex),
     kitRemap,
@@ -374,22 +394,26 @@ const fromEconItem440 = ({ omitProps = [], uncraftRemapDefindex = [] } = default
     setQuality
 )
 
+const fromEconItem753 = () => compose(
+    pick(['sku', 'id', 'old_id', 'contextid', 'old_contextid']),
+    chain(assoc('sku'), skuFromItem753),
+    map(__, props753),
+    unary(applyTo)
+)
+
 const fromEconItemOther = (options = {}) => compose(
     map(__, propsOtherGame),
     unary(applyTo)
 )
 
-const fromEconItem = ifElse(
-    propEq(440, 'appid'),
-    fromEconItem440(),
-    fromEconItemOther()
-)
+const mainFns = {
+    440: fromEconItem440,
+    753: fromEconItem753
+}
+
+const fromEconItem = (econItem) => (mainFns[econItem.appid] || fromEconItemOther)()(econItem)
 
-const fromEconItemOptions = curry((options, econItem) => ifElse(
-    propEq(440, 'appid'),
-    fromEconItem440(options),
-    fromEconItemOther(options)
-)(econItem))
+const fromEconItemOptions = curry((options, econItem) => (mainFns[econItem.appid] || fromEconItemOther)(options)(econItem))
 
 module.exports = {
     fromEconItem,

package/getCollections.js

@@ -1,5 +1,4 @@
-const { prop, map, compose, toLower, mapObjIndexed, toPairs, when, has, __, chain, assoc, reduce, mergeRight, values, path, uncurryN, replace } = require('ramda')
-const { renameKeysWith } = require('ramda-adjunct')
+const { prop, map, compose, toLower, mapObjIndexed, toPairs, when, has, __, chain, assoc, reduce, mergeRight, values, path, uncurryN, replace, mapKeys } = require('ramda')
 
 const simplifyCollections = compose(
     reduce((curr, obj) => mergeRight(curr, obj), {}),
@@ -15,7 +14,7 @@ const simplifyCollections = compose(
             prop('items')
         )
     ),
-    (collections) => renameKeysWith((key) => replace('#', '', path([key, 'name'], collections)), collections),
+    (collections) => mapKeys((key) => replace('#', '', path([key, 'name'], collections)), collections),
     prop('item_collections')
 )
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@juice789/tf2items",
-  "version": "1.0.31",
+  "version": "1.0.33",
   "description": "tf2 item schema thingys",
   "main": "app.js",
   "scripts": {
@@ -19,15 +19,8 @@
   "bugs": {
     "url": "https://github.com/juice789/tf2items/issues"
   },
-  "peerDependencies": {
-    "axios": "^1.7.2",
-    "ramda": "^0.30.1",
-    "ramda-adjunct": "^5.0.1",
-    "redux-saga": "^1.3.0",
-    "vdf": "^0.0.2"
-  },
   "devDependencies": {
-    "jest": "^29.4.3",
+    "jest": "^30.0.5",
     "redux-saga-test-plan": "^4.0.6"
   },
   "publishConfig": {
@@ -35,6 +28,10 @@
   },
   "sideEffects": false,
   "dependencies": {
-    "remove-accents": "^0.5.0"
+    "remove-accents": "^0.5.0",
+    "axios": "^1.11.0",
+    "ramda": "^0.31.3",
+    "redux-saga": "^1.3.0",
+    "vdf": "^0.0.2"
   }
 }