Merge pull request #3 from PssbleTrngle/codegen

.gitignore

@@ -132,5 +132,4 @@ dist
 # webstorm
 .idea
 
-test-output
-generated
+test-output

package.json

@@ -100,5 +100,8 @@
       "prismarine-nbt": "^2.2.1",
       "typescript": "^4.8.2",
       "zod": "^3.22.4"
+   },
+   "resolutions": {
+      "@pssbletrngle/data-modifier": "link:."
    }
 }

playground/.gitignore

@@ -0,0 +1 @@
+generated

src/common/ingredient.ts

@@ -68,7 +68,7 @@ export function createIngredient(input: unknown, lookup?: RegistryLookup): Ingre
 
 export type Predicate<T> = (value: T, logger?: Logger) => boolean
 export type CommonTest<T> = RegExp | Predicate<T> | T
-export type IngredientTest = CommonTest<Ingredient> | NormalizedId<ItemId>
+export type IngredientTest = CommonTest<Ingredient> | ItemId | `#${string}`
 
 function resolveIdIngredientTest(
    test: NormalizedId | RegExp,
@@ -117,7 +117,8 @@ export function resolveIngredientTest(
    lookup: RegistryLookup | undefined
 ): Predicate<IngredientInput> {
    if (typeof test === 'string') {
-      return resolveIngredientTest({ item: test }, tags, lookup)
+      if (!test.startsWith('#')) return resolveIngredientTest({ item: test }, tags, lookup)
+      return resolveIngredientTest({ tag: test.substring(1) }, tags, lookup)
    }
 
    if (test instanceof RegExp) {

src/common/result.ts

@@ -1,30 +1,35 @@
 import zod from 'zod'
 import { IllegalShapeError } from '../error.js'
 import RegistryLookup from '../loader/registry/index.js'
-import { ZodType } from 'zod/lib/types'
 import { BlockId, FluidId, ItemId } from '@pssbletrngle/data-modifier/generated'
 
 export const ItemStackSchema = zod.object({
-   item: zod.string() as ZodType<ItemId>,
+   item: zod.string(),
    count: zod.number().int().optional(),
    chance: zod.number().optional(),
 })
 
-export type ItemStack = zod.infer<typeof ItemStackSchema>
+export type ItemStack = Omit<zod.infer<typeof ItemStackSchema>, 'item'> & {
+   item: ItemId
+}
 
 export const FluidStackSchema = zod.object({
-   fluid: zod.string() as ZodType<FluidId>,
+   fluid: zod.string(),
    amount: zod.number().optional(),
    chance: zod.number().optional(),
 })
 
-export type FluidStack = zod.infer<typeof FluidStackSchema>
+export type FluidStack = Omit<zod.infer<typeof FluidStackSchema>, 'fluid'> & {
+   fluid: FluidId
+}
 
 export const BlockSchema = zod.object({
-   block: zod.string() as ZodType<BlockId>,
+   block: zod.string(),
 })
 
-export type Block = zod.infer<typeof BlockSchema>
+export type Block = Omit<zod.infer<typeof BlockSchema>, 'block'> & {
+   block: BlockId
+}
 
 export type Result = ItemStack | FluidStack | Block
 export type ResultInput = Result | ItemId

src/emit/blacklist.ts

@@ -5,14 +5,14 @@ import { uniq } from 'lodash-es'
 import { IllegalShapeError } from '../error.js'
 
 export interface BlacklistRules {
-   hide(input: IngredientInput): void
+   hide(...inputs: IngredientInput[]): void
 }
 
 export default class BlacklistEmitter implements BlacklistRules {
    private hidden: IngredientInput[] = []
 
-   hide(input: IngredientInput) {
-      this.hidden.push(input)
+   hide(...inputs: IngredientInput[]) {
+      this.hidden.push(...inputs)
    }
 
    private resolveIds(input: IngredientInput): string[] {

src/emit/tags.ts

@@ -7,7 +7,7 @@ import { TagDefinition, TagEntry } from '../schema/tag.js'
 import { createId, encodeId, Id, NormalizedId, TagInput } from '../common/id.js'
 import Registry from '../common/registry.js'
 import { resolveIDTest } from '../common/predicates.js'
-import { BlockId, FluidId, InferIds, ItemId, RegistryId } from '@pssbletrngle/data-modifier/generated'
+import { InferIds, RegistryId } from '@pssbletrngle/data-modifier/generated'
 
 export interface TagRules {
    add<T extends RegistryId>(registry: T, id: TagInput, value: TagEntry<InferIds<T>>): void
@@ -16,9 +16,9 @@ export interface TagRules {
 
    scoped<T extends RegistryId>(key: T): ScopedTagRules<T>
 
-   blocks: ScopedTagRules<BlockId>
-   items: ScopedTagRules<ItemId>
-   fluids: ScopedTagRules<FluidId>
+   blocks: ScopedTagRules<'minecraft:block'>
+   items: ScopedTagRules<'minecraft:item'>
+   fluids: ScopedTagRules<'minecraft:fluid'>
 }
 
 interface ScopedTagRules<T extends RegistryId> {

src/index.ts

@@ -5,7 +5,7 @@ export { TagRules } from './emit/tags.js'
 export { RecipeRules, EMPTY_RECIPE } from './emit/recipe.js'
 export { LootRules, EMPTY_LOOT_TABLE } from './emit/loot.js'
 export { LootItemInput } from './parser/lootTable.js'
-export { IllegalShapeError } from './error.js'
+export { UnknownRegistryEntry, IllegalShapeError } from './error.js'
 export {
    IngredientInput,
    Predicate,

src/loader/pack.ts

@@ -1,6 +1,6 @@
 import { Acceptor, IResolver, ResolverInfo } from '@pssbletrngle/pack-resolver'
 import match from 'minimatch'
-import { IngredientTest } from '../common/ingredient.js'
+import { createIngredient, IngredientInput, IngredientTest } from '../common/ingredient.js'
 import BlacklistEmitter, { BlacklistRules } from '../emit/blacklist.js'
 import LangEmitter, { LangRules } from '../emit/lang.js'
 import LootTableEmitter, { LootRules } from '../emit/loot.js'
@@ -15,6 +15,7 @@ import RegistryDumpLoader from './registry/dump.js'
 import RegistryLookup from './registry/index.js'
 import TagsLoader from './tags.js'
 import EmptyRegistryLookup from './registry/empty.js'
+import { createResult, ResultInput } from '../common/result.js'
 
 export default class PackLoader implements Loader {
    constructor(private readonly logger: Logger) {}
@@ -78,6 +79,14 @@ export default class PackLoader implements Loader {
       return this.activeRegistryLookup
    }
 
+   createResult(input: ResultInput) {
+      return createResult(input, this.activeRegistryLookup)
+   }
+
+   createIngredient(input: IngredientInput) {
+      return createIngredient(input, this.activeRegistryLookup)
+   }
+
    resolveIngredientTest(test: IngredientTest) {
       return this.recipeEmitter.resolveIngredientTest(test)
    }