@juice789/tf2items 1.0.16 → 1.0.17

package/app.js

@@ -1,6 +1,5 @@
 const { runSaga } = require('redux-saga')
-const { map, compose, replace } = require('ramda')
-const { renameKeysWith } = require('ramda-adjunct')
+const { map } = require('ramda')
 
 const helperObjects = require('./schemaHelper.json')
 const sagaHelpers = require('./sagaHelpers')
@@ -13,7 +12,7 @@ const skuLinks = require('./skuLinks.js')
 const { createApi, api } = require('./api.js')
 
 const sagas = require('./sagas.js')
-const { saveSchemaSaga } = require('./saveSchema.js')
+const { saveSchema } = require('./saveSchema.js')
 
 const { fromEconItem } = require('./fromEconItem.js')
 const { fromListingV1 } = require('./fromListingV1.js')
@@ -23,18 +22,18 @@ const { toSearchParams } = require('./toSearchParams.js')
 
 const getInstance = (options) => {
     const api = createApi(options)
-    return compose(
-        renameKeysWith(replace('Saga', '')),
-        map(
+    const fns = { ...sagas, saveSchema }
+    return options.saga
+        ? fns
+        : map(
             (saga) => (...args) => new Promise((resolve, reject) => {
                 runSaga({
                     context: { api }
                 }, saga, ...args)
                     .toPromise()
                     .then(resolve, reject)
-            })
-        ),
-    )({ ...sagas, saveSchemaSaga })
+            }), fns
+        )
 }
 
 module.exports = {
@@ -45,7 +44,7 @@ module.exports = {
     ...sagas,
     ...sagaHelpers,
     ...skuLinks,
-    saveSchemaSaga,
+    saveSchema,
     getInstance,
     createApi,
     api,

package/fetchAppDataInventory.js

@@ -32,7 +32,7 @@ const mergeAssetClasses = uncurryN(2, (assetClasses) => compose(
     groupBy(props(['classid', 'instanceid']))
 ))
 
-function* fetchAppDataInventorySaga(inventory, d = 1000) {
+function* fetchAppDataInventory(inventory, d = 1000) {
 
     let p = 0, assetClasses = {}
     const { getAssetClassInfo } = yield getContext('api')
@@ -50,5 +50,5 @@ function* fetchAppDataInventorySaga(inventory, d = 1000) {
 }
 
 module.exports = {
-    fetchAppDataInventorySaga
+    fetchAppDataInventory
 }

package/fetchItemsApi.js

@@ -17,7 +17,7 @@ const transformItemsApi = compose(
     indexBy(prop('defindex'))
 )
 
-function* fetchItemsApiSaga() {
+function* fetchItemsApi() {
     const { getSchemaItems } = yield getContext('api')
     let start = 0, items = []
     do {
@@ -30,4 +30,4 @@ function* fetchItemsApiSaga() {
 }
 
 
-module.exports = { fetchItemsApiSaga }
+module.exports = { fetchItemsApi }

package/fetchItemsGame.js

@@ -1,7 +1,7 @@
 const { call, getContext } = require('redux-saga/effects')
 const vdf = require('vdf')
 
-function* fetchItemsGameSaga() {
+function* fetchItemsGame() {
     const { getItemsGameUrl, getItemsGame } = yield getContext('api')
     const { result: { items_game_url } } = yield call(getItemsGameUrl)
     const itemsGameVdf = yield call(getItemsGame, items_game_url)
@@ -9,4 +9,4 @@ function* fetchItemsGameSaga() {
     return items_game
 }
 
-module.exports = { fetchItemsGameSaga }
+module.exports = { fetchItemsGame }

package/fetchParticleEffects.js

@@ -11,10 +11,10 @@ const transformEffects = compose(
     path(['result', 'attribute_controlled_attached_particles'])
 )
 
-function* fetchParticleEffectsSaga() {
+function* fetchParticleEffects() {
     const { getSchemaOverview } = yield getContext('api')
     const schema = yield call(getSchemaOverview)
     return transformEffects(schema)
 }
 
-module.exports = { fetchParticleEffectsSaga }
+module.exports = { fetchParticleEffects }

package/fetchTextures.js

@@ -12,10 +12,10 @@ const transformTextures = compose(
     path(['lang', 'Tokens'])
 )
 
-function* fetchTexturesSaga() {
+function* fetchTextures() {
     const { fetchProtoObjDefs } = yield getContext('api')
     const protoObjDefs = yield call(fetchProtoObjDefs)
     return transformTextures(vdf.parse(protoObjDefs))
 }
 
-module.exports = { fetchTexturesSaga }
+module.exports = { fetchTextures }

package/fetchTfEnglish.js

@@ -3,11 +3,11 @@ const vdf = require('vdf')
 const { toLower } = require('ramda')
 const { renameKeysWith } = require('ramda-adjunct')
 
-function* fetchTfEnglishSaga() {
+function* fetchTfEnglish() {
     const { fetchTfEnglish } = yield getContext('api')
     const english = yield call(fetchTfEnglish)
     const englishVdf = vdf.parse(english)
     return renameKeysWith(toLower, englishVdf.lang.Tokens)
 }
 
-module.exports = { fetchTfEnglishSaga }
+module.exports = { fetchTfEnglish }

package/fromEconItem.js

@@ -36,7 +36,8 @@ const {
     of,
     path,
     equals,
-    pick
+    pick,
+    assocPath
 } = require('ramda')
 
 const { safeItems: items } = require('./schemaItems.js')
@@ -187,8 +188,15 @@ const uncraftable = compose(
 
 const market_hash_name = prop('market_hash_name')
 
-const quality = pathOr('-1', ['app_data', 'quality'])
+const setQuality = when(
+    compose(complement(Boolean), path(['app_data', 'quality'])),
+    chain(
+        assocPath(['app_data', 'quality']),
+        compose(prop(__, invertObj(qualityNames)), findTag('Quality'))
+    )
+)
 
+const quality = pathOr('-1', ['app_data', 'quality'])
 const defindex = pathOr('-1', ['app_data', 'def_index'])
 
 const propsTf2_1 = {
@@ -339,7 +347,8 @@ const fromEconItem440 = compose(
     remaps,
     chain(mergeRight, compose(map(__, propsTf2_2), applyTo)),
     map(__, propsTf2_1),
-    unary(applyTo)
+    unary(applyTo),
+    setQuality
 )
 
 const fromEconItemOther = compose(

package/options-example.json

@@ -1,3 +1,4 @@
 {
-    "steamApiKey": ""
+    "steamApiKey": "",
+    "saga": false
 }

package/options.json

@@ -1,3 +1,4 @@
 {
-    "steamApiKey": "1E55C647593C029A0C9BE22F97F03F03"
+    "steamApiKey": "1E55C647593C029A0C9BE22F97F03F03",
+    "saga": false
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@juice789/tf2items",
-  "version": "1.0.16",
+  "version": "1.0.17",
   "description": "tf2 item schema thingys",
   "main": "app.js",
   "scripts": {

package/sagas.js

@@ -1,15 +1,15 @@
-const { fetchItemsApiSaga } = require('./fetchItemsApi.js')
-const { fetchItemsGameSaga } = require('./fetchItemsGame.js')
-const { fetchParticleEffectsSaga } = require('./fetchParticleEffects.js')
-const { fetchTexturesSaga } = require('./fetchTextures.js')
-const { fetchTfEnglishSaga } = require('./fetchTfEnglish.js')
-const { fetchAppDataInventorySaga } = require('./fetchAppDataInventory.js')
+const { fetchItemsApi } = require('./fetchItemsApi.js')
+const { fetchItemsGame } = require('./fetchItemsGame.js')
+const { fetchParticleEffects } = require('./fetchParticleEffects.js')
+const { fetchTextures } = require('./fetchTextures.js')
+const { fetchTfEnglish } = require('./fetchTfEnglish.js')
+const { fetchAppDataInventory } = require('./fetchAppDataInventory.js')
 
 module.exports = {
-    fetchItemsApiSaga,
-    fetchItemsGameSaga,
-    fetchParticleEffectsSaga,
-    fetchTexturesSaga,
-    fetchTfEnglishSaga,
-    fetchAppDataInventorySaga
+    fetchItemsApi,
+    fetchItemsGame,
+    fetchParticleEffects,
+    fetchTextures,
+    fetchTfEnglish,
+    fetchAppDataInventory
 }

package/saveSchema.js

@@ -1,11 +1,11 @@
 const { call } = require('redux-saga/effects')
 
 const {
-    fetchItemsApiSaga,
-    fetchItemsGameSaga,
-    fetchParticleEffectsSaga,
-    fetchTexturesSaga,
-    fetchTfEnglishSaga
+    fetchItemsApi,
+    fetchItemsGame,
+    fetchParticleEffects,
+    fetchTextures,
+    fetchTfEnglish
 } = require('./sagas.js')
 
 const {
@@ -14,14 +14,14 @@ const {
     transformItems
 } = require('./sagaHelpers')
 
-function* saveSchemaSaga() {
+function* saveSchema() {
     try {
 
-        const itemsApi = yield call(fetchItemsApiSaga)
-        const itemsGame = yield call(fetchItemsGameSaga)
-        const particleEffects = yield call(fetchParticleEffectsSaga)
-        const textures = yield call(fetchTexturesSaga)
-        const english = yield call(fetchTfEnglishSaga)
+        const itemsApi = yield call(fetchItemsApi)
+        const itemsGame = yield call(fetchItemsGame)
+        const particleEffects = yield call(fetchParticleEffects)
+        const textures = yield call(fetchTextures)
+        const english = yield call(fetchTfEnglish)
 
         const collections = getCollections(english, itemsGame)
         const items = getItems(english, itemsGame)
@@ -39,4 +39,4 @@ function* saveSchemaSaga() {
     }
 }
 
-module.exports = { saveSchemaSaga }
+module.exports = { saveSchema }