@adeficior/data-modifier-ingredients 2.0.2 → 2.0.4

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.
@@ -9,6 +9,7 @@ import type { IngredientFilter } from "./ingredients";
9
9
  export type Predicates = {
10
10
  ingredient(filter: IngredientFilter): Predicate<Ingredient>;
11
11
  result(filter: IngredientFilter): Predicate<Result>;
12
+ id(filter: CommonFilter<NormalizedId>): Predicate<IdInput>;
12
13
  id<T extends RegistryId>(filter: CommonFilter<NormalizedId<InferIds<T>>>, registry: T): Predicate<IdInput<InferIds<T>>>;
13
14
  };
14
15
  export declare function createPredicates(registries: RegistryLookup, tags: TagRegistries, ingredientSerializer: IngredientSerializer): Predicates;
@@ -1,4 +1,5 @@
1
- import { resolveIdTest } from "@adeficior/data-modifier-core/serializer";
1
+ import { resolveIdFilter } from "@adeficior/data-modifier-tags";
2
+ import { notNull } from "@adeficior/pack-resolver";
2
3
  import { createIngredientPredicate } from "./ingredients";
3
4
  export function createPredicates(registries, tags, ingredientSerializer) {
4
5
  return new PredicatesImpl(registries, tags, ingredientSerializer);
@@ -7,9 +8,7 @@ class PredicatesImpl {
7
8
  registries;
8
9
  tags;
9
10
  ingredientSerializer;
10
- constructor(
11
- // TODO inject
12
- registries, tags, ingredientSerializer) {
11
+ constructor(registries, tags, ingredientSerializer) {
13
12
  this.registries = registries;
14
13
  this.tags = tags;
15
14
  this.ingredientSerializer = ingredientSerializer;
@@ -29,8 +28,14 @@ class PredicatesImpl {
29
28
  };
30
29
  }
31
30
  id(filter, registry) {
32
- const tags = typeof registry == "string" ? this.tags.registry(registry) : registry;
33
- return resolveIdTest(filter, tags);
31
+ const context = notNull(registry)
32
+ ? {
33
+ tags: this.tags.registry(registry),
34
+ lookup: this.registries,
35
+ registry,
36
+ }
37
+ : undefined;
38
+ return resolveIdFilter(filter, context);
34
39
  }
35
40
  }
36
41
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
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
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/predicates/index.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAEhE,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAKnD,OAAO,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAC;AAY1D,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;IAEC;IACA;IACA;IAHnB,YACmB,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,QAAY;QAEZ,MAAM,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC;YAC/B,CAAC,CAAE;gBACC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC;gBAClC,MAAM,EAAE,IAAI,CAAC,UAAU;gBACvB,QAAQ;aACqB;YACjC,CAAC,CAAC,SAAS,CAAC;QAEd,OAAO,eAAe,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC1C,CAAC;CACF"}
@@ -1,4 +1,5 @@
1
- import { createIdPredicate, IllegalShapeError, } from "@adeficior/data-modifier-core/serializer";
1
+ import { IllegalShapeError } from "@adeficior/data-modifier-core/serializer";
2
+ import { createIdPredicate } from "@adeficior/data-modifier-tags";
2
3
  import { Ingredient, ItemIngredient, ItemTagIngredient, ListIngredient, RegistryEntryIngredient, TagIngredient, } from "../ingredient/impl";
3
4
  export function createIngredientPredicate(test, context) {
4
5
  const unvalidated = createUnvalidatedFilter(test, context);
@@ -1 +1 @@
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"}
1
+ {"version":3,"file":"ingredients.js","sourceRoot":"","sources":["../../src/predicates/ingredients.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,iBAAiB,EAAE,MAAM,0CAA0C,CAAC;AAC7E,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAGlE,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/package.json CHANGED
@@ -1,11 +1,11 @@
1
1
  {
2
2
  "name": "@adeficior/data-modifier-ingredients",
3
3
  "description": "data-modifier module for ingredient & results",
4
- "version": "2.0.2",
4
+ "version": "2.0.4",
5
5
  "exports": { ".": "./dist/index.js", "./testing": "./dist/testing/index.js" },
6
6
  "type": "module",
7
7
  "devDependencies": {
8
- "@adeficior/data-modifier-tags": "^2.0.2",
8
+ "@adeficior/data-modifier-tags": "^2.0.4",
9
9
  "@types/lodash-es": "^4.17.12"
10
10
  },
11
11
  "peerDependencies": {
@@ -13,8 +13,8 @@
13
13
  "typescript": "^5",
14
14
  "zod": "^4.4.3",
15
15
  "lodash-es": "^4.18.1",
16
- "@adeficior/data-modifier-tags": "^2.0.2",
17
- "@adeficior/data-modifier-core": "^2.0.2"
16
+ "@adeficior/data-modifier-tags": "^2.0.4",
17
+ "@adeficior/data-modifier-core": "^2.2.0"
18
18
  },
19
19
  "typesVersions": { "*": { "./testing": ["./dist/testing/index.d.ts"] } },
20
20
  "types": "./dist/index.d.ts",