@adeficior/data-modifier 1.0.0-rc.11 → 1.0.0-rc.13

package/dist/common/result/index.js

@@ -0,0 +1,59 @@
+import { encodeId } from "../id";
+import { BUCKET } from "../units";
+export class Result {
+    validate(_) { }
+}
+export class ItemResult extends Result {
+    id;
+    count;
+    chance;
+    constructor(id, count = 1, chance) {
+        super();
+        this.id = id;
+        this.count = count;
+        this.chance = chance;
+    }
+    toJSON(_packFormat) {
+        const { chance } = this;
+        const count = this.count === 1 ? undefined : this.count;
+        const id = encodeId(this.id);
+        return { item: id, count, chance };
+    }
+    validate(lookup) {
+        lookup?.validateEntry("minecraft:item", this.id);
+    }
+}
+export class FluidResult extends Result {
+    id;
+    amount;
+    chance;
+    constructor(id, amount = BUCKET, chance) {
+        super();
+        this.id = id;
+        this.amount = amount;
+        this.chance = chance;
+    }
+    toJSON(_packFormat) {
+        const { amount, chance } = this;
+        const id = encodeId(this.id);
+        return { fluid: id, amount, chance };
+    }
+    validate(lookup) {
+        lookup?.validateEntry("minecraft:fluid", this.id);
+    }
+}
+export class BlockResult extends Result {
+    id;
+    constructor(id) {
+        super();
+        this.id = id;
+    }
+    toJSON(_packFormat) {
+        const id = encodeId(this.id);
+        return { block: id };
+    }
+    validate(lookup) {
+        lookup?.validateEntry("minecraft:block", this.id);
+    }
+}
+//# sourceMappingURL=index.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/common/result/index.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,QAAQ,EAAgB,MAAM,OAAO,CAAC;AAE/C,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,MAAM,OAAgB,MAAM;IAC1B,QAAQ,CAAC,CAAkB,IAAS,CAAC;CAEtC;AAED,MAAM,OAAO,UAAW,SAAQ,MAAM;IAElB;IACA;IACA;IAHlB,YACkB,EAAmB,EACnB,QAAQ,CAAC,EACT,MAAe;QAE/B,KAAK,EAAE,CAAC;QAJQ,OAAE,GAAF,EAAE,CAAiB;QACnB,UAAK,GAAL,KAAK,CAAI;QACT,WAAM,GAAN,MAAM,CAAS;IAGjC,CAAC;IAED,MAAM,CAAC,WAAwB;QAC7B,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;QACxB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC;QACxD,MAAM,EAAE,GAAG,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC7B,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;IACrC,CAAC;IAEQ,QAAQ,CAAC,MAAuB;QACvC,MAAM,EAAE,aAAa,CAAC,gBAAgB,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;IACnD,CAAC;CACF;AAED,MAAM,OAAO,WAAY,SAAQ,MAAM;IAEnB;IACA;IACA;IAHlB,YACkB,EAAoB,EACpB,SAAiB,MAAM,EACvB,MAAe;QAE/B,KAAK,EAAE,CAAC;QAJQ,OAAE,GAAF,EAAE,CAAkB;QACpB,WAAM,GAAN,MAAM,CAAiB;QACvB,WAAM,GAAN,MAAM,CAAS;IAGjC,CAAC;IAED,MAAM,CAAC,WAAwB;QAC7B,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;QAChC,MAAM,EAAE,GAAG,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC7B,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;IACvC,CAAC;IAEQ,QAAQ,CAAC,MAAuB;QACvC,MAAM,EAAE,aAAa,CAAC,iBAAiB,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;IACpD,CAAC;CACF;AAED,MAAM,OAAO,WAAY,SAAQ,MAAM;IACT;IAA5B,YAA4B,EAAoB;QAC9C,KAAK,EAAE,CAAC;QADkB,OAAE,GAAF,EAAE,CAAkB;IAEhD,CAAC;IAED,MAAM,CAAC,WAAwB;QAC7B,MAAM,EAAE,GAAG,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC7B,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;IACvB,CAAC;IAEQ,QAAQ,CAAC,MAAuB;QACvC,MAAM,EAAE,aAAa,CAAC,iBAAiB,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;IACpD,CAAC;CACF"}

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

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

package/dist/common/result/input.js

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

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

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

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

@@ -0,0 +1,15 @@
+import { Result } from ".";
+import type RegistryLookup from "../../loader/registry";
+import type { SemVerInput } from "../../packFormat";
+export default class ResultSerializer {
+    private readonly packFormat;
+    private readonly lookup;
+    private readonly deserializer;
+    constructor(packFormat: SemVerInput, lookup: RegistryLookup);
+    serialize(result: Result): Record<string, unknown>;
+    serializeList(results: Result[]): Record<string, unknown>[];
+    private deserialize;
+    create(input: unknown): Result;
+    validated<T extends Result>(result: T): T;
+    createList(input: unknown[]): Result[];
+}

package/dist/common/result/serializer.js

@@ -0,0 +1,81 @@
+import z from "zod";
+import { BlockResult, FluidResult, ItemResult, Result } from ".";
+import { IllegalShapeError } from "../../error";
+import { IdSchema } from "../id";
+class OldDeserializer {
+    schemas = {
+        itemStack: z.object({
+            item: IdSchema,
+            count: z.number().int().optional(),
+            chance: z.number().optional(),
+        }),
+        fluidStack: z.object({
+            fluid: IdSchema,
+            amount: z.number(),
+            chance: z.number().optional(),
+        }),
+        block: z.object({
+            block: IdSchema,
+        }),
+    };
+    deserialize(input) {
+        if ("block" in input) {
+            const parsed = this.schemas.block.parse(input);
+            return new BlockResult(parsed.block);
+        }
+        if ("item" in input) {
+            const parsed = this.schemas.itemStack.parse(input);
+            return new ItemResult(parsed.item, parsed.count, parsed.chance);
+        }
+        if ("fluid" in input) {
+            const parsed = this.schemas.fluidStack.parse(input);
+            return new FluidResult(parsed.fluid, parsed.amount, parsed.chance);
+        }
+        return null;
+    }
+}
+export default class ResultSerializer {
+    packFormat;
+    lookup;
+    deserializer;
+    constructor(packFormat, lookup) {
+        this.packFormat = packFormat;
+        this.lookup = lookup;
+        this.deserializer = new OldDeserializer();
+    }
+    serialize(result) {
+        return result.toJSON(this.packFormat);
+    }
+    serializeList(results) {
+        return results.map((it) => this.serialize(it));
+    }
+    deserialize(input) {
+        if (input instanceof Result)
+            return input;
+        if (!input)
+            throw new IllegalShapeError("result input may not be null");
+        if (typeof input === "string") {
+            this.lookup.validateEntry("minecraft:item", input);
+            return new ItemResult(input);
+        }
+        if (typeof input === "object") {
+            const deserialized = this.deserializer.deserialize(input);
+            if (deserialized)
+                return deserialized;
+        }
+        throw new IllegalShapeError(`unknown result shape`, input);
+    }
+    create(input) {
+        const deserialized = this.deserialize(input);
+        deserialized.validate(this.lookup);
+        return deserialized;
+    }
+    validated(result) {
+        result.validate(this.lookup);
+        return result;
+    }
+    createList(input) {
+        return input.map((it) => this.create(it));
+    }
+}
+//# sourceMappingURL=serializer.js.map

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

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

package/dist/common/serializable.d.ts

@@ -0,0 +1,6 @@
+import type RegistryLookup from "../loader/registry";
+import type { SemVerInput } from "../packFormat";
+export interface Serializable {
+    toJSON(packFormat: SemVerInput): unknown;
+    validate(lookup?: RegistryLookup): void;
+}

package/dist/common/serializable.js

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

package/dist/common/serializable.js.map

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

package/dist/common/units.d.ts

@@ -0,0 +1 @@
+export declare const BUCKET = 1000;

package/dist/common/units.js

@@ -0,0 +1,2 @@
+export const BUCKET = 1000;
+//# sourceMappingURL=units.js.map

package/dist/common/units.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"units.js","sourceRoot":"","sources":["../../src/common/units.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,MAAM,GAAG,IAAI,CAAC"}

package/dist/emit/blacklist.d.ts

@@ -1,8 +1,7 @@
 import type { InferIds, RegistryId } from "@adeficior/data-modifier/generated";
 import type { Acceptor, Logger } from "@adeficior/pack-resolver";
-import type { IngredientTest } from "../common/ingredient.js";
-import type RegistryLookup from "../loader/registry/index.js";
-import type { TagRegistryHolder } from "../loader/tags.js";
+import type { IngredientTest } from "../common/ingredient/filter.js";
+import type { PackContext } from "../loader/context.js";
 import type { ClearableEmitter } from "./index.js";
 export type HideMode = "jei" | "polytone";
 export interface BlacklistOptions {
@@ -15,11 +14,10 @@ export interface BlacklistRules {
 type RegistryIdInput<T extends RegistryId> = InferIds<T> | RegExp;
 export default class BlacklistEmitter implements BlacklistRules, ClearableEmitter {
     private readonly logger;
-    private readonly tags;
-    private readonly lookup;
+    private readonly context;
     private hidden;
     private readonly hideModes;
-    constructor(logger: Logger, tags: TagRegistryHolder, lookup: () => RegistryLookup, options: BlacklistOptions);
+    constructor(logger: Logger, context: PackContext, options: BlacklistOptions);
     hide(...inputs: IngredientTest[]): void;
     hideEntry<T extends RegistryId>(type: T, ...entries: RegistryIdInput<T>[]): void;
     private filterIds;

package/dist/emit/blacklist.js

@@ -1,34 +1,32 @@
 import { arrayOrSelf } from "@adeficior/pack-resolver";
 import { uniq } from "lodash-es";
 import { encodeId } from "../common/id.js";
-import { createIngredient, resolveIngredientTest, } from "../common/ingredient.js";
+import resolveIngredientTest from "../common/ingredient/filter.js";
+import { BlockIngredient, FluidIngredient, ItemIngredient, ListIngredient, } from "../common/ingredient/index.js";
 import { IllegalShapeError } from "../error.js";
 import { toJson } from "../textHelper.js";
 export default class BlacklistEmitter {
     logger;
-    tags;
-    lookup;
+    context;
     hidden = [];
     hideModes;
-    constructor(logger, tags, lookup, options) {
+    constructor(logger, context, options) {
         this.logger = logger;
-        this.tags = tags;
-        this.lookup = lookup;
+        this.context = context;
         this.hideModes = arrayOrSelf(options.hideFrom);
     }
     hide(...inputs) {
         this.hidden.push(...inputs.flatMap((test) => this.resolveIds(test)).map(encodeId));
     }
     hideEntry(type, ...entries) {
-        const lookup = this.lookup();
         const ids = entries
             .flatMap((entry) => {
             if (typeof entry === "string") {
-                lookup.validateEntry(type, entry);
+                this.context.lookup.validateEntry(type, entry);
                 return [entry];
             }
             else {
-                const keys = lookup.keys(type);
+                const keys = this.context.lookup.keys(type);
                 if (!keys)
                     throw new Error(`cannot hide using regex/predicates, registry ${encodeId(type)} not loaded`);
                 return [...keys].filter((it) => entry.test(it));
@@ -38,26 +36,26 @@ export default class BlacklistEmitter {
         this.hidden.push(...ids);
     }
     filterIds(test) {
-        const keys = this.lookup().keys("minecraft:item");
+        const keys = this.context.lookup.keys("minecraft:item");
         if (!keys)
             throw new Error("you can only use regex/predicates to blacklist items if a registry dump is loaded");
-        const predicate = resolveIngredientTest(test, this.tags, this.lookup());
+        const predicate = resolveIngredientTest(test, this.context);
         return [...keys.keys()].filter((it) => predicate(it, this.logger));
     }
     resolveIds(input) {
         if (input instanceof RegExp || typeof input === "function") {
             return this.filterIds(input);
         }
-        const ingredient = createIngredient(input, this.lookup());
-        if (Array.isArray(ingredient)) {
-            return ingredient.flatMap((it) => this.resolveIds(it));
+        const ingredient = this.context.ingredients.create(input);
+        if (ingredient instanceof ListIngredient) {
+            return ingredient.entries.flatMap((it) => this.resolveIds(it));
+        }
+        // TODO common super class?
+        if (ingredient instanceof BlockIngredient ||
+            ingredient instanceof FluidIngredient ||
+            ingredient instanceof ItemIngredient) {
+            return [encodeId(ingredient.id)];
         }
-        if ("item" in ingredient)
-            return [ingredient.item];
-        if ("fluid" in ingredient)
-            return [ingredient.fluid];
-        if ("block" in ingredient)
-            return [ingredient.block];
         throw new IllegalShapeError("illegal blacklist entry", input);
     }
     async emit(acceptor) {
@@ -77,7 +75,7 @@ export default class BlacklistEmitter {
         acceptor(path, content);
     }
     async emitPolytone(acceptor, hiddenIds) {
-        const tabs = this.lookup().keys("minecraft:creative_mode_tab");
+        const tabs = this.context.lookup.keys("minecraft:creative_mode_tab");
         if (!tabs)
             throw new Error("Cannot use polytone output without creative mod tab registry");
         const content = await toJson({

package/dist/emit/blacklist.js.map

@@ -1 +1 @@
-{"version":3,"file":"blacklist.js","sourceRoot":"","sources":["../../src/emit/blacklist.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAE3C,OAAO,EACL,gBAAgB,EAChB,qBAAqB,GACtB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAGhD,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAkB1C,MAAM,CAAC,OAAO,OAAO,gBAAgB;IAOhB;IACA;IACA;IANX,MAAM,GAAmB,EAAE,CAAC;IACnB,SAAS,CAAa;IAEvC,YACmB,MAAc,EACd,IAAuB,EACvB,MAA4B,EAC7C,OAAyB;QAHR,WAAM,GAAN,MAAM,CAAQ;QACd,SAAI,GAAJ,IAAI,CAAmB;QACvB,WAAM,GAAN,MAAM,CAAsB;QAG7C,IAAI,CAAC,SAAS,GAAG,WAAW,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACjD,CAAC;IAED,IAAI,CAAC,GAAG,MAAwB;QAC9B,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CACjE,CAAC;IACJ,CAAC;IAED,SAAS,CAAuB,IAAO,EAAE,GAAG,OAA6B;QACvE,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;QAC7B,MAAM,GAAG,GAAG,OAAO;aAChB,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YACjB,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;gBAC9B,MAAM,CAAC,aAAa,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;gBAClC,OAAO,CAAC,KAAK,CAAC,CAAC;YACjB,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAC/B,IAAI,CAAC,IAAI;oBACP,MAAM,IAAI,KAAK,CACb,gDAAgD,QAAQ,CACtD,IAAI,CACL,aAAa,CACf,CAAC;gBACJ,OAAO,CAAC,GAAG,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;YAClD,CAAC;QACH,CAAC,CAAC;aACD,GAAG,CAAC,QAAQ,CAAC,CAAC;QAEjB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC;IAC3B,CAAC;IAEO,SAAS,CAAC,IAAoB;QACpC,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QAClD,IAAI,CAAC,IAAI;YACP,MAAM,IAAI,KAAK,CACb,mFAAmF,CACpF,CAAC;QACJ,MAAM,SAAS,GAAG,qBAAqB,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;QAExE,OAAO,CAAC,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,SAAS,CAAC,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IACrE,CAAC;IAEO,UAAU,CAAC,KAAqB;QACtC,IAAI,KAAK,YAAY,MAAM,IAAI,OAAO,KAAK,KAAK,UAAU,EAAE,CAAC;YAC3D,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAC/B,CAAC;QAED,MAAM,UAAU,GAAG,gBAAgB,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;QAE1D,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;YAC9B,OAAO,UAAU,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC;QACzD,CAAC;QAED,IAAI,MAAM,IAAI,UAAU;YAAE,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QACnD,IAAI,OAAO,IAAI,UAAU;YAAE,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QACrD,IAAI,OAAO,IAAI,UAAU;YAAE,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QAErD,MAAM,IAAI,iBAAiB,CAAC,yBAAyB,EAAE,KAAK,CAAC,CAAC;IAChE,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,QAAkB;QAC3B,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;QAC3C,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO;QAEnC,MAAM,QAAQ,GAAoB,EAAE,CAAC;QACrC,IAAI,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC;YAChC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC,CAAC;QACnD,IAAI,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC;YACrC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC,CAAC;QACxD,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC9B,CAAC;IAEO,KAAK,CAAC,OAAO,CAAC,QAAkB,EAAE,SAAyB;QACjE,MAAM,OAAO,GAAG,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACrC,MAAM,IAAI,GAAG,mBAAmB,CAAC;QACjC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC1B,CAAC;IAEO,KAAK,CAAC,YAAY,CAAC,QAAkB,EAAE,SAAyB;QACtE,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;QAE/D,IAAI,CAAC,IAAI;YACP,MAAM,IAAI,KAAK,CACb,8DAA8D,CAC/D,CAAC;QAEJ,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC;YAC3B,OAAO,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;YAC3B,QAAQ,EAAE;gBACR;oBACE,IAAI,EAAE,aAAa;oBACnB,KAAK,EAAE,SAAS;iBACjB;aACF;SACF,CAAC,CAAC;QAEH,MAAM,IAAI,GAAG,8DAA8D,CAAC;QAC5E,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC1B,CAAC;IAED,KAAK;QACH,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;IACnB,CAAC;CACF"}
+{"version":3,"file":"blacklist.js","sourceRoot":"","sources":["../../src/emit/blacklist.ts"],"names":[],"mappings":"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"}

package/dist/emit/data/loot.d.ts

@@ -1,8 +1,9 @@
 import type { Acceptor, Logger } from "@adeficior/pack-resolver";
 import type { IdInput, NormalizedId } from "../../common/id.js";
-import type { CommonTest, IngredientInput, IngredientTest, Predicate } from "../../common/ingredient.js";
-import type RegistryLookup from "../../loader/registry/index.js";
-import type { TagRegistryHolder } from "../../loader/tags.js";
+import type { IngredientTest } from "../../common/ingredient/filter.js";
+import type { IngredientInput } from "../../common/ingredient/input.js";
+import { type CommonTest, type Predicate } from "../../common/predicates.js";
+import type { PackContext } from "../../loader/context.js";
 import type { LootItemInput } from "../../parser/lootTable.js";
 import type { LootModifier, LootTable } from "../../schema/data/loot.js";
 import type { ClearableEmitter, RegistryProvider } from "../index.js";
@@ -24,13 +25,11 @@ export interface LootRules {
 export default class LootTableEmitter implements LootRules, ClearableEmitter {
     private readonly logger;
     private readonly lootTables;
-    private readonly tags;
-    private readonly lookup;
-    private readonly packFormat;
+    private readonly context;
     private readonly customTables;
     private readonly customModifiers;
     private readonly ruled;
-    constructor(logger: Logger, lootTables: RegistryProvider<LootTable>, tags: TagRegistryHolder, lookup: () => RegistryLookup, packFormat: number);
+    constructor(logger: Logger, lootTables: RegistryProvider<LootTable>, context: PackContext);
     private tablePath;
     private modifierPath;
     clear(): void;

package/dist/emit/data/loot.js

@@ -1,6 +1,7 @@
 import { encodeId, prefix } from "../../common/id.js";
-import { resolveIngredientTest } from "../../common/ingredient.js";
-import { resolveIDTest } from "../../common/predicates.js";
+import resolveIngredientTest from "../../common/ingredient/filter.js";
+import { resolveIDTest, } from "../../common/predicates.js";
+import { isAtLeastVersion } from "../../packFormat.js";
 import { createLootEntry, replaceItemInTable } from "../../parser/lootTable.js";
 import { EmptyLootEntry, LootTableSchema } from "../../schema/data/loot.js";
 import CustomEmitter from "../custom.js";
@@ -16,22 +17,22 @@ export const EMPTY_LOOT_MODIFIER = {
 export default class LootTableEmitter {
     logger;
     lootTables;
-    tags;
-    lookup;
-    packFormat;
+    context;
     customTables = new CustomEmitter((it) => this.tablePath(it));
     customModifiers = new CustomEmitter((it) => this.modifierPath(it));
     ruled;
-    constructor(logger, lootTables, tags, lookup, packFormat) {
+    constructor(logger, lootTables, context) {
         this.logger = logger;
         this.lootTables = lootTables;
-        this.tags = tags;
-        this.lookup = lookup;
-        this.packFormat = packFormat;
-        this.ruled = new RuledEmitter(this.logger, this.lootTables, (id) => this.tablePath(id), EMPTY_LOOT_TABLE, (id) => this.customTables.has(id));
+        this.context = context;
+        this.ruled = new RuledEmitter(this.logger, this.lootTables, (id) => this.tablePath(id), EMPTY_LOOT_TABLE, 
+        // TODO also add value object here?
+        (it) => it, (id) => this.customTables.has(id));
     }
     tablePath(id) {
-        const folder = this.packFormat > 44 ? "loot_table" : "loot_tables";
+        const folder = isAtLeastVersion(this.context.packFormat, "44")
+            ? "loot_table"
+            : "loot_tables";
         return `data/${id.namespace}/${folder}/${id.path}.json`;
     }
     modifierPath(id) {
@@ -50,7 +51,7 @@ export default class LootTableEmitter {
         ]);
     }
     resolveIngredientTest(test) {
-        return resolveIngredientTest(test, this.tags, this.lookup());
+        return resolveIngredientTest(test, this.context);
     }
     resolveLootTableTest(test) {
         const id = [];
@@ -71,7 +72,7 @@ export default class LootTableEmitter {
     replaceOutput(from, to, additionalTests = {}) {
         const predicates = this.resolveLootTableTest(additionalTests);
         const outputPredicate = this.resolveIngredientTest(from);
-        const replacer = replaceItemInTable(outputPredicate, createLootEntry(to, this.lookup()));
+        const replacer = replaceItemInTable(outputPredicate, createLootEntry(to, this.context.lookup));
         this.ruled.addRule(new LootTableRule(["replace output", from, "with", to, additionalTests], predicates.id, [outputPredicate, ...predicates.output], replacer));
     }
     removeOutput(from, additionalTests) {

package/dist/emit/data/loot.js.map

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

package/dist/emit/data/recipe.d.ts

@@ -1,10 +1,13 @@
 import type { RecipeSerializerId } from "@adeficior/data-modifier/generated";
 import type { Acceptor, Logger } from "@adeficior/pack-resolver";
 import type { IdInput, NormalizedId } from "../../common/id.js";
-import type { CommonTest, Ingredient, IngredientInput, IngredientTest, Predicate } from "../../common/ingredient.js";
-import type { Result, ResultInput } from "../../common/result.js";
-import type RegistryLookup from "../../loader/registry/index.js";
-import type { TagRegistryHolder } from "../../loader/tags.js";
+import type { IngredientTest } from "../../common/ingredient/filter.js";
+import type { IngredientInput } from "../../common/ingredient/input.js";
+import { type CommonTest, type Predicate } from "../../common/predicates.js";
+import type { ResultTest } from "../../common/result/filter.js";
+import type { ResultInput } from "../../common/result/input.js";
+import type { PackContext } from "../../loader/context.js";
+import type { RecipeSerializer } from "../../parser/recipe/index.js";
 import { Recipe } from "../../parser/recipe/index.js";
 import type { RecipeDefinition } from "../../schema/data/recipe.js";
 import type { ClearableEmitter, RegistryProvider } from "../index.js";
@@ -12,35 +15,34 @@ export type RecipeTest = Readonly<{
     id?: CommonTest<NormalizedId>;
     type?: CommonTest<NormalizedId<RecipeSerializerId>>;
     namespace?: string;
-    output?: IngredientTest;
+    output?: ResultTest;
     input?: IngredientTest;
     optional?: boolean;
 }>;
 export interface RecipeRules {
-    resolveIngredientTest(test?: IngredientTest): Predicate<IngredientInput>;
-    replaceResult(test: IngredientTest, value: Result, additionalTests?: RecipeTest): void;
-    replaceIngredient(test: IngredientTest, value: Ingredient, additionalTests?: RecipeTest): void;
-    add<TDefinition extends RecipeDefinition, TRecipe extends Recipe<TDefinition>>(id: IdInput, value: TDefinition | TRecipe): void;
+    replaceResult(test: ResultTest, value: ResultInput, additionalTests?: RecipeTest): void;
+    replaceIngredient(test: IngredientTest, value: IngredientInput, additionalTests?: RecipeTest): void;
+    add(id: IdInput, value: RecipeDefinition | Recipe): void;
     remove(test: RecipeTest): void;
 }
 export declare const EMPTY_RECIPE: RecipeDefinition;
 export default class RecipeEmitter implements RecipeRules, ClearableEmitter {
     private readonly logger;
     private readonly registry;
-    private readonly tags;
-    private readonly lookup;
-    private readonly packFormat;
+    private readonly context;
+    private readonly serializer;
     private readonly custom;
     private readonly ruled;
-    constructor(logger: Logger, registry: RegistryProvider<Recipe>, tags: TagRegistryHolder, lookup: () => RegistryLookup, packFormat: number);
+    constructor(logger: Logger, registry: RegistryProvider<Recipe>, context: PackContext, serializer: RecipeSerializer);
     private recipePath;
     emit(acceptor: Acceptor): Promise<void>;
     resolveIngredientTest(test?: IngredientTest): Predicate<IngredientInput>;
+    resolveResultTest(test?: ResultTest): Predicate<ResultInput>;
     private resolveRecipeTest;
-    add<TDefinition extends RecipeDefinition, TRecipe extends Recipe<TDefinition>>(id: IdInput, value: TDefinition | TRecipe): void;
+    add(id: IdInput, value: RecipeDefinition | Recipe): void;
     private addRule;
     remove(test: RecipeTest): void;
-    replaceResult(test: IngredientTest, value: ResultInput, additionalTest?: RecipeTest): void;
-    replaceIngredient(test: IngredientTest, value: IngredientInput, additionalTest?: RecipeTest): void;
+    replaceResult(test: ResultTest, input: ResultInput, additionalTest?: RecipeTest): void;
+    replaceIngredient(test: IngredientTest, input: IngredientInput, additionalTest?: RecipeTest): void;
     clear(): void;
 }

package/dist/emit/data/recipe.js

@@ -1,8 +1,9 @@
 import { exists } from "@adeficior/pack-resolver";
 import { encodeId } from "../../common/id.js";
-import { createIngredient, resolveIngredientTest, } from "../../common/ingredient.js";
-import { resolveIDTest } from "../../common/predicates.js";
-import { createResult } from "../../common/result.js";
+import resolveIngredientTest from "../../common/ingredient/filter.js";
+import { resolveIDTest, } from "../../common/predicates.js";
+import resolveResultTest from "../../common/result/filter.js";
+import { isAtLeastVersion } from "../../packFormat.js";
 import { createReplacer, Recipe } from "../../parser/recipe/index.js";
 import CustomEmitter from "../custom.js";
 import RecipeRule from "../rule/recipe.js";
@@ -27,21 +28,21 @@ export const EMPTY_RECIPE = {
 export default class RecipeEmitter {
     logger;
     registry;
-    tags;
-    lookup;
-    packFormat;
+    context;
+    serializer;
     custom = new CustomEmitter((it) => this.recipePath(it));
     ruled;
-    constructor(logger, registry, tags, lookup, packFormat) {
+    constructor(logger, registry, context, serializer) {
         this.logger = logger;
         this.registry = registry;
-        this.tags = tags;
-        this.lookup = lookup;
-        this.packFormat = packFormat;
-        this.ruled = new RuledEmitter(this.logger, this.registry, (id) => this.recipePath(id), EMPTY_RECIPE, (id) => this.custom.has(id));
+        this.context = context;
+        this.serializer = serializer;
+        this.ruled = new RuledEmitter(this.logger, this.registry, (id) => this.recipePath(id), EMPTY_RECIPE, (it) => this.serializer.serialize(it), (id) => this.custom.has(id));
     }
     recipePath(id) {
-        const folder = this.packFormat > 44 ? "recipe" : "recipes";
+        const folder = isAtLeastVersion(this.context.packFormat, "44")
+            ? "recipe"
+            : "recipes";
         return `data/${id.namespace}/${folder}/${id.path}.json`;
     }
     async emit(acceptor) {
@@ -50,7 +51,12 @@ export default class RecipeEmitter {
     resolveIngredientTest(test) {
         if (!test)
             return () => true;
-        return resolveIngredientTest(test, this.tags, this.lookup());
+        return resolveIngredientTest(test, this.context);
+    }
+    resolveResultTest(test) {
+        if (!test)
+            return () => true;
+        return resolveResultTest(test, this.context);
     }
     resolveRecipeTest(test) {
         const id = [];
@@ -64,7 +70,7 @@ export default class RecipeEmitter {
         if (test.namespace)
             id.push((id) => id.namespace === test.namespace);
         if (test.output)
-            result.push(this.resolveIngredientTest(test.output));
+            result.push(this.resolveResultTest(test.output));
         if (test.input)
             ingredient.push(this.resolveIngredientTest(test.input));
         return { id, type, ingredient, result };
@@ -73,7 +79,7 @@ export default class RecipeEmitter {
         if (this.custom.has(id))
             this.logger.error(`Overwriting custom recipe with ID ${encodeId(id)}`);
         if (value instanceof Recipe)
-            this.custom.add(id, value.toJSON());
+            this.custom.add(id, this.serializer.serialize(value));
         else
             this.custom.add(id, value);
     }
@@ -84,18 +90,18 @@ export default class RecipeEmitter {
     remove(test) {
         this.addRule([test], () => null, test);
     }
-    replaceResult(test, value, additionalTest) {
-        const predicate = this.resolveIngredientTest(test);
-        createResult(value, this.lookup());
+    replaceResult(test, input, additionalTest) {
+        const predicate = this.resolveResultTest(test);
+        const value = this.context.results.create(input);
         const replacer = createReplacer(predicate, value);
-        const replace = (it) => createResult(replacer(it));
+        const replace = (it) => this.context.results.create(replacer(it));
         this.addRule(["replace result", test, "with", value, additionalTest], (recipe) => recipe.replaceResult(replace), additionalTest, { result: predicate });
     }
-    replaceIngredient(test, value, additionalTest) {
+    replaceIngredient(test, input, additionalTest) {
         const predicate = this.resolveIngredientTest(test);
-        createIngredient(value, this.lookup());
+        const value = this.context.ingredients.create(input);
         const replacer = createReplacer(predicate, value);
-        const replace = (it) => createIngredient(replacer(it));
+        const replace = (it) => this.context.ingredients.create(replacer(it));
         this.addRule(["replace ingredient", test, "with", value, additionalTest], (recipe) => recipe.replaceIngredient(replace), additionalTest, { ingredient: predicate });
     }
     clear() {