@skyblock-finance/actions 0.0.2 → 0.0.4

package/source/data.test.ts

@@ -1,85 +1,82 @@
-import { ActionIoItem, actionSchema } from './schema'
+import { actionSchema } from './schema'
 import { allActions } from './data'
 import { z } from 'zod'
 import { describe, expect, test } from 'bun:test'
 import assert from 'node:assert'
+import { ActionIoItem } from './types'
 
 test('all actions follow the schema', () => {
 	expect(() => z.array(actionSchema).parse(allActions)).not.toThrow()
 })
 
-describe('every action’s inputs match its outputs', () => {
-	/**
-	 * Simplifies and "sorts" action input/output items
-	 */
-	const sumUp = (ios: ActionIoItem[]): Map<string, number> => {
-		const result = new Map<string, number>()
+/**
+ * Simplifies and "sorts" action input/output items
+ */
+const sumUp = (ios: ActionIoItem[]): Map<string, number> => {
+	const result = new Map<string, number>()
 
-		for (const io of ios) {
-			const previousValue = result.get(io.id) ?? 0
-			result.set(io.id, previousValue + io.amount)
-		}
-
-		return result
+	for (const io of ios) {
+		const previousValue = result.get(io.id) ?? 0
+		result.set(io.id, previousValue + io.amount)
 	}
 
-	test('sumUp works', () => {
-		expect(
-			sumUp([
-				{
-					amount: 1,
-					id: 'FOO',
-					type: 'item',
-				},
-				{
-					amount: 2,
-					id: 'BAR',
-					type: 'item',
-				},
-				{
-					amount: 1,
-					id: 'BAZ',
-					type: 'item',
-				},
-			]),
-		).toEqual(
-			sumUp([
-				{
-					amount: 1,
-					id: 'BAR',
-					type: 'item',
-				},
-				{
-					amount: 1,
-					id: 'FOO',
-					type: 'item',
-				},
-				{
-					amount: 1,
-					id: 'BAZ',
-					type: 'item',
-				},
-				{
-					amount: 1,
-					id: 'BAR',
-					type: 'item',
-				},
-			]),
-		)
-	})
+	return result
+}
+
+test('sumUp works', () => {
+	expect(
+		sumUp([
+			{
+				amount: 1,
+				id: 'FOO',
+				type: 'item',
+			},
+			{
+				amount: 2,
+				id: 'BAR',
+				type: 'item',
+			},
+			{
+				amount: 1,
+				id: 'BAZ',
+				type: 'item',
+			},
+		]),
+	).toEqual(
+		sumUp([
+			{
+				amount: 1,
+				id: 'BAR',
+				type: 'item',
+			},
+			{
+				amount: 1,
+				id: 'FOO',
+				type: 'item',
+			},
+			{
+				amount: 1,
+				id: 'BAZ',
+				type: 'item',
+			},
+			{
+				amount: 1,
+				id: 'BAR',
+				type: 'item',
+			},
+		]),
+	)
+})
 
+describe('every action’s inputs match its crafing grid', () => {
 	for (const action of allActions) {
 		for (const grid of action.place.filter((x) => x.type === 'workbench')) {
 			test(`${JSON.stringify(action.outputs)} is valid`, () => {
 				assert(grid.type === 'workbench')
 
-				const actual = sumUp(
-					action.inputs.filter((x) => x.type === 'item') as ActionIoItem[],
-				)
+				const actual = sumUp(action.inputs.filter((x) => x.type === 'item'))
 
-				const expected = sumUp(
-					grid.grid.filter((x) => x !== null) as ActionIoItem[],
-				)
+				const expected = sumUp(grid.grid.filter((x) => x !== null))
 
 				expect(actual).toEqual(expected)
 			})

package/source/data.ts

@@ -1,8 +1,11 @@
 import { actions as _bits } from '../data/bits.json'
 import { actions as _bitsCrafts } from '../data/bits-crafts.json'
-import { Action } from './schema'
+import { actions as _gems } from '../data/gems.json'
+import { Action } from './types'
 
 export const bits = _bits as Action[]
 export const bitsCrafts = _bitsCrafts as Action[]
 
-export const allActions = [...bits, ...bitsCrafts]
+export const gems = _gems as Action[]
+
+export const allActions = [...bits, ...bitsCrafts, ...gems]

package/source/index.ts

@@ -1,2 +1,14 @@
 export * from './data'
-export * from './schema'
+export {
+	Action,
+	ActionCurrency,
+	ActionIo,
+	ActionIoCurrency,
+	ActionIoItem,
+} from './types'
+export {
+	actionIoItemSchema,
+	actionIoSchema,
+	actionPlaceSchema,
+	actionSchema,
+} from './schema'

package/source/schema.ts

@@ -2,32 +2,25 @@ import { z } from 'zod'
 
 export const actionIoItemSchema = z
 	.object({
-		amount: z.number().int().finite(),
+		amount: z.number().finite(),
 		id: z.string(),
 		type: z.literal('item'),
 	})
 	.strict()
 
-export type ActionIoItem = z.output<typeof actionIoItemSchema>
+export const actionIoCurrencySchema = z
+	.object({
+		amount: z.number().finite(),
+		id: z.enum(['bit', 'coin', 'gem', 'northStar', 'second', 'usd']),
+		type: z.literal('currency'),
+	})
+	.strict()
 
 export const actionIoSchema = z.discriminatedUnion('type', [
-	z
-		.object({
-			amount: z.number().int().finite(),
-			type: z.literal('bit'),
-		})
-		.strict(),
-	z
-		.object({
-			amount: z.number().int().finite(),
-			type: z.literal('coin'),
-		})
-		.strict(),
+	actionIoCurrencySchema,
 	actionIoItemSchema,
 ])
 
-export type ActionIo = z.output<typeof actionIoSchema>
-
 export const actionPlaceSchema = z.discriminatedUnion('type', [
 	z
 		.object({
@@ -35,6 +28,12 @@ export const actionPlaceSchema = z.discriminatedUnion('type', [
 			type: z.literal('npc'),
 		})
 		.strict(),
+	z
+		.object({
+			type: z.literal('website'),
+			url: z.string().url(),
+		})
+		.strict(),
 	z
 		.object({
 			grid: z.array(actionIoItemSchema.nullable()).length(9),
@@ -50,5 +49,3 @@ export const actionSchema = z
 		place: z.array(actionPlaceSchema),
 	})
 	.strict()
-
-export type Action = z.output<typeof actionSchema>

package/source/types.ts

@@ -0,0 +1,13 @@
+import { z } from 'zod'
+import {
+	actionIoCurrencySchema,
+	actionIoItemSchema,
+	actionIoSchema,
+	actionSchema,
+} from './schema'
+
+export type Action = z.output<typeof actionSchema>
+export type ActionCurrency = z.output<typeof actionIoCurrencySchema.shape.id>
+export type ActionIo = z.output<typeof actionIoSchema>
+export type ActionIoCurrency = z.output<typeof actionIoCurrencySchema>
+export type ActionIoItem = z.output<typeof actionIoItemSchema>