@adeficior/data-modifier 1.0.0-rc.12 → 1.0.0-rc.14

package/dist/common/id.d.ts

@@ -8,6 +8,7 @@ export type IdInput<T extends string = string> = T | Id;
 export type NormalizedId<T extends string = string> = T extends `${string}:${string}` ? T : T extends `#${infer R}` ? `#${string}:${R}` : `${string}:${T}`;
 export type TagInput = IdInput<`#${string}`>;
 export declare const IdSchema: zod.ZodString;
+export declare const TagSchema: zod.ZodType<`#${string}`>;
 export declare const IdOrTagSchema: zod.ZodString;
 export declare function createId(from: IdInput): Id;
 export declare function encodeId<T extends string>(from: IdInput<T>): NormalizedId<T>;

package/dist/common/id.js

@@ -3,6 +3,10 @@ export const IdSchema = zod
     .string()
     .regex(/^([a-z0-9_.-]+:)?[a-z0-9/._-]+$/i)
     .describe("Valid ID");
+export const TagSchema = zod
+    .string()
+    .regex(/^#([a-z0-9_.-]+:)?[a-z0-9/._-]+$/i)
+    .describe("Valid Tag-ID");
 export const IdOrTagSchema = zod
     .string()
     .regex(/^#?([a-z0-9_.-]+:)?[a-z0-9/._-]+$/i)

package/dist/common/id.js.map

@@ -1 +1 @@
-{"version":3,"file":"id.js","sourceRoot":"","sources":["../../src/common/id.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,KAAK,CAAC;AAmBtB,MAAM,CAAC,MAAM,QAAQ,GAAG,GAAG;KACxB,MAAM,EAAE;KACR,KAAK,CAAC,kCAAkC,CAAC;KACzC,QAAQ,CAAC,UAAU,CAAC,CAAC;AACxB,MAAM,CAAC,MAAM,aAAa,GAAG,GAAG;KAC7B,MAAM,EAAE;KACR,KAAK,CAAC,oCAAoC,CAAC;KAC3C,QAAQ,CAAC,oBAAoB,CAAC,CAAC;AAElC,MAAM,UAAU,QAAQ,CAAC,IAAa;IACpC,IAAI,OAAO,IAAI,KAAK,QAAQ;QAAE,OAAO,IAAI,CAAC;IAC1C,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;QACtB,OAAO,EAAE,GAAG,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;IAEzD,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAErB,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC;QAAE,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IACvE,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAqB,CAAC;IAC9D,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;AAC7B,CAAC;AAED,MAAM,UAAU,QAAQ,CAAmB,IAAgB;IACzD,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC7B,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAE1B,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC;YAAE,OAAO,IAAuB,CAAC;QACvD,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;YACtB,OAAO,cAAc,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAqB,CAAC;QAC9D,OAAO,aAAa,IAAI,EAAqB,CAAC;IAChD,CAAC;IACD,IAAI,IAAI,CAAC,KAAK;QAAE,OAAO,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,IAAI,EAAqB,CAAC;IAC5E,OAAO,GAAG,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,IAAI,EAAqB,CAAC;AAC7D,CAAC;AAED,MAAM,UAAU,MAAM,CAAC,EAAW,EAAE,MAAc;IAChD,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,EAAE,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAC;IACvC,OAAO,QAAQ,CAAC,EAAE,GAAG,IAAI,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,EAAE,CAAC,CAAC;AACpD,CAAC;AAED,MAAM,UAAU,MAAM,CAAC,EAAW,EAAE,MAAc;IAChD,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,EAAE,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAC;IACvC,OAAO,QAAQ,CAAC,EAAE,GAAG,IAAI,EAAE,IAAI,EAAE,IAAI,GAAG,MAAM,EAAE,CAAC,CAAC;AACpD,CAAC"}
+{"version":3,"file":"id.js","sourceRoot":"","sources":["../../src/common/id.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,KAAK,CAAC;AAmBtB,MAAM,CAAC,MAAM,QAAQ,GAAG,GAAG;KACxB,MAAM,EAAE;KACR,KAAK,CAAC,kCAAkC,CAAC;KACzC,QAAQ,CAAC,UAAU,CAAC,CAAC;AAExB,MAAM,CAAC,MAAM,SAAS,GAAG,GAAG;KACzB,MAAM,EAAE;KACR,KAAK,CAAC,mCAAmC,CAAC;KAC1C,QAAQ,CAAC,cAAc,CAA8B,CAAC;AAEzD,MAAM,CAAC,MAAM,aAAa,GAAG,GAAG;KAC7B,MAAM,EAAE;KACR,KAAK,CAAC,oCAAoC,CAAC;KAC3C,QAAQ,CAAC,oBAAoB,CAAC,CAAC;AAElC,MAAM,UAAU,QAAQ,CAAC,IAAa;IACpC,IAAI,OAAO,IAAI,KAAK,QAAQ;QAAE,OAAO,IAAI,CAAC;IAC1C,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;QACtB,OAAO,EAAE,GAAG,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;IAEzD,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAErB,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC;QAAE,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IACvE,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAqB,CAAC;IAC9D,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;AAC7B,CAAC;AAED,MAAM,UAAU,QAAQ,CAAmB,IAAgB;IACzD,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC7B,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAE1B,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC;YAAE,OAAO,IAAuB,CAAC;QACvD,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;YACtB,OAAO,cAAc,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAqB,CAAC;QAC9D,OAAO,aAAa,IAAI,EAAqB,CAAC;IAChD,CAAC;IACD,IAAI,IAAI,CAAC,KAAK;QAAE,OAAO,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,IAAI,EAAqB,CAAC;IAC5E,OAAO,GAAG,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,IAAI,EAAqB,CAAC;AAC7D,CAAC;AAED,MAAM,UAAU,MAAM,CAAC,EAAW,EAAE,MAAc;IAChD,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,EAAE,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAC;IACvC,OAAO,QAAQ,CAAC,EAAE,GAAG,IAAI,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,EAAE,CAAC,CAAC;AACpD,CAAC;AAED,MAAM,UAAU,MAAM,CAAC,EAAW,EAAE,MAAc;IAChD,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,EAAE,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAC;IACvC,OAAO,QAAQ,CAAC,EAAE,GAAG,IAAI,EAAE,IAAI,EAAE,IAAI,GAAG,MAAM,EAAE,CAAC,CAAC;AACpD,CAAC"}

package/dist/common/ingredient/filter.d.ts

@@ -0,0 +1,6 @@
+import { Ingredient } from ".";
+import type { PackContext } from "../../loader/context";
+import { type CommonTest, type Predicate } from "../predicates";
+import type { IngredientInput } from "./input";
+export type IngredientTest = CommonTest<Ingredient> | IngredientInput | `#${string}`;
+export default function resolveIngredientTest(test: IngredientTest, context: Omit<PackContext, "results">): Predicate<IngredientInput>;

package/dist/common/ingredient/filter.js

@@ -0,0 +1,97 @@
+import { exists } from "@adeficior/pack-resolver";
+import { BlockIngredient, BlockTagIngredient, FluidIngredient, FluidTagIngredient, Ingredient, ItemIngredient, ItemTagIngredient, ListIngredient, } from ".";
+import { tryCatching } from "../../error";
+import { createId, encodeId } from "../id";
+import { resolveCommonTest, } from "../predicates";
+export default function resolveIngredientTest(test, 
+// TODO pass context?
+context) {
+    if (typeof test === "string") {
+        if (test.startsWith("#")) {
+            return resolveIngredientTest(new ItemTagIngredient(test.substring(1)), context);
+        }
+        return resolveIngredientTest(new ItemIngredient(test), context);
+    }
+    if (test instanceof RegExp) {
+        return resolveIdTest(test, context.tags.registry("item"), extractItemID);
+    }
+    if (typeof test === "function") {
+        return (it, logger) => test(context.ingredients.create(it), logger);
+    }
+    if (test instanceof Ingredient) {
+        test.validate(context.lookup);
+    }
+    if (test instanceof ItemTagIngredient) {
+        return resolveIdTest(`#${encodeId(test.tag)}`, context.tags.registry("item"), extractItemID);
+    }
+    if (test instanceof ItemIngredient) {
+        return resolveIdTest(encodeId(test.id), context.tags.registry("item"), extractItemID);
+    }
+    if (test instanceof FluidTagIngredient) {
+        return resolveIdTest(`#${encodeId(test.tag)}`, context.tags.registry("fluid"), extractFluidID);
+    }
+    if (test instanceof FluidIngredient) {
+        return resolveIdTest(encodeId(test.id), context.tags.registry("fluid"), extractFluidID);
+    }
+    if (test instanceof BlockTagIngredient) {
+        return resolveIdTest(`#${encodeId(test.tag)}`, context.tags.registry("block"), extractBlockID);
+    }
+    // TODO match method in ingredient itself?
+    if (test instanceof BlockIngredient) {
+        return resolveIdTest(encodeId(test.id), context.tags.registry("block"), extractBlockID);
+    }
+    // TODO add support for ListIngredient?
+    // TODO warn or throw?
+    return () => false;
+}
+// TODO is Predicate<Ingredient> fine?
+function resolveIdTest(test, tags, idSupplier) {
+    function resolveIds(it) {
+        if (typeof it === "string")
+            return [it];
+        if (it instanceof ListIngredient) {
+            return it.entries.flatMap(resolveIds);
+        }
+        else if (Array.isArray(it)) {
+            return it.flatMap(resolveIds);
+        }
+        else {
+            return [idSupplier(it)].filter(exists);
+        }
+    }
+    return resolveCommonTest(test, (input, logger) => 
+    // TODO which exception has to be caught here?
+    tryCatching(logger, () => {
+        return resolveIds(input).map(encodeId);
+    }) ?? [], tags);
+}
+function extractItemID(ingredient) {
+    if (ingredient instanceof ItemTagIngredient) {
+        return { ...createId(ingredient.tag), isTag: true };
+    }
+    if (ingredient instanceof ItemIngredient) {
+        return ingredient.id;
+    }
+    return null;
+}
+// TODO functions on the ingredient itself?
+// TODO common super class maybe even?
+function extractBlockID(ingredient) {
+    if (ingredient instanceof BlockTagIngredient) {
+        return { ...createId(ingredient.tag), isTag: true };
+    }
+    if (ingredient instanceof BlockIngredient) {
+        return ingredient.id;
+    }
+    return null;
+}
+function extractFluidID(ingredient) {
+    if (ingredient instanceof FluidTagIngredient) {
+        return { ...createId(ingredient.tag), isTag: true };
+    }
+    if (ingredient instanceof FluidIngredient) {
+        return ingredient.id;
+    }
+    return null;
+}
+//# sourceMappingURL=filter.js.map

package/dist/common/ingredient/filter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"filter.js","sourceRoot":"","sources":["../../../src/common/ingredient/filter.ts"],"names":[],"mappings":"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"}

package/dist/common/ingredient/index.d.ts

@@ -0,0 +1,74 @@
+import type { BlockId, FluidId, ItemId } from "@adeficior/data-modifier/generated";
+import type RegistryLookup from "../../loader/registry";
+import type { SemVerInput } from "../../packFormat";
+import { type IdInput } from "../id";
+import type { Serializable } from "../serializable";
+export declare abstract class Ingredient implements Serializable {
+    validate(_?: RegistryLookup): void;
+    abstract toJSON(packFormat: SemVerInput): unknown;
+}
+export declare class ItemTagIngredient extends Ingredient {
+    readonly tag: IdInput;
+    readonly count: number;
+    constructor(tag: IdInput, count?: number);
+    toJSON(_packFormat: SemVerInput): {
+        tag: `${string}:${string}`;
+        count: number | undefined;
+    };
+}
+export declare class FluidTagIngredient extends Ingredient {
+    readonly tag: IdInput;
+    readonly amount: number;
+    constructor(tag: IdInput, amount?: number);
+    toJSON(_packFormat: SemVerInput): {
+        fluidTag: `${string}:${string}`;
+        amount: number;
+    };
+}
+export declare class BlockTagIngredient extends Ingredient {
+    readonly tag: IdInput;
+    constructor(tag: IdInput);
+    toJSON(_packFormat: SemVerInput): {
+        blockTag: `${string}:${string}`;
+    };
+}
+export declare class ItemIngredient extends Ingredient {
+    readonly id: IdInput<ItemId>;
+    readonly count: number;
+    constructor(id: IdInput<ItemId>, count?: number);
+    toJSON(_packFormat: SemVerInput): {
+        item: `${string}:${string}`;
+        count: number | undefined;
+    };
+    validate(lookup?: RegistryLookup): void;
+}
+export declare class FluidIngredient extends Ingredient {
+    readonly id: IdInput<FluidId>;
+    readonly amount: number;
+    readonly chance?: number | undefined;
+    constructor(id: IdInput<FluidId>, amount?: number, chance?: number | undefined);
+    toJSON(_packFormat: SemVerInput): {
+        fluid: `${string}:${string}`;
+        amount: number;
+    };
+    validate(lookup?: RegistryLookup): void;
+}
+export declare class BlockIngredient extends Ingredient {
+    readonly id: IdInput<BlockId>;
+    readonly weight?: number | undefined;
+    constructor(id: IdInput<BlockId>, weight?: number | undefined);
+    toJSON(_packFormat: SemVerInput): {
+        block: `${string}:${string}`;
+        weight: number | undefined;
+    };
+    validate(lookup?: RegistryLookup): void;
+}
+export declare class ListIngredient extends Ingredient {
+    readonly entries: Ingredient[];
+    constructor(entries: Ingredient[]);
+    toJSON(packFormat: SemVerInput): unknown[];
+    validate(lookup?: RegistryLookup): void;
+}
+export type ItemLikeIngredient = ItemTagIngredient | ItemIngredient;
+export type FluidLikeIngredient = FluidTagIngredient | FluidIngredient;
+export type BlockLikeIngredient = BlockTagIngredient | BlockIngredient;

package/dist/common/ingredient/index.js

@@ -0,0 +1,112 @@
+import { encodeId } from "../id";
+import { BUCKET } from "../units";
+export class Ingredient {
+    // TODO make required
+    validate(_) { }
+}
+export class ItemTagIngredient extends Ingredient {
+    tag;
+    count;
+    constructor(tag, count = 1) {
+        super();
+        this.tag = tag;
+        this.count = count;
+    }
+    toJSON(_packFormat) {
+        const count = this.count === 1 ? undefined : this.count;
+        const tag = encodeId(this.tag);
+        return { tag, count };
+    }
+}
+export class FluidTagIngredient extends Ingredient {
+    tag;
+    amount;
+    constructor(tag, amount = BUCKET) {
+        super();
+        this.tag = tag;
+        this.amount = amount;
+    }
+    toJSON(_packFormat) {
+        const { amount } = this;
+        const tag = encodeId(this.tag);
+        return { fluidTag: tag, amount };
+    }
+}
+export class BlockTagIngredient extends Ingredient {
+    tag;
+    constructor(tag) {
+        super();
+        this.tag = tag;
+    }
+    toJSON(_packFormat) {
+        const tag = encodeId(this.tag);
+        return { blockTag: tag };
+    }
+}
+export class ItemIngredient extends Ingredient {
+    id;
+    count;
+    constructor(id, count = 1) {
+        super();
+        this.id = id;
+        this.count = count;
+    }
+    toJSON(_packFormat) {
+        const count = this.count === 1 ? undefined : this.count;
+        const id = encodeId(this.id);
+        return { item: id, count };
+    }
+    validate(lookup) {
+        lookup?.validateEntry("minecraft:item", this.id);
+    }
+}
+export class FluidIngredient extends Ingredient {
+    id;
+    amount;
+    chance;
+    constructor(id, amount = BUCKET, chance) {
+        super();
+        this.id = id;
+        this.amount = amount;
+        this.chance = chance;
+    }
+    toJSON(_packFormat) {
+        const { amount } = this;
+        const id = encodeId(this.id);
+        return { fluid: id, amount };
+    }
+    validate(lookup) {
+        lookup?.validateEntry("minecraft:fluid", this.id);
+    }
+}
+export class BlockIngredient extends Ingredient {
+    id;
+    weight;
+    constructor(id, weight) {
+        super();
+        this.id = id;
+        this.weight = weight;
+    }
+    toJSON(_packFormat) {
+        const { weight } = this;
+        const id = encodeId(this.id);
+        return { block: id, weight };
+    }
+    validate(lookup) {
+        lookup?.validateEntry("minecraft:block", this.id);
+    }
+}
+export class ListIngredient extends Ingredient {
+    entries;
+    constructor(entries) {
+        super();
+        this.entries = entries;
+    }
+    toJSON(packFormat) {
+        return this.entries.map((it) => it.toJSON(packFormat));
+    }
+    validate(lookup) {
+        this.entries.forEach((it) => it.validate(lookup));
+    }
+}
+//# sourceMappingURL=index.js.map

package/dist/common/ingredient/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/common/ingredient/index.ts"],"names":[],"mappings":"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"}

package/dist/common/ingredient/input.d.ts

@@ -0,0 +1,3 @@
+import type { ItemId } from "@adeficior/data-modifier/generated";
+import type { Ingredient } from ".";
+export type IngredientInput = ItemId | Ingredient | IngredientInput[];

package/dist/common/ingredient/input.js

@@ -0,0 +1 @@
+//# sourceMappingURL=input.js.map

package/dist/common/ingredient/input.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"input.js","sourceRoot":"","sources":["../../../src/common/ingredient/input.ts"],"names":[],"mappings":""}

package/dist/common/ingredient/serializer.d.ts

@@ -0,0 +1,17 @@
+import { Ingredient } from ".";
+import type RegistryLookup from "../../loader/registry";
+import type { SemVerInput } from "../../packFormat";
+import { IngredientMap, type IngredientMapInput } from "../../parser/recipe/ingredientMap";
+export default class IngredientSerializer {
+    private readonly packFormat;
+    private readonly lookup;
+    private readonly deserializer;
+    constructor(packFormat: SemVerInput, lookup: RegistryLookup);
+    serialize(ingredient: Ingredient): unknown;
+    serializeList(ingredients: Ingredient[]): unknown[];
+    private deserialize;
+    create(input: unknown): Ingredient;
+    validated<T extends Ingredient>(ingredient: T): T;
+    createList(input: unknown[]): Ingredient[];
+    ingredientMap(input: IngredientMapInput): IngredientMap;
+}

package/dist/common/ingredient/serializer.js

@@ -0,0 +1,112 @@
+import { mapValues } from "lodash-es";
+import z from "zod";
+import { BlockIngredient, BlockTagIngredient, FluidIngredient, FluidTagIngredient, Ingredient, ItemIngredient, ItemTagIngredient, ListIngredient, } from ".";
+import { IllegalShapeError } from "../../error";
+import { IngredientMap, } from "../../parser/recipe/ingredientMap";
+import { IdSchema } from "../id";
+class OldDeserializer {
+    schemas = {
+        itemTag: z.object({
+            tag: IdSchema,
+            count: z.number().optional(),
+        }),
+        fluidTag: z.object({
+            fluidTag: IdSchema,
+            amount: z.number(),
+        }),
+        blockTag: z.object({
+            blockTag: IdSchema,
+            weight: z.number().optional(),
+        }),
+        itemStack: z.object({
+            item: IdSchema,
+            count: z.number().int().optional(),
+        }),
+        fluidStack: z.object({
+            fluid: IdSchema,
+            amount: z.number(),
+        }),
+        block: z.object({
+            block: IdSchema,
+        }),
+    };
+    deserialize(input) {
+        if ("blockTag" in input) {
+            const parsed = this.schemas.blockTag.parse(input);
+            return new BlockTagIngredient(parsed.blockTag);
+        }
+        if ("tag" in input) {
+            const parsed = this.schemas.itemTag.parse(input);
+            return new ItemTagIngredient(parsed.tag, parsed.count);
+        }
+        if ("fluidTag" in input) {
+            const parsed = this.schemas.fluidTag.parse(input);
+            return new FluidTagIngredient(parsed.fluidTag, parsed.amount);
+        }
+        if ("block" in input) {
+            const parsed = this.schemas.block.parse(input);
+            return new BlockIngredient(parsed.block);
+        }
+        if ("item" in input) {
+            const parsed = this.schemas.itemStack.parse(input);
+            return new ItemIngredient(parsed.item, parsed.count);
+        }
+        if ("fluid" in input) {
+            const parsed = this.schemas.fluidStack.parse(input);
+            return new FluidIngredient(parsed.fluid, parsed.amount);
+        }
+        return null;
+    }
+}
+export default class IngredientSerializer {
+    packFormat;
+    lookup;
+    deserializer;
+    constructor(packFormat, lookup) {
+        this.packFormat = packFormat;
+        this.lookup = lookup;
+        this.deserializer = new OldDeserializer();
+    }
+    serialize(ingredient) {
+        return ingredient.toJSON(this.packFormat);
+    }
+    serializeList(ingredients) {
+        return ingredients.map((it) => this.serialize(it));
+    }
+    deserialize(input) {
+        if (input instanceof Ingredient)
+            return input;
+        if (!input)
+            throw new IllegalShapeError("ingredient input may not be null");
+        if (typeof input === "string") {
+            this.lookup.validateEntry("minecraft:item", input);
+            return new ItemIngredient(input);
+        }
+        if (Array.isArray(input)) {
+            return new ListIngredient(input.map((it) => this.deserialize(it)));
+        }
+        if (typeof input === "object") {
+            const deserialized = this.deserializer.deserialize(input);
+            if (deserialized)
+                return deserialized;
+        }
+        throw new IllegalShapeError(`unknown ingredient shape`, input);
+    }
+    // TODO rename deserialize
+    create(input) {
+        const deserialized = this.deserialize(input);
+        deserialized.validate(this.lookup);
+        return deserialized;
+    }
+    validated(ingredient) {
+        ingredient.validate(this.lookup);
+        return ingredient;
+    }
+    createList(input) {
+        return input.map((it) => this.create(it));
+    }
+    ingredientMap(input) {
+        return new IngredientMap(mapValues(input, (it) => this.create(it)));
+    }
+}
+//# sourceMappingURL=serializer.js.map

package/dist/common/ingredient/serializer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"serializer.js","sourceRoot":"","sources":["../../../src/common/ingredient/serializer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,CAAC,MAAM,KAAK,CAAC;AACpB,OAAO,EACL,eAAe,EACf,kBAAkB,EAClB,eAAe,EACf,kBAAkB,EAClB,UAAU,EACV,cAAc,EACd,iBAAiB,EACjB,cAAc,GACf,MAAM,GAAG,CAAC;AACX,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAGhD,OAAO,EACL,aAAa,GAEd,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAMjC,MAAM,eAAe;IACF,OAAO,GAAG;QACzB,OAAO,EAAE,CAAC,CAAC,MAAM,CAAC;YAChB,GAAG,EAAE,QAAQ;YACb,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;SAC7B,CAAC;QACF,QAAQ,EAAE,CAAC,CAAC,MAAM,CAAC;YACjB,QAAQ,EAAE,QAAQ;YAClB,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE;SACnB,CAAC;QACF,QAAQ,EAAE,CAAC,CAAC,MAAM,CAAC;YACjB,QAAQ,EAAE,QAAQ;YAClB,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;SAC9B,CAAC;QACF,SAAS,EAAE,CAAC,CAAC,MAAM,CAAC;YAClB,IAAI,EAAE,QAAQ;YACd,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE;SACnC,CAAC;QACF,UAAU,EAAE,CAAC,CAAC,MAAM,CAAC;YACnB,KAAK,EAAE,QAAQ;YACf,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE;SACnB,CAAC;QACF,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC;YACd,KAAK,EAAE,QAAQ;SAChB,CAAC;KACH,CAAC;IAEF,WAAW,CAAC,KAA8B;QACxC,IAAI,UAAU,IAAI,KAAK,EAAE,CAAC;YACxB,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAClD,OAAO,IAAI,kBAAkB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QACjD,CAAC;QAED,IAAI,KAAK,IAAI,KAAK,EAAE,CAAC;YACnB,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACjD,OAAO,IAAI,iBAAiB,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;QACzD,CAAC;QAED,IAAI,UAAU,IAAI,KAAK,EAAE,CAAC;YACxB,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAClD,OAAO,IAAI,kBAAkB,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;QAChE,CAAC;QAED,IAAI,OAAO,IAAI,KAAK,EAAE,CAAC;YACrB,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAC/C,OAAO,IAAI,eAAe,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC3C,CAAC;QAED,IAAI,MAAM,IAAI,KAAK,EAAE,CAAC;YACpB,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACnD,OAAO,IAAI,cAAc,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;QACvD,CAAC;QAED,IAAI,OAAO,IAAI,KAAK,EAAE,CAAC;YACrB,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACpD,OAAO,IAAI,eAAe,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;QAC1D,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AAED,MAAM,CAAC,OAAO,OAAO,oBAAoB;IAIpB;IACA;IAJF,YAAY,CAAwB;IAErD,YACmB,UAAuB,EACvB,MAAsB;QADtB,eAAU,GAAV,UAAU,CAAa;QACvB,WAAM,GAAN,MAAM,CAAgB;QAEvC,IAAI,CAAC,YAAY,GAAG,IAAI,eAAe,EAAE,CAAC;IAC5C,CAAC;IAED,SAAS,CAAC,UAAsB;QAC9B,OAAO,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC5C,CAAC;IAED,aAAa,CAAC,WAAyB;QACrC,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC;IACrD,CAAC;IAEO,WAAW,CAAC,KAAc;QAChC,IAAI,KAAK,YAAY,UAAU;YAAE,OAAO,KAAK,CAAC;QAE9C,IAAI,CAAC,KAAK;YAAE,MAAM,IAAI,iBAAiB,CAAC,kCAAkC,CAAC,CAAC;QAE5E,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC9B,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC;YACnD,OAAO,IAAI,cAAc,CAAC,KAAK,CAAC,CAAC;QACnC,CAAC;QAED,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YACzB,OAAO,IAAI,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QACrE,CAAC;QAED,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC9B,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC,WAAW,CAChD,KAAgC,CACjC,CAAC;YACF,IAAI,YAAY;gBAAE,OAAO,YAAY,CAAC;QACxC,CAAC;QAED,MAAM,IAAI,iBAAiB,CAAC,0BAA0B,EAAE,KAAK,CAAC,CAAC;IACjE,CAAC;IAED,0BAA0B;IAC1B,MAAM,CAAC,KAAc;QACnB,MAAM,YAAY,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAC7C,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACnC,OAAO,YAAY,CAAC;IACtB,CAAC;IAED,SAAS,CAAuB,UAAa;QAC3C,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACjC,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,UAAU,CAAC,KAAgB;QACzB,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;IAC5C,CAAC;IAED,aAAa,CAAC,KAAyB;QACrC,OAAO,IAAI,aAAa,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IACtE,CAAC;CACF"}

package/dist/common/predicates.d.ts

@@ -2,6 +2,7 @@ import type { InferIds, RegistryId } from "@adeficior/data-modifier/generated";
 import type { Logger } from "@adeficior/pack-resolver";
 import type { TagRegistry } from "../loader/tags.js";
 import type { IdInput, NormalizedId } from "./id.js";
-import type { CommonTest, Predicate } from "./ingredient.js";
+export type Predicate<T> = (value: T, logger?: Logger) => boolean;
+export type CommonTest<T> = RegExp | Predicate<T> | T;
 export declare function resolveCommonTest<TEntry, TId extends string>(test: CommonTest<TId>, resolve: (value: TEntry, logger?: Logger) => NormalizedId<TId>[], tags?: TagRegistry<RegistryId>): Predicate<TEntry>;
 export declare function resolveIDTest<T extends RegistryId>(test: CommonTest<NormalizedId<InferIds<T>>>, tags?: TagRegistry<T>): Predicate<IdInput<InferIds<T>>>;

package/dist/common/predicates.js.map

@@ -1 +1 @@
-{"version":3,"file":"predicates.js","sourceRoot":"","sources":["../../src/common/predicates.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAGnC,MAAM,UAAU,iBAAiB,CAC/B,IAAqB,EACrB,OAAgE,EAChE,IAA8B;IAE9B,IAAI,OAAO,IAAI,KAAK,UAAU,EAAE,CAAC;QAC/B,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,CACvB,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,EAAS,EAAE,MAAM,CAAC,CAAC,CAAC;IACjE,CAAC;SAAM,IAAI,IAAI,YAAY,MAAM,EAAE,CAAC;QAClC,OAAO,CAAC,UAAU,EAAE,MAAM,EAAE,EAAE;YAC5B,OAAO,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;QACjE,CAAC,CAAC;IACJ,CAAC;SAAM,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;QAChC,OAAO,CAAC,UAAU,EAAE,MAAM,EAAE,EAAE;YAC5B,OAAO,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE;gBAC7C,IAAI,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,IAAI,KAAK,EAAE;oBAAE,OAAO,IAAI,CAAC;qBAC9C,IAAI,IAAI;oBAAE,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAgB,EAAE,EAAE,CAAC,IAAI,KAAK,CAAC;;oBAC9D,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;YAC5D,CAAC,CAAC,CAAC;QACL,CAAC,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,UAAU,EAAE,MAAM,EAAE,EAAE;YAC5B,OAAO,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;QAC9D,CAAC,CAAC;IACJ,CAAC;AACH,CAAC;AAED,MAAM,UAAU,aAAa,CAC3B,IAA2C,EAC3C,IAAqB;IAErB,OAAO,iBAAiB,CACtB,IAAI,EACJ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,EACtB,IAAI,CACL,CAAC;AACJ,CAAC"}
+{"version":3,"file":"predicates.js","sourceRoot":"","sources":["../../src/common/predicates.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAKnC,MAAM,UAAU,iBAAiB,CAC/B,IAAqB,EACrB,OAAgE,EAChE,IAA8B;IAE9B,IAAI,OAAO,IAAI,KAAK,UAAU,EAAE,CAAC;QAC/B,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,CACvB,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,EAAS,EAAE,MAAM,CAAC,CAAC,CAAC;IACjE,CAAC;SAAM,IAAI,IAAI,YAAY,MAAM,EAAE,CAAC;QAClC,OAAO,CAAC,UAAU,EAAE,MAAM,EAAE,EAAE;YAC5B,OAAO,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;QACjE,CAAC,CAAC;IACJ,CAAC;SAAM,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;QAChC,OAAO,CAAC,UAAU,EAAE,MAAM,EAAE,EAAE;YAC5B,OAAO,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE;gBAC7C,IAAI,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,IAAI,KAAK,EAAE;oBAAE,OAAO,IAAI,CAAC;qBAC9C,IAAI,IAAI;oBAAE,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAgB,EAAE,EAAE,CAAC,IAAI,KAAK,CAAC;;oBAC9D,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;YAC5D,CAAC,CAAC,CAAC;QACL,CAAC,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,UAAU,EAAE,MAAM,EAAE,EAAE;YAC5B,OAAO,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;QAC9D,CAAC,CAAC;IACJ,CAAC;AACH,CAAC;AAED,MAAM,UAAU,aAAa,CAC3B,IAA2C,EAC3C,IAAqB;IAErB,OAAO,iBAAiB,CACtB,IAAI,EACJ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,EACtB,IAAI,CACL,CAAC;AACJ,CAAC"}

package/dist/common/result/filter.d.ts

@@ -0,0 +1,6 @@
+import type { Result } from ".";
+import type { PackContext } from "../../loader/context";
+import { type CommonTest, type Predicate } from "../predicates";
+import type { ResultInput } from "./input";
+export type ResultTest = CommonTest<Result> | ResultInput;
+export default function resolveResultTest(test: ResultTest, context: Omit<PackContext, "ingredients">): Predicate<ResultInput>;

package/dist/common/result/filter.js

@@ -0,0 +1,68 @@
+import { exists } from "@adeficior/pack-resolver";
+import { BlockResult, FluidResult, ItemResult } from ".";
+import { tryCatching } from "../../error";
+import { encodeId } from "../id";
+import { resolveCommonTest, } from "../predicates";
+export default function resolveResultTest(test, 
+// TODO pass context?
+context) {
+    if (typeof test === "string") {
+        return resolveResultTest(new ItemResult(test), context);
+    }
+    if (test instanceof RegExp) {
+        return resolveIdTest(test, context.tags.registry("item"), extractItemID);
+    }
+    if (typeof test === "function") {
+        return (it, logger) => test(context.results.create(it), logger);
+    }
+    if (test instanceof ItemResult) {
+        return resolveIdTest(encodeId(test.id), context.tags.registry("item"), extractItemID);
+    }
+    if (test instanceof FluidResult) {
+        return resolveIdTest(encodeId(test.id), context.tags.registry("fluid"), extractFluidID);
+    }
+    // TODO match method in ingredient itself?
+    if (test instanceof BlockResult) {
+        return resolveIdTest(encodeId(test.id), context.tags.registry("block"), extractBlockID);
+    }
+    // TODO warn or throw?
+    return () => false;
+}
+function resolveIdTest(test, tags, idSupplier) {
+    function resolveIds(it) {
+        if (typeof it === "string")
+            return [it];
+        if (Array.isArray(it)) {
+            return it.flatMap(resolveIds);
+        }
+        else {
+            return [idSupplier(it)].filter(exists);
+        }
+    }
+    return resolveCommonTest(test, (input, logger) => 
+    // TODO which exception has to be caught here?
+    tryCatching(logger, () => {
+        return resolveIds(input).map(encodeId);
+    }) ?? [], tags);
+}
+function extractItemID(ingredient) {
+    if (ingredient instanceof ItemResult) {
+        return ingredient.id;
+    }
+    return null;
+}
+// TODO functions on the ingredient itself?
+// TODO common super class maybe even?
+function extractBlockID(ingredient) {
+    if (ingredient instanceof BlockResult) {
+        return ingredient.id;
+    }
+    return null;
+}
+function extractFluidID(ingredient) {
+    if (ingredient instanceof FluidResult) {
+        return ingredient.id;
+    }
+    return null;
+}
+//# sourceMappingURL=filter.js.map

package/dist/common/result/filter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"filter.js","sourceRoot":"","sources":["../../../src/common/result/filter.ts"],"names":[],"mappings":"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"}

package/dist/common/result/index.d.ts

@@ -0,0 +1,41 @@
+import type { BlockId, FluidId, ItemId } from "@adeficior/data-modifier/generated";
+import type RegistryLookup from "../../loader/registry";
+import type { SemVerInput } from "../../packFormat";
+import { type IdInput } from "../id";
+import type { Serializable } from "../serializable";
+export declare abstract class Result implements Serializable {
+    validate(_?: RegistryLookup): void;
+    abstract toJSON(packFormat: SemVerInput): Record<string, unknown>;
+}
+export declare class ItemResult extends Result {
+    readonly id: IdInput<ItemId>;
+    readonly count: number;
+    readonly chance?: number | undefined;
+    constructor(id: IdInput<ItemId>, count?: number, chance?: number | undefined);
+    toJSON(_packFormat: SemVerInput): {
+        item: `${string}:${string}`;
+        count: number | undefined;
+        chance: number | undefined;
+    };
+    validate(lookup?: RegistryLookup): void;
+}
+export declare class FluidResult extends Result {
+    readonly id: IdInput<FluidId>;
+    readonly amount: number;
+    readonly chance?: number | undefined;
+    constructor(id: IdInput<FluidId>, amount?: number, chance?: number | undefined);
+    toJSON(_packFormat: SemVerInput): {
+        fluid: `${string}:${string}`;
+        amount: number;
+        chance: number | undefined;
+    };
+    validate(lookup?: RegistryLookup): void;
+}
+export declare class BlockResult extends Result {
+    readonly id: IdInput<BlockId>;
+    constructor(id: IdInput<BlockId>);
+    toJSON(_packFormat: SemVerInput): {
+        block: `${string}:${string}`;
+    };
+    validate(lookup?: RegistryLookup): void;
+}