@adeficior/data-modifier-ingredients 2.0.0-rc.20260816171656 → 2.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/ingredient/impl.d.ts +7 -1
- package/dist/ingredient/impl.js +16 -1
- package/dist/ingredient/impl.js.map +1 -1
- package/dist/module.js.map +1 -1
- package/dist/predicates/index.d.ts +2 -2
- package/dist/predicates/index.js.map +1 -1
- package/dist/predicates/ingredients.d.ts +2 -2
- package/dist/predicates/ingredients.js.map +1 -1
- package/dist/result/impl.d.ts +4 -1
- package/dist/result/impl.js +7 -1
- package/dist/result/impl.js.map +1 -1
- package/dist/serializer/ingredients/index.d.ts +3 -3
- package/dist/serializer/ingredients/index.js.map +1 -1
- package/dist/serializer/ingredients/ingredientMap.d.ts +5 -0
- package/dist/serializer/ingredients/ingredientMap.js +40 -0
- package/dist/serializer/ingredients/ingredientMap.js.map +1 -1
- package/dist/serializer/results/index.js.map +1 -1
- package/dist/serializer/withModules.d.ts +2 -2
- package/dist/testing/setup.d.ts +2 -2
- package/dist/testing/setup.js.map +1 -1
- package/package.json +8 -8
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
import type { IdInput, NormalizedId, Registered, RegistryIds, RegistryLookup, TagId } from "@adeficior/data-modifier-core";
|
|
2
2
|
import type { BlockId, FluidId, ItemId, RegistryId } from "@adeficior/data-modifier/generated";
|
|
3
|
-
import { BlockResult, FluidResult, ItemResult } from "../result/impl";
|
|
4
3
|
import type { Result } from "../result/impl";
|
|
4
|
+
import { BlockResult, FluidResult, ItemResult } from "../result/impl";
|
|
5
5
|
export declare abstract class Ingredient implements Registered {
|
|
6
6
|
validate(_: RegistryLookup): void;
|
|
7
7
|
abstract ids(): RegistryIds;
|
|
8
8
|
abstract asResult(): Result;
|
|
9
|
+
abstract hashCode(): string;
|
|
9
10
|
}
|
|
10
11
|
export declare abstract class TagIngredient extends Ingredient {
|
|
11
12
|
readonly registry: NormalizedId<RegistryId>;
|
|
@@ -13,6 +14,7 @@ export declare abstract class TagIngredient extends Ingredient {
|
|
|
13
14
|
constructor(input: IdInput, registry: NormalizedId<RegistryId>);
|
|
14
15
|
ids(): RegistryIds;
|
|
15
16
|
asResult(): Result;
|
|
17
|
+
hashCode(): string;
|
|
16
18
|
}
|
|
17
19
|
export declare class ItemTagIngredient extends TagIngredient {
|
|
18
20
|
readonly count: number;
|
|
@@ -30,6 +32,7 @@ export declare abstract class RegistryEntryIngredient<T extends string> extends
|
|
|
30
32
|
readonly id: NormalizedId<T>;
|
|
31
33
|
constructor(input: IdInput<T>, registry: NormalizedId<RegistryId>);
|
|
32
34
|
ids(): RegistryIds;
|
|
35
|
+
hashCode(): string;
|
|
33
36
|
}
|
|
34
37
|
export declare class ItemIngredient extends RegistryEntryIngredient<ItemId> {
|
|
35
38
|
readonly count: number;
|
|
@@ -56,6 +59,7 @@ export declare class ListIngredient extends Ingredient {
|
|
|
56
59
|
validate(lookup: RegistryLookup): void;
|
|
57
60
|
ids(): RegistryIds;
|
|
58
61
|
asResult(): Result;
|
|
62
|
+
hashCode(): string;
|
|
59
63
|
}
|
|
60
64
|
export type ItemLikeIngredient = ItemTagIngredient | ItemIngredient;
|
|
61
65
|
export type FluidLikeIngredient = FluidTagIngredient | FluidIngredient;
|
|
@@ -65,10 +69,12 @@ export declare class ToolActionIngredient extends Ingredient {
|
|
|
65
69
|
constructor(action: string);
|
|
66
70
|
asResult(): Result;
|
|
67
71
|
ids(): RegistryIds;
|
|
72
|
+
hashCode(): string;
|
|
68
73
|
}
|
|
69
74
|
export declare class IgnoredIngredient extends Ingredient {
|
|
70
75
|
readonly raw: unknown;
|
|
71
76
|
constructor(raw: unknown);
|
|
72
77
|
asResult(): Result;
|
|
73
78
|
ids(): RegistryIds;
|
|
79
|
+
hashCode(): string;
|
|
74
80
|
}
|
package/dist/ingredient/impl.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { encodeId, toTag } from "@adeficior/data-modifier-core";
|
|
1
|
+
import { createId, encodeId, toTag } from "@adeficior/data-modifier-core";
|
|
2
2
|
import { uniq } from "lodash-es";
|
|
3
3
|
import { BlockResult, FluidResult, ItemResult } from "../result/impl";
|
|
4
4
|
import { BUCKET } from "../units";
|
|
@@ -20,6 +20,9 @@ export class TagIngredient extends Ingredient {
|
|
|
20
20
|
asResult() {
|
|
21
21
|
throw new Error("tag ingredients cannot be transformed into a result");
|
|
22
22
|
}
|
|
23
|
+
hashCode() {
|
|
24
|
+
return `#${createId(this.registry).path}:${this.tag.substring(1)}`;
|
|
25
|
+
}
|
|
23
26
|
}
|
|
24
27
|
export class ItemTagIngredient extends TagIngredient {
|
|
25
28
|
count;
|
|
@@ -51,6 +54,9 @@ export class RegistryEntryIngredient extends Ingredient {
|
|
|
51
54
|
ids() {
|
|
52
55
|
return { [this.registry]: [this.id] };
|
|
53
56
|
}
|
|
57
|
+
hashCode() {
|
|
58
|
+
return `${createId(this.registry).path}:${this.id}`;
|
|
59
|
+
}
|
|
54
60
|
}
|
|
55
61
|
export class ItemIngredient extends RegistryEntryIngredient {
|
|
56
62
|
count;
|
|
@@ -120,6 +126,9 @@ export class ListIngredient extends Ingredient {
|
|
|
120
126
|
asResult() {
|
|
121
127
|
throw new Error("union ingredients cannot be transformed into a result");
|
|
122
128
|
}
|
|
129
|
+
hashCode() {
|
|
130
|
+
return `[${this.entries.map((it) => it.hashCode()).join(",")}]`;
|
|
131
|
+
}
|
|
123
132
|
}
|
|
124
133
|
export class ToolActionIngredient extends Ingredient {
|
|
125
134
|
action;
|
|
@@ -133,6 +142,9 @@ export class ToolActionIngredient extends Ingredient {
|
|
|
133
142
|
ids() {
|
|
134
143
|
return {};
|
|
135
144
|
}
|
|
145
|
+
hashCode() {
|
|
146
|
+
return `tool:${this.action}`;
|
|
147
|
+
}
|
|
136
148
|
}
|
|
137
149
|
export class IgnoredIngredient extends Ingredient {
|
|
138
150
|
raw;
|
|
@@ -146,5 +158,8 @@ export class IgnoredIngredient extends Ingredient {
|
|
|
146
158
|
ids() {
|
|
147
159
|
return {};
|
|
148
160
|
}
|
|
161
|
+
hashCode() {
|
|
162
|
+
throw new Error("this ingredient should be ignored");
|
|
163
|
+
}
|
|
149
164
|
}
|
|
150
165
|
//# sourceMappingURL=impl.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"impl.js","sourceRoot":"","sources":["../../src/ingredient/impl.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"impl.js","sourceRoot":"","sources":["../../src/ingredient/impl.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,+BAA+B,CAAC;AAO1E,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AACtE,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,MAAM,OAAgB,UAAU;IAC9B,QAAQ,CAAC,CAAiB,IAAS,CAAC;CAIrC;AAED,MAAM,OAAgB,aAAc,SAAQ,UAAU;IAKlC;IAJF,GAAG,CAAQ;IAE3B,YACE,KAAc,EACE,QAAkC;QAElD,KAAK,EAAE,CAAC;QAFQ,aAAQ,GAAR,QAAQ,CAA0B;QAGlD,2CAA2C;QAC3C,IAAI,CAAC,GAAG,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC;IAC1B,CAAC;IAEQ,GAAG;QACV,OAAO,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;IACzC,CAAC;IAEQ,QAAQ;QACf,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAC;IACzE,CAAC;IAEQ,QAAQ;QACf,OAAO,IAAI,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,IAAI,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;IACrE,CAAC;CACF;AAED,MAAM,OAAO,iBAAkB,SAAQ,aAAa;IAGhC;IAFlB,YACE,GAAY,EACI,QAAQ,CAAC;QAEzB,KAAK,CAAC,GAAG,EAAE,gBAAgB,CAAC,CAAC;QAFb,UAAK,GAAL,KAAK,CAAI;IAG3B,CAAC;CACF;AAED,MAAM,OAAO,kBAAmB,SAAQ,aAAa;IAGjC;IAFlB,YACE,GAAY,EACI,SAAS,MAAM;QAE/B,KAAK,CAAC,GAAG,EAAE,iBAAiB,CAAC,CAAC;QAFd,WAAM,GAAN,MAAM,CAAS;IAGjC,CAAC;CACF;AAED,MAAM,OAAO,kBAAmB,SAAQ,aAAa;IACnD,YAAY,GAAY;QACtB,KAAK,CAAC,GAAG,EAAE,iBAAiB,CAAC,CAAC;IAChC,CAAC;CACF;AAED,MAAM,OAAgB,uBAEpB,SAAQ,UAAU;IAKA;IAJF,EAAE,CAAkB;IAEpC,YACE,KAAiB,EACD,QAAkC;QAElD,KAAK,EAAE,CAAC;QAFQ,aAAQ,GAAR,QAAQ,CAA0B;QAGlD,IAAI,CAAC,EAAE,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC5B,CAAC;IAEQ,GAAG;QACV,OAAO,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;IACxC,CAAC;IAEQ,QAAQ;QACf,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,IAAI,IAAI,CAAC,EAAE,EAAE,CAAC;IACtD,CAAC;CACF;AAED,MAAM,OAAO,cAAe,SAAQ,uBAA+B;IAG/C;IAFlB,YACE,EAAmB,EACH,QAAQ,CAAC;QAEzB,KAAK,CAAC,EAAE,EAAE,gBAAgB,CAAC,CAAC;QAFZ,UAAK,GAAL,KAAK,CAAI;IAG3B,CAAC;IAEQ,QAAQ,CAAC,MAAsB;QACtC,MAAM,CAAC,aAAa,CAAC,gBAAgB,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;IAClD,CAAC;IAEQ,QAAQ;QACf,OAAO,IAAI,UAAU,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;IAC7C,CAAC;CACF;AAED,MAAM,OAAO,eAAgB,SAAQ,uBAAgC;IAGjD;IACA;IAHlB,YACE,EAAoB,EACJ,SAAS,MAAM,EACf,MAAe;QAE/B,KAAK,CAAC,EAAE,EAAE,iBAAiB,CAAC,CAAC;QAHb,WAAM,GAAN,MAAM,CAAS;QACf,WAAM,GAAN,MAAM,CAAS;IAGjC,CAAC;IAEQ,QAAQ,CAAC,MAAsB;QACtC,MAAM,CAAC,aAAa,CAAC,iBAAiB,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;IACnD,CAAC;IAEQ,QAAQ;QACf,OAAO,IAAI,WAAW,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAC/C,CAAC;CACF;AAED,MAAM,OAAO,eAAgB,SAAQ,uBAAgC;IAGjD;IAFlB,YACE,EAAoB,EACJ,MAAe;QAE/B,KAAK,CAAC,EAAE,EAAE,iBAAiB,CAAC,CAAC;QAFb,WAAM,GAAN,MAAM,CAAS;IAGjC,CAAC;IAEQ,QAAQ,CAAC,MAAsB;QACtC,MAAM,CAAC,aAAa,CAAC,iBAAiB,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;IACnD,CAAC;IAEQ,QAAQ;QACf,OAAO,IAAI,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAClC,CAAC;CACF;AAED,MAAM,OAAO,cAAe,SAAQ,UAAU;IAChB;IAA5B,YAA4B,OAAqB;QAC/C,KAAK,EAAE,CAAC;QADkB,YAAO,GAAP,OAAO,CAAc;IAEjD,CAAC;IAEQ,QAAQ,CAAC,MAAsB;QACtC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;IACpD,CAAC;IAEQ,GAAG;QACV,OAAO,IAAI,CAAC,OAAO;aAChB,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;aACrB,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;YACf,MAAM,IAAI,GAAG,IAAI,CAAC;gBAChB,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;gBACjB,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;aAClB,CAA+B,CAAC;YAEjC,MAAM,GAAG,GAAgB,EAAE,CAAC;YAE5B,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;gBACnB,GAAG,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;YAC1D,CAAC,CAAC,CAAC;YAEH,OAAO,GAAG,CAAC;QACb,CAAC,EAAE,EAAE,CAAC,CAAC;IACX,CAAC;IAEQ,QAAQ;QACf,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAC;IAC3E,CAAC;IAEQ,QAAQ;QACf,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;IAClE,CAAC;CACF;AAMD,MAAM,OAAO,oBAAqB,SAAQ,UAAU;IACtB;IAA5B,YAA4B,MAAc;QACxC,KAAK,EAAE,CAAC;QADkB,WAAM,GAAN,MAAM,CAAQ;IAE1C,CAAC;IAEQ,QAAQ;QACf,MAAM,IAAI,KAAK,CACb,4DAA4D,CAC7D,CAAC;IACJ,CAAC;IAEQ,GAAG;QACV,OAAO,EAAE,CAAC;IACZ,CAAC;IAEQ,QAAQ;QACf,OAAO,QAAQ,IAAI,CAAC,MAAM,EAAE,CAAC;IAC/B,CAAC;CACF;AAED,MAAM,OAAO,iBAAkB,SAAQ,UAAU;IACnB;IAA5B,YAA4B,GAAY;QACtC,KAAK,EAAE,CAAC;QADkB,QAAG,GAAH,GAAG,CAAS;IAExC,CAAC;IAEQ,QAAQ;QACf,MAAM,IAAI,KAAK,CAAC,wDAAwD,CAAC,CAAC;IAC5E,CAAC;IAEQ,GAAG;QACV,OAAO,EAAE,CAAC;IACZ,CAAC;IAEQ,QAAQ;QACf,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;IACvD,CAAC;CACF"}
|
package/dist/module.js.map
CHANGED
|
@@ -1 +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;
|
|
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,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAEhD,OAAO,EAAE,0BAA0B,EAAE,MAAM,0BAA0B,CAAC;AAEtE,OAAO,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAE9D,eAAe,YAAY,CAMxB;IACD,YAAY,EAAE,IAAI;IAClB,YAAY,EAAE;QACZ,iCAAiC;QACjC,+BAA+B,EAAE,UAAU;KAC5C;IACD,KAAK,EAAE;QACL,QAAQ,EAAE;YACR,oBAAoB,EAAE,kBAAkB;YACxC,wBAAwB,EAAE,sBAAsB;YAChD,UAAU,EAAE,YAAY;SACzB;KACF;IACD,KAAK,EAAE,CAAC,IAAI,EAAE,EAAE;QACd,MAAM,oBAAoB,GAAG,IAAI,CAAC,OAAO,CACvC,wBAAwB,EACxB,CAAC,SAAS,EAAE,EAAE,CACZ,0BAA0B,CACxB,IAAI,CAAC,OAAO,CAAC,UAAU,EACvB,SAAS,CAAC,GAAG,CAAC,YAAY,CAAC,CAC5B,CACJ,CAAC;QAEF,IAAI,CAAC,OAAO,CAAC,oBAAoB,EAAE,CAAC,SAAS,EAAE,EAAE,CAC/C,sBAAsB,CACpB,IAAI,CAAC,OAAO,CAAC,UAAU,EACvB,SAAS,CAAC,GAAG,CAAC,YAAY,CAAC,CAC5B,CACF,CAAC;QAEF,0BAA0B;QAC1B,2EAA2E;QAC3E,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC,SAAS,EAAE,EAAE,CACvC,gBAAgB,CACd,SAAS,CAAC,GAAG,CAAC,YAAY,CAAC,EAC3B,SAAS,CAAC,GAAG,CAAC,aAAa,CAAC,EAC5B,oBAAoB,EAAE,CACvB,CACF,CAAC;IACJ,CAAC;CACF,CAAC,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { IdInput, NormalizedId, RegistryLookup } from "@adeficior/data-modifier-core";
|
|
2
2
|
import type { CommonFilter, Predicate } from "@adeficior/data-modifier-core/serializer";
|
|
3
|
-
import type {
|
|
3
|
+
import type { TagRegistries } from "@adeficior/data-modifier-tags";
|
|
4
4
|
import type { InferIds, RegistryId } from "@adeficior/data-modifier/generated";
|
|
5
5
|
import type { Ingredient } from "../ingredient/impl";
|
|
6
6
|
import type { Result } from "../result/impl";
|
|
@@ -11,4 +11,4 @@ export type Predicates = {
|
|
|
11
11
|
result(filter: IngredientFilter): Predicate<Result>;
|
|
12
12
|
id<T extends RegistryId>(filter: CommonFilter<NormalizedId<InferIds<T>>>, registry: T): Predicate<IdInput<InferIds<T>>>;
|
|
13
13
|
};
|
|
14
|
-
export declare function createPredicates(registries: RegistryLookup, tags:
|
|
14
|
+
export declare function createPredicates(registries: RegistryLookup, tags: TagRegistries, ingredientSerializer: IngredientSerializer): Predicates;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/predicates/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/predicates/index.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,aAAa,EAAE,MAAM,0CAA0C,CAAC;AAOzE,OAAO,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAC;AAW1D,MAAM,UAAU,gBAAgB,CAC9B,UAA0B,EAC1B,IAAmB,EACnB,oBAA0C;IAE1C,OAAO,IAAI,cAAc,CAAC,UAAU,EAAE,IAAI,EAAE,oBAAoB,CAAC,CAAC;AACpE,CAAC;AAED,MAAM,cAAc;IAGC;IACA;IACA;IAJnB;IACE,cAAc;IACG,UAA0B,EAC1B,IAAmB,EACnB,oBAA0C;QAF1C,eAAU,GAAV,UAAU,CAAgB;QAC1B,SAAI,GAAJ,IAAI,CAAe;QACnB,yBAAoB,GAApB,oBAAoB,CAAsB;IAC1D,CAAC;IAEJ,UAAU,CAAC,MAAwB;QACjC,OAAO,yBAAyB,CAAC,MAAM,EAAE;YACvC,UAAU,EAAE,IAAI,CAAC,oBAAoB;YACrC,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,IAAI,EAAE,IAAI,CAAC,IAAI;SAChB,CAAC,CAAC;IACL,CAAC;IAED,MAAM,CAAC,MAAwB;QAC7B,MAAM,mBAAmB,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QAEpD,OAAO,CAAC,MAAM,EAAE,GAAG,IAAI,EAAE,EAAE;YACzB,MAAM,UAAU,GAAG,MAAM,CAAC,YAAY,EAAE,CAAC;YACzC,OAAO,mBAAmB,CAAC,UAAU,EAAE,GAAG,IAAI,CAAC,CAAC;QAClD,CAAC,CAAC;IACJ,CAAC;IAED,EAAE,CACA,MAA+C,EAC/C,QAA4B;QAE5B,MAAM,IAAI,GACR,OAAO,QAAQ,IAAI,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;QACxE,OAAO,aAAa,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IACrC,CAAC;CACF"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { RegistryLookup } from "@adeficior/data-modifier-core";
|
|
2
2
|
import type { CommonFilter, Predicate } from "@adeficior/data-modifier-core/serializer";
|
|
3
|
-
import type {
|
|
3
|
+
import type { TagRegistries } from "@adeficior/data-modifier-tags";
|
|
4
4
|
import { Ingredient } from "../ingredient/impl";
|
|
5
5
|
import type { IngredientInput } from "../ingredient/input";
|
|
6
6
|
import type { IngredientSerializer } from "../serializer/ingredients";
|
|
@@ -8,7 +8,7 @@ export type IngredientFilter = CommonFilter<Ingredient> | IngredientInput | `#${
|
|
|
8
8
|
type Context = {
|
|
9
9
|
registries: RegistryLookup;
|
|
10
10
|
serializer: IngredientSerializer;
|
|
11
|
-
tags:
|
|
11
|
+
tags: TagRegistries;
|
|
12
12
|
};
|
|
13
13
|
export declare function createIngredientPredicate(test: IngredientFilter, context: Context): Predicate<Ingredient>;
|
|
14
14
|
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ingredients.js","sourceRoot":"","sources":["../../src/predicates/ingredients.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ingredients.js","sourceRoot":"","sources":["../../src/predicates/ingredients.ts"],"names":[],"mappings":"AAQA,OAAO,EACL,iBAAiB,EACjB,iBAAiB,GAClB,MAAM,0CAA0C,CAAC;AAGlD,OAAO,EACL,UAAU,EACV,cAAc,EACd,iBAAiB,EACjB,cAAc,EACd,uBAAuB,EACvB,aAAa,GACd,MAAM,oBAAoB,CAAC;AAa5B,MAAM,UAAU,yBAAyB,CACvC,IAAsB,EACtB,OAAgB;IAEhB,MAAM,WAAW,GAAG,uBAAuB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC3D,OAAO,CAAC,EAAE,EAAE,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC;AAC/D,CAAC;AAED,SAAS,uBAAuB,CAC9B,IAAsB,EACtB,OAAgB;IAEhB,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC7B,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;YACzB,OAAO,uBAAuB,CAC5B,IAAI,iBAAiB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EACxC,OAAO,CACR,CAAC;QACJ,CAAC;QAED,OAAO,uBAAuB,CAAC,IAAI,cAAc,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC;IACpE,CAAC;IAED,IAAI,IAAI,YAAY,MAAM,EAAE,CAAC;QAC3B,OAAO,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;IAChE,CAAC;IAED,IAAI,OAAO,IAAI,KAAK,UAAU,EAAE,CAAC;QAC/B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,IAAI,YAAY,UAAU,EAAE,CAAC;QAC/B,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IACpC,CAAC;IAED,IAAI,IAAI,YAAY,aAAa,EAAE,CAAC;QAClC,OAAO,gBAAgB,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;IACjE,CAAC;IAED,IAAI,IAAI,YAAY,uBAAuB,EAAE,CAAC;QAC5C,OAAO,gBAAgB,CAAC,IAAI,CAAC,EAAE,EAAE,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;IAChE,CAAC;IAED,IAAI,IAAI,YAAY,cAAc,EAAE,CAAC;QACnC,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CACzC,uBAAuB,CAAC,EAAE,EAAE,OAAO,CAAC,CACrC,CAAC;QACF,OAAO,CAAC,EAAE,EAAE,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC;IAC/D,CAAC;IAED,MAAM,IAAI,iBAAiB,CAAC,0CAA0C,EAAE,IAAI,CAAC,CAAC;AAChF,CAAC;AAED,SAAS,gBAAgB,CACvB,IAA2B,EAC3B,IAAmB,EACnB,QAAkC;IAElC,OAAO,iBAAiB,CACtB,IAAI,EACJ,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,EAChC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CACxB,CAAC;AACJ,CAAC"}
|
package/dist/result/impl.d.ts
CHANGED
|
@@ -1,17 +1,19 @@
|
|
|
1
1
|
import type { IdInput, NormalizedId, Registered, RegistryIds, RegistryLookup } from "@adeficior/data-modifier-core";
|
|
2
2
|
import type { BlockId, FluidId, ItemId, RegistryId } from "@adeficior/data-modifier/generated";
|
|
3
|
-
import { BlockIngredient, FluidIngredient, ItemIngredient } from "../ingredient/impl";
|
|
4
3
|
import type { Ingredient } from "../ingredient/impl";
|
|
4
|
+
import { BlockIngredient, FluidIngredient, ItemIngredient } from "../ingredient/impl";
|
|
5
5
|
export declare abstract class Result implements Registered {
|
|
6
6
|
validate(_: RegistryLookup): void;
|
|
7
7
|
abstract ids(): RegistryIds;
|
|
8
8
|
abstract asIngredient(): Ingredient;
|
|
9
|
+
abstract hashCode(): string;
|
|
9
10
|
}
|
|
10
11
|
export declare abstract class RegistryEntryResult<T extends string> extends Result {
|
|
11
12
|
private readonly registry;
|
|
12
13
|
readonly id: NormalizedId<T>;
|
|
13
14
|
constructor(input: IdInput<T>, registry: NormalizedId<RegistryId>);
|
|
14
15
|
ids(): RegistryIds;
|
|
16
|
+
hashCode(): string;
|
|
15
17
|
}
|
|
16
18
|
export declare class ItemResult extends RegistryEntryResult<ItemId> {
|
|
17
19
|
readonly count: number;
|
|
@@ -37,4 +39,5 @@ export declare class IgnoredResult extends Result {
|
|
|
37
39
|
constructor(raw: unknown);
|
|
38
40
|
asIngredient(): Ingredient;
|
|
39
41
|
ids(): RegistryIds;
|
|
42
|
+
hashCode(): string;
|
|
40
43
|
}
|
package/dist/result/impl.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { encodeId } from "@adeficior/data-modifier-core";
|
|
1
|
+
import { createId, encodeId } from "@adeficior/data-modifier-core";
|
|
2
2
|
import { BlockIngredient, FluidIngredient, ItemIngredient, } from "../ingredient/impl";
|
|
3
3
|
import { BUCKET } from "../units";
|
|
4
4
|
export class Result {
|
|
@@ -15,6 +15,9 @@ export class RegistryEntryResult extends Result {
|
|
|
15
15
|
ids() {
|
|
16
16
|
return { [this.registry]: [this.id] };
|
|
17
17
|
}
|
|
18
|
+
hashCode() {
|
|
19
|
+
return `${createId(this.registry).path}:${this.id}`;
|
|
20
|
+
}
|
|
18
21
|
}
|
|
19
22
|
export class ItemResult extends RegistryEntryResult {
|
|
20
23
|
count;
|
|
@@ -69,5 +72,8 @@ export class IgnoredResult extends Result {
|
|
|
69
72
|
ids() {
|
|
70
73
|
return {};
|
|
71
74
|
}
|
|
75
|
+
hashCode() {
|
|
76
|
+
throw new Error("this result should be ignored");
|
|
77
|
+
}
|
|
72
78
|
}
|
|
73
79
|
//# sourceMappingURL=impl.js.map
|
package/dist/result/impl.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"impl.js","sourceRoot":"","sources":["../../src/result/impl.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"impl.js","sourceRoot":"","sources":["../../src/result/impl.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAQnE,OAAO,EACL,eAAe,EACf,eAAe,EACf,cAAc,GACf,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,MAAM,OAAgB,MAAM;IAC1B,QAAQ,CAAC,CAAiB,IAAS,CAAC;CAIrC;AAED,MAAM,OAAgB,mBAAsC,SAAQ,MAAM;IAKrD;IAJH,EAAE,CAAkB;IAEpC,YACE,KAAiB,EACA,QAAkC;QAEnD,KAAK,EAAE,CAAC;QAFS,aAAQ,GAAR,QAAQ,CAA0B;QAGnD,IAAI,CAAC,EAAE,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC5B,CAAC;IAEQ,GAAG;QACV,OAAO,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;IACxC,CAAC;IAEQ,QAAQ;QACf,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,IAAI,IAAI,CAAC,EAAE,EAAE,CAAC;IACtD,CAAC;CACF;AAED,MAAM,OAAO,UAAW,SAAQ,mBAA2B;IAGvC;IACA;IAHlB,YACE,EAAmB,EACH,QAAQ,CAAC,EACT,MAAe;QAE/B,KAAK,CAAC,EAAE,EAAE,gBAAgB,CAAC,CAAC;QAHZ,UAAK,GAAL,KAAK,CAAI;QACT,WAAM,GAAN,MAAM,CAAS;IAGjC,CAAC;IAEQ,QAAQ,CAAC,MAAsB;QACtC,MAAM,CAAC,aAAa,CAAC,gBAAgB,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;IAClD,CAAC;IAEQ,YAAY;QACnB,OAAO,IAAI,cAAc,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;IACjD,CAAC;CACF;AAED,MAAM,OAAO,WAAY,SAAQ,mBAA4B;IAGzC;IACA;IAHlB,YACE,EAAoB,EACJ,SAAiB,MAAM,EACvB,MAAe;QAE/B,KAAK,CAAC,EAAE,EAAE,iBAAiB,CAAC,CAAC;QAHb,WAAM,GAAN,MAAM,CAAiB;QACvB,WAAM,GAAN,MAAM,CAAS;IAGjC,CAAC;IAEQ,QAAQ,CAAC,MAAsB;QACtC,MAAM,CAAC,aAAa,CAAC,iBAAiB,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;IACnD,CAAC;IAEQ,YAAY;QACnB,OAAO,IAAI,eAAe,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACnD,CAAC;CACF;AAED,MAAM,OAAO,WAAY,SAAQ,mBAA4B;IAC3D,YAAY,EAAoB;QAC9B,KAAK,CAAC,EAAE,EAAE,iBAAiB,CAAC,CAAC;IAC/B,CAAC;IAEQ,QAAQ,CAAC,MAAsB;QACtC,MAAM,CAAC,aAAa,CAAC,iBAAiB,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;IACnD,CAAC;IAEQ,YAAY;QACnB,OAAO,IAAI,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACtC,CAAC;CACF;AAED,MAAM,OAAO,aAAc,SAAQ,MAAM;IACX;IAA5B,YAA4B,GAAY;QACtC,KAAK,EAAE,CAAC;QADkB,QAAG,GAAH,GAAG,CAAS;IAExC,CAAC;IAEQ,YAAY;QACnB,MAAM,IAAI,KAAK,CAAC,wDAAwD,CAAC,CAAC;IAC5E,CAAC;IAEQ,GAAG;QACV,OAAO,EAAE,CAAC;IACZ,CAAC;IAEQ,QAAQ;QACf,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;IACnD,CAAC;CACF"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import type { RegistryLookup, SemVerInput } from "@adeficior/data-modifier-core";
|
|
2
2
|
import type { Serializer } from "@adeficior/data-modifier-core/serializer";
|
|
3
3
|
import { Ingredient } from "../../ingredient/impl";
|
|
4
|
-
import { IngredientMap } from "./ingredientMap";
|
|
5
4
|
import type { IngredientMapInput } from "./ingredientMap";
|
|
6
|
-
|
|
5
|
+
import { IngredientMap } from "./ingredientMap";
|
|
6
|
+
export type IngredientSerializer = Serializer<Ingredient, IngredientSerializer> & {
|
|
7
7
|
deserializeIngredientMap(input: IngredientMapInput): IngredientMap;
|
|
8
8
|
serializeIngredientMap(map: IngredientMap): IngredientMapInput;
|
|
9
|
-
}
|
|
9
|
+
};
|
|
10
10
|
export declare function createIngredientSerializer(packFormat: SemVerInput, lookup: RegistryLookup): IngredientSerializer;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/serializer/ingredients/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/serializer/ingredients/index.ts"],"names":[],"mappings":"AAQA,OAAO,EACL,mBAAmB,EACnB,iBAAiB,GAClB,MAAM,0CAA0C,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,MAAM,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,MAAM,MAAM,CAAC;AAEpC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAWhD,MAAM,wBACJ,SAAQ,mBAAqD;IAG7D,YAAY,UAAuB,EAAE,MAAsB;QACzD,KAAK,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE;YACpC,EAAE,EAAE,YAAY;YAChB,EAAE,EAAE,YAAY;SACjB,CAAC,CAAC;IACL,CAAC;IAED,wBAAwB,CAAC,KAAyB;QAChD,OAAO,IAAI,aAAa,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAC3E,CAAC;IAED,sBAAsB,CAAC,GAAkB;QACvC,OAAO,SAAS,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC;IAChE,CAAC;IAEQ,UAAU,CACjB,MAAoC;QAEpC,OAAO,IAAI,2BAA2B,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACvD,CAAC;CACF;AAED,MAAM,2BAA4B,SAAQ,iBAGzC;IACC,wBAAwB,CAAC,KAAyB;QAChD,OAAO,IAAI,CAAC,UAAU,CAAC,wBAAwB,CAAC,KAAK,CAAC,CAAC;IACzD,CAAC;IAED,sBAAsB,CAAC,GAAkB;QACvC,OAAO,IAAI,CAAC,UAAU,CAAC,sBAAsB,CAAC,GAAG,CAAC,CAAC;IACrD,CAAC;CACF;AAED,MAAM,UAAU,0BAA0B,CACxC,UAAuB,EACvB,MAAsB;IAEtB,OAAO,IAAI,wBAAwB,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;AAC1D,CAAC"}
|
|
@@ -1,9 +1,14 @@
|
|
|
1
1
|
import type { Replacer } from "@adeficior/data-modifier-core/serializer";
|
|
2
2
|
import type { Ingredient } from "../../ingredient/impl";
|
|
3
3
|
export type IngredientMapInput = Record<string, unknown>;
|
|
4
|
+
export declare function validatePatternDimensions<T>(pattern: T[][]): void;
|
|
4
5
|
export declare class IngredientMap {
|
|
5
6
|
readonly ingredients: Record<string, Ingredient>;
|
|
6
7
|
constructor(ingredients: Record<string, Ingredient>);
|
|
7
8
|
list(): Ingredient[];
|
|
8
9
|
replace(replace: Replacer<Ingredient>): IngredientMap;
|
|
10
|
+
static from(ingredients: Ingredient[][]): {
|
|
11
|
+
pattern: string[];
|
|
12
|
+
ingredients: IngredientMap;
|
|
13
|
+
};
|
|
9
14
|
}
|
|
@@ -1,4 +1,15 @@
|
|
|
1
|
+
import { IllegalShapeError } from "@adeficior/data-modifier-core/serializer";
|
|
1
2
|
import { mapValues } from "lodash-es";
|
|
3
|
+
const AUTO_KEYS = "ABCDEFGHIJKLMNOPQRSTUVWXYZ".split("");
|
|
4
|
+
export function validatePatternDimensions(pattern) {
|
|
5
|
+
if (pattern.length === 0) {
|
|
6
|
+
throw new IllegalShapeError("ingredient pattern cannot be empty", pattern);
|
|
7
|
+
}
|
|
8
|
+
const width = pattern[0].length;
|
|
9
|
+
if (pattern.some((it) => it.length !== width)) {
|
|
10
|
+
throw new IllegalShapeError("ingredient pattern rows must all be of same width", pattern);
|
|
11
|
+
}
|
|
12
|
+
}
|
|
2
13
|
export class IngredientMap {
|
|
3
14
|
ingredients;
|
|
4
15
|
constructor(ingredients) {
|
|
@@ -10,5 +21,34 @@ export class IngredientMap {
|
|
|
10
21
|
replace(replace) {
|
|
11
22
|
return new IngredientMap(mapValues(this.ingredients, replace));
|
|
12
23
|
}
|
|
24
|
+
static from(ingredients) {
|
|
25
|
+
const pattern = [];
|
|
26
|
+
const keys = {};
|
|
27
|
+
const lookup = new Map();
|
|
28
|
+
validatePatternDimensions(ingredients);
|
|
29
|
+
for (let y = 0; y < ingredients.length; y++) {
|
|
30
|
+
const line = ingredients[y];
|
|
31
|
+
let patternLine = "";
|
|
32
|
+
for (let x = 0; x < line.length; x++) {
|
|
33
|
+
const ingredient = line[x];
|
|
34
|
+
const hash = ingredient.hashCode();
|
|
35
|
+
const existing = lookup.get(hash);
|
|
36
|
+
if (existing) {
|
|
37
|
+
patternLine += existing;
|
|
38
|
+
}
|
|
39
|
+
else {
|
|
40
|
+
const next = AUTO_KEYS[lookup.size];
|
|
41
|
+
if (!next) {
|
|
42
|
+
throw new Error("ingredient map has to many ingredients to represent");
|
|
43
|
+
}
|
|
44
|
+
patternLine += next;
|
|
45
|
+
lookup.set(hash, next);
|
|
46
|
+
keys[next] = ingredient;
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
pattern.push(patternLine);
|
|
50
|
+
}
|
|
51
|
+
return { pattern, ingredients: new IngredientMap(keys) };
|
|
52
|
+
}
|
|
13
53
|
}
|
|
14
54
|
//# sourceMappingURL=ingredientMap.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ingredientMap.js","sourceRoot":"","sources":["../../../src/serializer/ingredients/ingredientMap.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ingredientMap.js","sourceRoot":"","sources":["../../../src/serializer/ingredients/ingredientMap.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,0CAA0C,CAAC;AAE7E,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAKtC,MAAM,SAAS,GAAG,4BAA4B,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;AAEzD,MAAM,UAAU,yBAAyB,CAAI,OAAc;IACzD,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzB,MAAM,IAAI,iBAAiB,CAAC,oCAAoC,EAAE,OAAO,CAAC,CAAC;IAC7E,CAAC;IAED,MAAM,KAAK,GAAG,OAAO,CAAC,CAAC,CAAE,CAAC,MAAM,CAAC;IACjC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,MAAM,KAAK,KAAK,CAAC,EAAE,CAAC;QAC9C,MAAM,IAAI,iBAAiB,CACzB,mDAAmD,EACnD,OAAO,CACR,CAAC;IACJ,CAAC;AACH,CAAC;AAED,MAAM,OAAO,aAAa;IACI;IAA5B,YAA4B,WAAuC;QAAvC,gBAAW,GAAX,WAAW,CAA4B;IAAG,CAAC;IAEvE,IAAI;QACF,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IACzC,CAAC;IAED,OAAO,CAAC,OAA6B;QACnC,OAAO,IAAI,aAAa,CAAC,SAAS,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC;IACjE,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,WAA2B;QACrC,MAAM,OAAO,GAAa,EAAE,CAAC;QAC7B,MAAM,IAAI,GAA+B,EAAE,CAAC;QAC5C,MAAM,MAAM,GAAG,IAAI,GAAG,EAAkB,CAAC;QAEzC,yBAAyB,CAAC,WAAW,CAAC,CAAC;QAEvC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAC5C,MAAM,IAAI,GAAG,WAAW,CAAC,CAAC,CAAE,CAAC;YAC7B,IAAI,WAAW,GAAG,EAAE,CAAC;YACrB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBACrC,MAAM,UAAU,GAAG,IAAI,CAAC,CAAC,CAAE,CAAC;gBAC5B,MAAM,IAAI,GAAG,UAAU,CAAC,QAAQ,EAAE,CAAC;gBACnC,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBAElC,IAAI,QAAQ,EAAE,CAAC;oBACb,WAAW,IAAI,QAAQ,CAAC;gBAC1B,CAAC;qBAAM,CAAC;oBACN,MAAM,IAAI,GAAG,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;oBACpC,IAAI,CAAC,IAAI,EAAE,CAAC;wBACV,MAAM,IAAI,KAAK,CACb,qDAAqD,CACtD,CAAC;oBACJ,CAAC;oBAED,WAAW,IAAI,IAAI,CAAC;oBACpB,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;oBACvB,IAAI,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC;gBAC1B,CAAC;YACH,CAAC;YACD,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAC5B,CAAC;QAED,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,IAAI,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC;IAC3D,CAAC;CACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/serializer/results/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/serializer/results/index.ts"],"names":[],"mappings":"AAQA,OAAO,EACL,mBAAmB,EACnB,iBAAiB,GAClB,MAAM,0CAA0C,CAAC;AAClD,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,MAAM,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,MAAM,MAAM,CAAC;AAIpC,MAAM,UAAU,sBAAsB,CACpC,UAAuB,EACvB,MAAsB;IAEtB,OAAO,IAAI,oBAAoB,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;AACtD,CAAC;AAED,MAAM,oBACJ,SAAQ,mBAA6C;IAGrD,YAAY,UAAuB,EAAE,MAAsB;QACzD,KAAK,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE;YAChC,EAAE,EAAE,YAAY;YAChB,EAAE,EAAE,YAAY;SACjB,CAAC,CAAC;IACL,CAAC;IAED,UAAU,CAAC,MAAgC;QACzC,OAAO,IAAI,iBAAiB,CAA2B,IAAI,EAAE,MAAM,CAAC,CAAC;IACvE,CAAC;CACF"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { SerializerModule } from "@adeficior/data-modifier-core/serializer";
|
|
2
2
|
import type { Ingredient } from "../ingredient/impl";
|
|
3
3
|
import type { Result } from "../result/impl";
|
|
4
|
-
export
|
|
4
|
+
export type WithSerializerModules = {
|
|
5
5
|
ingredientModules(): Record<string, SerializerModule<Ingredient>>;
|
|
6
6
|
resultModules(): Record<string, SerializerModule<Result>>;
|
|
7
|
-
}
|
|
7
|
+
};
|
package/dist/testing/setup.d.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import type { RegistryLookup } from "@adeficior/data-modifier-core";
|
|
2
|
-
import type {
|
|
2
|
+
import type { TagRegistries } from "@adeficior/data-modifier-tags";
|
|
3
3
|
import type { Predicates } from "../predicates";
|
|
4
4
|
import type { IngredientSerializer } from "../serializer/ingredients";
|
|
5
5
|
import type { ResultSerializer } from "../serializer/results";
|
|
6
6
|
export declare function setupIngredientSerializer(version: string, registries: RegistryLookup): IngredientSerializer;
|
|
7
7
|
export declare function setupResultSerializer(version: string, registries: RegistryLookup): ResultSerializer;
|
|
8
|
-
export declare function setupPredicates(registries: RegistryLookup, tags:
|
|
8
|
+
export declare function setupPredicates(registries: RegistryLookup, tags: TagRegistries, ingredients: IngredientSerializer): Predicates;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setup.js","sourceRoot":"","sources":["../../src/testing/setup.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"setup.js","sourceRoot":"","sources":["../../src/testing/setup.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAG7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAEjD,OAAO,EAAE,0BAA0B,EAAE,MAAM,2BAA2B,CAAC;AAEvE,OAAO,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAE/D,MAAM,UAAU,yBAAyB,CACvC,OAAe,EACf,UAA0B;IAE1B,OAAO,0BAA0B,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,UAAU,CAAC,CAAC;AACvE,CAAC;AAED,MAAM,UAAU,qBAAqB,CACnC,OAAe,EACf,UAA0B;IAE1B,OAAO,sBAAsB,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,UAAU,CAAC,CAAC;AACnE,CAAC;AAED,MAAM,UAAU,eAAe,CAC7B,UAA0B,EAC1B,IAAmB,EACnB,WAAiC;IAEjC,OAAO,gBAAgB,CAAC,UAAU,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC;AACzD,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,24 +1,24 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@adeficior/data-modifier-ingredients",
|
|
3
3
|
"description": "data-modifier module for ingredient & results",
|
|
4
|
-
"version": "2.0.0
|
|
4
|
+
"version": "2.0.0",
|
|
5
5
|
"exports": { ".": "./dist/index.js", "./testing": "./dist/testing/index.js" },
|
|
6
|
-
"types": "./dist/index.d.ts",
|
|
7
|
-
"files": ["dist"],
|
|
8
|
-
"typesVersions": { "*": { "testing": ["./dist/testing/index.d.ts"] } },
|
|
9
6
|
"type": "module",
|
|
10
7
|
"devDependencies": {
|
|
11
|
-
"@adeficior/data-modifier-tags": "^2.0.0
|
|
8
|
+
"@adeficior/data-modifier-tags": "^2.0.0",
|
|
12
9
|
"@types/lodash-es": "^4.17.12"
|
|
13
10
|
},
|
|
14
11
|
"peerDependencies": {
|
|
15
|
-
"@adeficior/pack-resolver": "^2.0.
|
|
12
|
+
"@adeficior/pack-resolver": "^2.0.1",
|
|
16
13
|
"typescript": "^5",
|
|
17
14
|
"zod": "^4.4.3",
|
|
18
15
|
"lodash-es": "^4.18.1",
|
|
19
|
-
"@adeficior/data-modifier-tags": "^2.0.0
|
|
20
|
-
"@adeficior/data-modifier-core": "^2.0.0
|
|
16
|
+
"@adeficior/data-modifier-tags": "^2.0.0",
|
|
17
|
+
"@adeficior/data-modifier-core": "^2.0.0"
|
|
21
18
|
},
|
|
19
|
+
"typesVersions": { "*": { "./testing": ["./dist/testing/index.d.ts"] } },
|
|
20
|
+
"types": "./dist/index.d.ts",
|
|
21
|
+
"files": ["dist"],
|
|
22
22
|
"bugs": { "url": "https://github.com/Adeficior/DataModifier/issues" },
|
|
23
23
|
"homepage": "https://github.com/Adeficior/DataModifier#readme",
|
|
24
24
|
"license": "LGPL-3.0-or-later",
|