@adeficior/data-modifier-loot 2.0.2 → 2.1.1

package/dist/emitter.d.ts

@@ -1,41 +1,34 @@
-import type { ClearableEmitter, IdInput, LoaderContext, NormalizedId, RegistryLookup, RegistryProvider, SemVerInput } from "@adeficior/data-modifier-core";
-import type { CommonFilter } from "@adeficior/data-modifier-core/serializer";
+import type { IdInput, LoaderContext, RegistryLookup, SemVerInput } from "@adeficior/data-modifier-core";
+import { SimpleEmitter } from "@adeficior/data-modifier-core";
 import type { IngredientFilter, Predicates } from "@adeficior/data-modifier-ingredients";
+import type { Logger } from "@adeficior/pack-resolver";
+import type { LootTableRegistry } from "./registry";
+import type { LootTableFilter, LootTableRules } from "./rule";
 import type { LootItemInput, LootModifier, LootTable } from "./schema";
 export declare const EMPTY_LOOT_TABLE: LootTable;
 export declare const EMPTY_LOOT_MODIFIER: LootModifier;
-type LootTableTest = Readonly<{
-    id?: CommonFilter<NormalizedId>;
-    output?: IngredientFilter;
-}>;
 export type LootEmitter = {
-    replaceOutput(from: IngredientFilter, to: LootItemInput, additionalTests?: LootTableTest): void;
-    removeOutput(from: IngredientFilter, additionalTests?: LootTableTest): void;
+    replaceOutput(from: IngredientFilter, to: LootItemInput, additionalFilters?: LootTableFilter): void;
+    removeOutput(from: IngredientFilter, additionalFilters?: LootTableFilter): void;
     add(id: IdInput, value: LootTable): void;
-    disable(test: LootTableTest): void;
+    disable(filter: LootTableFilter): void;
     block(id: IdInput): void;
     addModifier<T extends LootModifier>(id: IdInput, value: T): void;
     disabledModifier(id: IdInput): void;
 };
-export declare class LootEmitterImpl implements LootEmitter, ClearableEmitter {
-    private readonly packFormat;
-    private readonly lootTables;
+export declare class LootEmitterImpl extends SimpleEmitter<LootTable, LootTable> implements LootEmitter {
     private readonly lookup;
     private readonly predicates;
-    private readonly customTables;
+    private readonly rules;
     private readonly customModifiers;
-    private readonly ruled;
-    constructor(packFormat: SemVerInput, lootTables: RegistryProvider<LootTable>, lookup: RegistryLookup, predicates: Predicates);
+    constructor(packFormat: SemVerInput, registry: LootTableRegistry, logger: Logger, lookup: RegistryLookup, predicates: Predicates, rules: LootTableRules);
     resolver(context: LoaderContext): import("@adeficior/pack-resolver").Resolver<import("@adeficior/pack-resolver").Acceptable, import("@adeficior/pack-resolver").BaseContext>;
-    private modifierPath;
     clear(): void;
-    private resolveLootTableTest;
     add(id: IdInput, value: LootTable): void;
-    disable(test: LootTableTest): void;
-    replaceOutput(from: IngredientFilter, to: LootItemInput, additionalTests?: LootTableTest): void;
-    removeOutput(from: IngredientFilter, additionalTests?: LootTableTest): void;
+    disable(filter: LootTableFilter): void;
+    replaceOutput(from: IngredientFilter, to: LootItemInput, additionalFilters?: LootTableFilter): void;
+    removeOutput(from: IngredientFilter, additionalFilters?: LootTableFilter): void;
     block(id: IdInput): void;
     disabledModifier(id: IdInput): void;
     addModifier<T extends LootModifier>(id: IdInput, value: T): void;
 }
-export {};

package/dist/emitter.js

@@ -1,7 +1,6 @@
-import { CustomEmitter, encodeId, prefix, RuledEmitter, } from "@adeficior/data-modifier-core";
+import { CustomEmitter, encodeId, prefix, SimpleEmitter, } from "@adeficior/data-modifier-core";
 import { combineResolvers } from "@adeficior/pack-resolver";
 import { lootTablePath } from "./helper";
-import { LootTableRule } from "./rule";
 import { EmptyLootEntry, LootTableSchema } from "./schema";
 import { createLootEntry, replaceItemInTable } from "./serializer";
 export const EMPTY_LOOT_TABLE = {
@@ -11,64 +10,36 @@ export const EMPTY_LOOT_TABLE = {
 export const EMPTY_LOOT_MODIFIER = {
     type: "noop",
 };
-export class LootEmitterImpl {
-    packFormat;
-    lootTables;
+export class LootEmitterImpl extends SimpleEmitter {
     lookup;
     predicates;
-    customTables = new CustomEmitter((it) => lootTablePath(this.packFormat, it));
-    customModifiers = new CustomEmitter((it) => this.modifierPath(it));
-    ruled;
-    constructor(
-    // TODO inject
-    packFormat, lootTables, lookup, predicates) {
-        this.packFormat = packFormat;
-        this.lootTables = lootTables;
+    rules;
+    customModifiers = new CustomEmitter((id) => `data/${id.namespace}/loot_modifiers/${id.path}.json`);
+    constructor(packFormat, registry, logger, lookup, predicates, rules) {
+        super("loot tables", registry, logger, (it) => lootTablePath(packFormat, it), EMPTY_LOOT_TABLE);
         this.lookup = lookup;
         this.predicates = predicates;
-        this.ruled = new RuledEmitter(this.lootTables, (id) => lootTablePath(packFormat, id), EMPTY_LOOT_TABLE, 
-        // TODO also add value object here?
-        (it) => it, (id) => this.customTables.has(id));
+        this.rules = rules;
     }
     resolver(context) {
-        return combineResolvers([
-            this.ruled.resolver(context),
-            this.customTables.resolver(context),
-            this.customModifiers.resolver(context),
-        ], { async: true });
-    }
-    modifierPath(id) {
-        return `data/${id.namespace}/loot_modifiers/${id.path}.json`;
+        return combineResolvers([super.resolver(context), this.customModifiers.resolver(context)], { async: true });
     }
     clear() {
-        this.customTables.clear();
+        super.clear();
         this.customModifiers.clear();
-        this.ruled.clear();
-    }
-    resolveLootTableTest(test) {
-        const id = [];
-        const output = [];
-        if (test.id)
-            id.push(this.predicates.id(test.id, "minecraft:item"));
-        if (test.output)
-            output.push(this.predicates.ingredient(test.output));
-        return { id, output };
     }
     add(id, value) {
-        this.customTables.add(id, LootTableSchema.parse(value));
+        this.addCustom(id, LootTableSchema.parse(value));
     }
-    disable(test) {
-        const predicates = this.resolveLootTableTest(test);
-        this.ruled.addRule(new LootTableRule({ operation: "remove", test }, predicates.id, predicates.output, () => null));
+    disable(filter) {
+        this.ruled.addRemoval(this.rules.resolve(filter), { filter });
     }
-    replaceOutput(from, to, additionalTests = {}) {
-        const predicates = this.resolveLootTableTest(additionalTests);
-        const outputPredicate = this.predicates.ingredient(from);
-        const replacer = replaceItemInTable(outputPredicate, createLootEntry(to, this.lookup));
-        this.ruled.addRule(new LootTableRule({ operation: "replace output", from, to, test: additionalTests }, predicates.id, [outputPredicate, ...predicates.output], replacer));
+    replaceOutput(from, to, additionalFilters = {}) {
+        const modifier = replaceItemInTable(this.predicates.ingredient(from), createLootEntry(to, this.lookup));
+        this.ruled.addRule(this.rules.resolve(additionalFilters, { output: from }), modifier, { operation: "replace output", from, to, filter: additionalFilters });
     }
-    removeOutput(from, additionalTests) {
-        this.replaceOutput(from, EmptyLootEntry, additionalTests);
+    removeOutput(from, additionalFilters) {
+        this.replaceOutput(from, EmptyLootEntry, additionalFilters);
     }
     block(id) {
         this.add(prefix(id, "blocks/"), {

package/dist/emitter.js.map

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

package/dist/helper.d.ts

@@ -1,3 +1,4 @@
-import type { IdInput, SemVerInput } from "@adeficior/data-modifier-core";
+import type { IdInput, ResourceFolder, SemVerInput } from "@adeficior/data-modifier-core";
+export declare function lootTableFolder(packFormat: SemVerInput): ResourceFolder;
 export declare function lootTablePath(packFormat: SemVerInput, id: IdInput): string;
 export declare function lootTablePattern(packFormat: SemVerInput): string;

package/dist/helper.js

@@ -1,13 +1,14 @@
-import { createId, isAtLeastVersion, jsonFilePattern, } from "@adeficior/data-modifier-core";
-function lootTableFolder(packFormat) {
-    return isAtLeastVersion(packFormat, "44") ? "loot_table" : "loot_tables";
+import { isAtLeastVersion, jsonFilePath, jsonFilePattern, } from "@adeficior/data-modifier-core";
+export function lootTableFolder(packFormat) {
+    const folder = isAtLeastVersion(packFormat, "44")
+        ? "loot_table"
+        : "loot_tables";
+    return { packType: "data", folder };
 }
 export function lootTablePath(packFormat, id) {
-    const folder = lootTableFolder(packFormat);
-    const { namespace, path } = createId(id);
-    return `data/${namespace}/${folder}/${path}.json`;
+    return jsonFilePath(lootTableFolder(packFormat), id);
 }
 export function lootTablePattern(packFormat) {
-    return jsonFilePattern("data", lootTableFolder(packFormat));
+    return jsonFilePattern(lootTableFolder(packFormat));
 }
 //# sourceMappingURL=helper.js.map

package/dist/helper.js.map

@@ -1 +1 @@
-{"version":3,"file":"helper.js","sourceRoot":"","sources":["../src/helper.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EACR,gBAAgB,EAChB,eAAe,GAChB,MAAM,+BAA+B,CAAC;AAGvC,SAAS,eAAe,CAAC,UAAuB;IAC9C,OAAO,gBAAgB,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,aAAa,CAAC;AAC3E,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,UAAuB,EAAE,EAAW;IAChE,MAAM,MAAM,GAAG,eAAe,CAAC,UAAU,CAAC,CAAC;IAC3C,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAC;IACzC,OAAO,QAAQ,SAAS,IAAI,MAAM,IAAI,IAAI,OAAO,CAAC;AACpD,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,UAAuB;IACtD,OAAO,eAAe,CAAC,MAAM,EAAE,eAAe,CAAC,UAAU,CAAC,CAAC,CAAC;AAC9D,CAAC"}
+{"version":3,"file":"helper.js","sourceRoot":"","sources":["../src/helper.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,gBAAgB,EAChB,YAAY,EACZ,eAAe,GAChB,MAAM,+BAA+B,CAAC;AAEvC,MAAM,UAAU,eAAe,CAAC,UAAuB;IACrD,MAAM,MAAM,GAAG,gBAAgB,CAAC,UAAU,EAAE,IAAI,CAAC;QAC/C,CAAC,CAAC,YAAY;QACd,CAAC,CAAC,aAAa,CAAC;IAClB,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;AACtC,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,UAAuB,EAAE,EAAW;IAChE,OAAO,YAAY,CAAC,eAAe,CAAC,UAAU,CAAC,EAAE,EAAE,CAAC,CAAC;AACvD,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,UAAuB;IACtD,OAAO,eAAe,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,CAAC;AACtD,CAAC"}

package/dist/index.d.ts

@@ -2,4 +2,6 @@ export { EMPTY_LOOT_MODIFIER, EMPTY_LOOT_TABLE, type LootEmitter, } from "./emit
 export type * from "./helper";
 export type * from "./loader";
 export { default } from "./module";
+export type * from "./registry";
+export type { LootTableFilter, LootTableRules } from "./rule";
 export type { EmptyLootEntry, LootEntry, LootEntryBase, LootItemInput, LootModifier, LootPool, LootTable, } from "./schema";

package/dist/module.d.ts

@@ -1,5 +1,7 @@
 import type { LootEmitter } from "./emitter";
 import { LootTableLoader } from "./loader";
+import type { LootTableRegistry } from "./registry";
+import type { LootTableRules } from "./rule";
 declare const _default: import("@adeficior/data-modifier-core").ModuleConfig<{
     loaders: {
         loot: LootTableLoader;
@@ -7,5 +9,9 @@ declare const _default: import("@adeficior/data-modifier-core").ModuleConfig<{
     emitters: {
         loot: LootEmitter;
     };
+    services: {
+        "rules:loot": LootTableRules;
+        "registry:loot": LootTableRegistry;
+    };
 }>;
 export default _default;

package/dist/module.js

@@ -1,11 +1,13 @@
-import { defineModule } from "@adeficior/data-modifier-core";
+import { defineModule, PatchedRegistry } from "@adeficior/data-modifier-core";
 import { name } from "../package.json";
 import { LootEmitterImpl } from "./emitter";
-import { lootTablePattern } from "./helper";
+import { lootTableFolder, lootTablePattern } from "./helper";
 import { LootTableLoader } from "./loader";
+import { LootTableRulesImpl } from "./rule";
 export default defineModule({
     importModule: name,
     dependencies: {
+        "@adeficior/data-modifier-ingredients": "required",
         // TODO make optional?
         "@adeficior/data-modifier-tags": "required",
     },
@@ -16,11 +18,17 @@ export default defineModule({
         emitters: {
             loot: "LootEmitter",
         },
+        services: {
+            "rules:loot": "LootTableRules",
+            "registry:loot": "LootTableRegistry",
+        },
     },
     promote: [{ key: "loot", service: "emitter:loot" }],
-    setup(pack) {
-        const loader = pack.loader("loot", () => new LootTableLoader(), lootTablePattern(pack.options.packFormat));
-        pack.emitter("loot", (container) => new LootEmitterImpl(pack.options.packFormat, loader(), container.get("registries"), container.get("predicates")));
+    setup(instance) {
+        const loader = instance.loader("loot", () => new LootTableLoader(lootTableFolder(instance.options.packFormat)), lootTablePattern(instance.options.packFormat));
+        const rules = instance.service("rules:loot", (container) => new LootTableRulesImpl(container.get("predicates")));
+        const registry = instance.service("registry:loot", () => new PatchedRegistry(loader()));
+        instance.emitter("loot", (container) => new LootEmitterImpl(instance.options.packFormat, registry(), container.get("logger"), container.get("registries"), container.get("predicates"), rules()));
     },
 });
 //# sourceMappingURL=module.js.map

package/dist/module.js.map

@@ -1 +1 @@
-{"version":3,"file":"module.js","sourceRoot":"","sources":["../src/module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAEvC,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAC5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAE3C,eAAe,YAAY,CAOxB;IACD,YAAY,EAAE,IAAI;IAClB,YAAY,EAAE;QACZ,sBAAsB;QACtB,+BAA+B,EAAE,UAAU;KAC5C;IACD,KAAK,EAAE;QACL,OAAO,EAAE;YACP,IAAI,EAAE,iBAAiB;SACxB;QACD,QAAQ,EAAE;YACR,IAAI,EAAE,aAAa;SACpB;KACF;IACD,OAAO,EAAE,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,CAAC;IACnD,KAAK,CAAC,IAAI;QACR,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CACxB,MAAM,EACN,GAAG,EAAE,CAAC,IAAI,eAAe,EAAE,EAC3B,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAC1C,CAAC;QAEF,IAAI,CAAC,OAAO,CACV,MAAM,EACN,CAAC,SAAS,EAAE,EAAE,CACZ,IAAI,eAAe,CACjB,IAAI,CAAC,OAAO,CAAC,UAAU,EACvB,MAAM,EAAE,EACR,SAAS,CAAC,GAAG,CAAC,YAAY,CAAC,EAC3B,SAAS,CAAC,GAAG,CAAC,YAAY,CAAC,CAC5B,CACJ,CAAC;IACJ,CAAC;CACF,CAAC,CAAC"}
+{"version":3,"file":"module.js","sourceRoot":"","sources":["../src/module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAC9E,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAEvC,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAG3C,OAAO,EAAE,kBAAkB,EAAE,MAAM,QAAQ,CAAC;AAE5C,eAAe,YAAY,CAWxB;IACD,YAAY,EAAE,IAAI;IAClB,YAAY,EAAE;QACZ,sCAAsC,EAAE,UAAU;QAClD,sBAAsB;QACtB,+BAA+B,EAAE,UAAU;KAC5C;IACD,KAAK,EAAE;QACL,OAAO,EAAE;YACP,IAAI,EAAE,iBAAiB;SACxB;QACD,QAAQ,EAAE;YACR,IAAI,EAAE,aAAa;SACpB;QACD,QAAQ,EAAE;YACR,YAAY,EAAE,gBAAgB;YAC9B,eAAe,EAAE,mBAAmB;SACrC;KACF;IACD,OAAO,EAAE,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,CAAC;IACnD,KAAK,CAAC,QAAQ;QACZ,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAC5B,MAAM,EACN,GAAG,EAAE,CAAC,IAAI,eAAe,CAAC,eAAe,CAAC,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,EACvE,gBAAgB,CAAC,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAC,CAC9C,CAAC;QAEF,MAAM,KAAK,GAAG,QAAQ,CAAC,OAAO,CAC5B,YAAY,EACZ,CAAC,SAAS,EAAE,EAAE,CAAC,IAAI,kBAAkB,CAAC,SAAS,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CACnE,CAAC;QAEF,MAAM,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAC/B,eAAe,EACf,GAAG,EAAE,CAAC,IAAI,eAAe,CAAC,MAAM,EAAE,CAAC,CACpC,CAAC;QAEF,QAAQ,CAAC,OAAO,CACd,MAAM,EACN,CAAC,SAAS,EAAE,EAAE,CACZ,IAAI,eAAe,CACjB,QAAQ,CAAC,OAAO,CAAC,UAAU,EAC3B,QAAQ,EAAE,EACV,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,EACvB,SAAS,CAAC,GAAG,CAAC,YAAY,CAAC,EAC3B,SAAS,CAAC,GAAG,CAAC,YAAY,CAAC,EAC3B,KAAK,EAAE,CACR,CACJ,CAAC;IACJ,CAAC;CACF,CAAC,CAAC"}

package/dist/registry.d.ts

@@ -0,0 +1,3 @@
+import type { Registry } from "@adeficior/data-modifier-core";
+import type { LootTable } from "./schema";
+export type LootTableRegistry = Registry<LootTable>;

package/dist/registry.js

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

package/dist/registry.js.map

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

package/dist/rule.d.ts

@@ -1,14 +1,29 @@
-import { Rule } from "@adeficior/data-modifier-core";
-import type { Id, Modifier } from "@adeficior/data-modifier-core";
-import type { Predicate } from "@adeficior/data-modifier-core/serializer";
-import type { Ingredient } from "@adeficior/data-modifier-ingredients";
-import type { ContextLike, Logger } from "@adeficior/pack-resolver";
-import type { LootTable } from "./schema";
-export declare class LootTableRule extends Rule<LootTable> {
-    private readonly context;
-    private readonly idTests;
-    private readonly outputTests;
-    constructor(context: ContextLike, idTests: Predicate<Id>[], outputTests: Predicate<Ingredient>[], modifier: Modifier<LootTable>);
-    matches(id: Id, table: LootTable, logger: Logger): boolean;
-    printWarning(logger: Logger): void;
+import type { Id, NormalizedId, Rule } from "@adeficior/data-modifier-core";
+import type { CommonFilter, Predicate } from "@adeficior/data-modifier-core/serializer";
+import type { IngredientFilter, Predicates } from "@adeficior/data-modifier-ingredients";
+import type { LootEntryBase, LootTable } from "./schema";
+export type LootTableFilter = Readonly<{
+    id?: CommonFilter<NormalizedId>;
+    output?: IngredientFilter;
+}>;
+type SubjectFilters = Readonly<{
+    output?: IngredientFilter;
+}>;
+declare class LootTableRule implements Rule<LootTable> {
+    private readonly idFilter;
+    private readonly outputsFilter;
+    constructor(idFilter: Predicate<Id>, outputsFilter: Predicate<LootEntryBase[]>);
+    matches(id: Id, value: LootTable): boolean;
 }
+export type LootTableRules = {
+    resolve(filter?: LootTableFilter, subjectFilters?: SubjectFilters): Rule<LootTable>;
+};
+export declare class LootTableRulesImpl implements LootTableRules {
+    private readonly predicates;
+    constructor(predicates: Predicates);
+    private resolveLootTableFilter;
+    private resolveSubjectFilters;
+    private toLootEntryPredicate;
+    resolve(filter?: LootTableFilter, subjectFilters?: SubjectFilters): LootTableRule;
+}
+export {};

package/dist/rule.js

@@ -1,47 +1,65 @@
-import { Rule } from "@adeficior/data-modifier-core";
-import { IllegalShapeError, tryCatching, } from "@adeficior/data-modifier-core/serializer";
+import { always, every, some } from "@adeficior/data-modifier-core/serializer";
 import { ItemIngredient, ItemTagIngredient, } from "@adeficior/data-modifier-ingredients";
+import { notNull } from "@adeficior/pack-resolver";
 import { extendLootEntry } from "./schema";
-// TODO add function Predicate<Ingredient> -> Predicate<LootEntry>
-function entryMatches(test, base) {
+function entryMatches(predicate, base) {
     try {
         const entry = extendLootEntry(base);
         switch (entry.type) {
             case "minecraft:alternatives":
-                return entry.children.some((it) => entryMatches(test, it));
+                return entry.children.some((it) => entryMatches(predicate, it));
             case "minecraft:item":
-                return test(new ItemIngredient(entry.name));
+                return predicate(new ItemIngredient(entry.name));
             case "minecraft:tag":
-                return test(new ItemTagIngredient(entry.name));
+                return predicate(new ItemTagIngredient(entry.name));
             default:
                 return false;
         }
     }
     catch {
-        throw new IllegalShapeError(`unknown loot entry type:`, base);
+        return false;
     }
 }
-function hasOutput(logger, test, table) {
-    return table.pools.some((pool) => pool.entries.some((entry) => {
-        return tryCatching(logger, () => entryMatches(test, entry)) ?? false;
-    }));
+class LootTableRule {
+    idFilter;
+    outputsFilter;
+    constructor(idFilter, outputsFilter) {
+        this.idFilter = idFilter;
+        this.outputsFilter = outputsFilter;
+    }
+    matches(id, value) {
+        const outputs = value.pools.flatMap((it) => it.entries);
+        return this.idFilter(id) && this.outputsFilter(outputs);
+    }
 }
-export class LootTableRule extends Rule {
-    context;
-    idTests;
-    outputTests;
-    constructor(context, idTests, outputTests, modifier) {
-        super(modifier);
-        this.context = context;
-        this.idTests = idTests;
-        this.outputTests = outputTests;
-    }
-    matches(id, table, logger) {
-        return (this.idTests.every((test) => test(id)) &&
-            this.outputTests.every((test) => hasOutput(logger, test, table)));
-    }
-    printWarning(logger) {
-        logger.trace("could not find any matching loot table", this.context);
+export class LootTableRulesImpl {
+    predicates;
+    constructor(predicates) {
+        this.predicates = predicates;
+    }
+    resolveLootTableFilter(test) {
+        const id = [];
+        const output = [];
+        if (test.id)
+            id.push(this.predicates.id(test.id));
+        if (test.output)
+            output.push(this.predicates.ingredient(test.output));
+        return { id, output };
+    }
+    resolveSubjectFilters({ output }) {
+        return {
+            output: notNull(output) ? this.predicates.ingredient(output) : always(),
+        };
+    }
+    toLootEntryPredicate(predicate) {
+        return (base) => entryMatches(predicate, base);
+    }
+    resolve(filter = {}, subjectFilters = {}) {
+        const predicates = this.resolveLootTableFilter(filter);
+        const subjectPredicates = this.resolveSubjectFilters(subjectFilters);
+        return new LootTableRule(every(predicates.id), every([...predicates.output, subjectPredicates.output]
+            .map((it) => this.toLootEntryPredicate(it))
+            .map(some)));
     }
 }
 //# sourceMappingURL=rule.js.map

package/dist/rule.js.map

@@ -1 +1 @@
-{"version":3,"file":"rule.js","sourceRoot":"","sources":["../src/rule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,+BAA+B,CAAC;AAErD,OAAO,EACL,iBAAiB,EACjB,WAAW,GACZ,MAAM,0CAA0C,CAAC;AAElD,OAAO,EACL,cAAc,EACd,iBAAiB,GAClB,MAAM,sCAAsC,CAAC;AAG9C,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAG3C,kEAAkE;AAElE,SAAS,YAAY,CACnB,IAA2B,EAC3B,IAAmB;IAEnB,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC;QACpC,QAAQ,KAAK,CAAC,IAAI,EAAE,CAAC;YACnB,KAAK,wBAAwB;gBAC3B,OAAO,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC;YAC7D,KAAK,gBAAgB;gBACnB,OAAO,IAAI,CAAC,IAAI,cAAc,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;YAC9C,KAAK,eAAe;gBAClB,OAAO,IAAI,CAAC,IAAI,iBAAiB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;YACjD;gBACE,OAAO,KAAK,CAAC;QACjB,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,IAAI,iBAAiB,CAAC,0BAA0B,EAAE,IAAI,CAAC,CAAC;IAChE,CAAC;AACH,CAAC;AAED,SAAS,SAAS,CAChB,MAAc,EACd,IAA2B,EAC3B,KAAgB;IAEhB,OAAO,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAC/B,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE;QAC1B,OAAO,WAAW,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,IAAI,KAAK,CAAC;IACvE,CAAC,CAAC,CACH,CAAC;AACJ,CAAC;AAED,MAAM,OAAO,aAAc,SAAQ,IAAe;IAE7B;IACA;IACA;IAHnB,YACmB,OAAoB,EACpB,OAAwB,EACxB,WAAoC,EACrD,QAA6B;QAE7B,KAAK,CAAC,QAAQ,CAAC,CAAC;QALC,YAAO,GAAP,OAAO,CAAa;QACpB,YAAO,GAAP,OAAO,CAAiB;QACxB,gBAAW,GAAX,WAAW,CAAyB;IAIvD,CAAC;IAED,OAAO,CAAC,EAAM,EAAE,KAAgB,EAAE,MAAc;QAC9C,OAAO,CACL,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACtC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,CACjE,CAAC;IACJ,CAAC;IAED,YAAY,CAAC,MAAc;QACzB,MAAM,CAAC,KAAK,CAAC,wCAAwC,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IACvE,CAAC;CACF"}
+{"version":3,"file":"rule.js","sourceRoot":"","sources":["../src/rule.ts"],"names":[],"mappings":"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"}

package/dist/serializer.d.ts

@@ -1,6 +1,6 @@
-import type { RegistryLookup } from "@adeficior/data-modifier-core";
-import type { Predicate, Replacer } from "@adeficior/data-modifier-core/serializer";
+import type { Modifier, RegistryLookup } from "@adeficior/data-modifier-core";
+import type { Predicate } from "@adeficior/data-modifier-core/serializer";
 import type { Ingredient } from "@adeficior/data-modifier-ingredients";
 import type { LootEntry, LootItemInput, LootTable } from "./schema";
 export declare function createLootEntry(input: LootItemInput, lookup: RegistryLookup): LootEntry;
-export declare function replaceItemInTable(predicate: Predicate<Ingredient>, to: LootEntry): Replacer<LootTable>;
+export declare function replaceItemInTable(predicate: Predicate<Ingredient>, to: LootEntry): Modifier<LootTable>;

package/dist/serializer.js.map

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

package/dist/testing/index.d.ts

@@ -1 +1,2 @@
+export * from "./mocks";
 export * from "./setup";

package/dist/testing/index.js

@@ -1,2 +1,3 @@
+export * from "./mocks";
 export * from "./setup";
 //# sourceMappingURL=index.js.map

package/dist/testing/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/testing/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/testing/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,cAAc,SAAS,CAAC"}

package/dist/testing/mocks.d.ts

@@ -0,0 +1,3 @@
+export declare function mockRules(): {
+    resolve: import("bun:test").Mock<(...args: any[]) => any>;
+};

package/dist/testing/mocks.js

@@ -0,0 +1,7 @@
+import { mock } from "bun:test";
+export function mockRules() {
+    return {
+        resolve: mock(),
+    };
+}
+//# sourceMappingURL=mocks.js.map

package/dist/testing/mocks.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mocks.js","sourceRoot":"","sources":["../../src/testing/mocks.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,UAAU,CAAC;AAGhC,MAAM,UAAU,SAAS;IACvB,OAAO;QACL,OAAO,EAAE,IAAI,EAAE;KACS,CAAC;AAC7B,CAAC"}

package/dist/testing/setup.js

@@ -5,10 +5,13 @@ import { createTestLogger } from "@adeficior/pack-resolver/testing";
 import { createTestDataResolver, setupLookup } from "@adeficior/testing";
 import { afterAll, afterEach, beforeAll } from "bun:test";
 import { LootEmitterImpl } from "../emitter";
-import { lootTablePattern } from "../helper";
+import { lootTableFolder, lootTablePattern } from "../helper";
 import { LootTableLoader } from "../loader";
+import { LootTableRulesImpl } from "../rule";
 export function setupLootLoader(version, { mods = [], ...resolverOptions } = {}) {
-    const loader = new LootTableLoader({ mods: ["minecraft", ...mods] });
+    const loader = new LootTableLoader(lootTableFolder(packFormatOf(version)), {
+        mods: ["minecraft", ...mods],
+    });
     const logger = createTestLogger();
     beforeAll(async () => {
         const resolver = await createTestDataResolver(version, {
@@ -28,8 +31,9 @@ export function setupLootEmitter(version, options) {
     const { loader } = setupLootLoader(version, options);
     const tags = setupTagRegistry(version, options);
     const predicates = setupPredicates(lookup, tags, setupIngredientSerializer(version, lookup));
-    const emitter = new LootEmitterImpl(packFormatOf(version), loader, lookup, predicates);
+    const rules = new LootTableRulesImpl(predicates);
     const logger = createTestLogger();
+    const emitter = new LootEmitterImpl(packFormatOf(version), loader, logger, lookup, predicates, rules);
     const resolver = emitter.resolver({ logger });
     afterEach(() => {
         emitter.clear();

package/dist/testing/setup.js.map

@@ -1 +1 @@
-{"version":3,"file":"setup.js","sourceRoot":"","sources":["../../src/testing/setup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,EACL,yBAAyB,EACzB,eAAe,GAChB,MAAM,8CAA8C,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,uCAAuC,CAAC;AACzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAEpE,OAAO,EAAE,sBAAsB,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACzE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAM5C,MAAM,UAAU,eAAe,CAC7B,OAAe,EACf,EAAE,IAAI,GAAG,EAAE,EAAE,GAAG,eAAe,KAA4B,EAAE;IAE7D,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC,EAAE,IAAI,EAAE,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC;IACrE,MAAM,MAAM,GAAG,gBAAgB,EAAE,CAAC;IAElC,SAAS,CAAC,KAAK,IAAI,EAAE;QACnB,MAAM,QAAQ,GAAG,MAAM,sBAAsB,CAAC,OAAO,EAAE;YACrD,OAAO,EAAE,gBAAgB,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;YAChD,MAAM;YACN,GAAG,eAAe;SACnB,CAAC,CAAC;QACH,MAAM,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IACjC,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,GAAG,EAAE;QACZ,MAAM,CAAC,KAAK,EAAE,CAAC;IACjB,CAAC,CAAC,CAAC;IAEH,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;AAC5B,CAAC;AAED,MAAM,UAAU,gBAAgB,CAC9B,OAAe,EACf,OAA+B;IAE/B,MAAM,MAAM,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;IACpC,MAAM,EAAE,MAAM,EAAE,GAAG,eAAe,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAErD,MAAM,IAAI,GAAG,gBAAgB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAChD,MAAM,UAAU,GAAG,eAAe,CAChC,MAAM,EACN,IAAI,EACJ,yBAAyB,CAAC,OAAO,EAAE,MAAM,CAAC,CAC3C,CAAC;IAEF,MAAM,OAAO,GAAG,IAAI,eAAe,CACjC,YAAY,CAAC,OAAO,CAAC,EACrB,MAAM,EACN,MAAM,EACN,UAAU,CACX,CAAC;IAEF,MAAM,MAAM,GAAG,gBAAgB,EAAE,CAAC;IAClC,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;IAE9C,SAAS,CAAC,GAAG,EAAE;QACb,OAAO,CAAC,KAAK,EAAE,CAAC;QAChB,MAAM,CAAC,KAAK,EAAE,CAAC;IACjB,CAAC,CAAC,CAAC;IAEH,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC;AAC/C,CAAC"}
+{"version":3,"file":"setup.js","sourceRoot":"","sources":["../../src/testing/setup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,EACL,yBAAyB,EACzB,eAAe,GAChB,MAAM,8CAA8C,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,uCAAuC,CAAC;AACzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAEpE,OAAO,EAAE,sBAAsB,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACzE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAC5C,OAAO,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAM7C,MAAM,UAAU,eAAe,CAC7B,OAAe,EACf,EAAE,IAAI,GAAG,EAAE,EAAE,GAAG,eAAe,KAA4B,EAAE;IAE7D,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC,eAAe,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,EAAE;QACzE,IAAI,EAAE,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC;KAC7B,CAAC,CAAC;IACH,MAAM,MAAM,GAAG,gBAAgB,EAAE,CAAC;IAElC,SAAS,CAAC,KAAK,IAAI,EAAE;QACnB,MAAM,QAAQ,GAAG,MAAM,sBAAsB,CAAC,OAAO,EAAE;YACrD,OAAO,EAAE,gBAAgB,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;YAChD,MAAM;YACN,GAAG,eAAe;SACnB,CAAC,CAAC;QACH,MAAM,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IACjC,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,GAAG,EAAE;QACZ,MAAM,CAAC,KAAK,EAAE,CAAC;IACjB,CAAC,CAAC,CAAC;IAEH,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;AAC5B,CAAC;AAED,MAAM,UAAU,gBAAgB,CAC9B,OAAe,EACf,OAA+B;IAE/B,MAAM,MAAM,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;IACpC,MAAM,EAAE,MAAM,EAAE,GAAG,eAAe,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAErD,MAAM,IAAI,GAAG,gBAAgB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAChD,MAAM,UAAU,GAAG,eAAe,CAChC,MAAM,EACN,IAAI,EACJ,yBAAyB,CAAC,OAAO,EAAE,MAAM,CAAC,CAC3C,CAAC;IACF,MAAM,KAAK,GAAG,IAAI,kBAAkB,CAAC,UAAU,CAAC,CAAC;IAEjD,MAAM,MAAM,GAAG,gBAAgB,EAAE,CAAC;IAElC,MAAM,OAAO,GAAG,IAAI,eAAe,CACjC,YAAY,CAAC,OAAO,CAAC,EACrB,MAAM,EACN,MAAM,EACN,MAAM,EACN,UAAU,EACV,KAAK,CACN,CAAC;IAEF,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;IAE9C,SAAS,CAAC,GAAG,EAAE;QACb,OAAO,CAAC,KAAK,EAAE,CAAC;QAChB,MAAM,CAAC,KAAK,EAAE,CAAC;IACjB,CAAC,CAAC,CAAC;IAEH,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC;AAC/C,CAAC"}

package/package.json

@@ -1,17 +1,17 @@
 {
   "name": "@adeficior/data-modifier-loot",
   "description": "data-modifier module for loot",
-  "version": "2.0.2",
+  "version": "2.1.1",
   "exports": { ".": "./dist/index.js", "./testing": "./dist/testing/index.js" },
   "type": "module",
-  "devDependencies": { "@adeficior/data-modifier-ingredients": "^2.0.2" },
+  "devDependencies": { "@adeficior/data-modifier-ingredients": "^2.0.4" },
   "peerDependencies": {
     "@adeficior/pack-resolver": "^2.0.1",
     "typescript": "^5",
     "zod": "^4.4.3",
-    "@adeficior/data-modifier-core": "^2.0.2",
-    "@adeficior/data-modifier-ingredients": "^2.0.2",
-    "@adeficior/data-modifier-tags": "^2.0.2"
+    "@adeficior/data-modifier-core": "^2.2.0",
+    "@adeficior/data-modifier-ingredients": "^2.0.4",
+    "@adeficior/data-modifier-tags": "^2.0.4"
   },
   "typesVersions": { "*": { "./testing": ["./dist/testing/index.d.ts"] } },
   "types": "./dist/index.d.ts",