@lls/store 24.1.59-8b07e64c → 24.1.59-8e1a3cff

package/lib/index.js

@@ -742,8 +742,7 @@ var getToken = _.get("auth.token");
 
 // src/selectors/school.ts
 init_define_import_meta();
-import { filterEntitiesSimpleFieldByValues } from "@lls/utils";
-import _2 from "lodash/fp.js";
+import { makeEntitiesFilter } from "@lls/utils";
 
 // src/selectors/crud.ts
 init_define_import_meta();
@@ -768,21 +767,15 @@ var crud = (entityName, { search: search24 }) => {
 };
 
 // src/selectors/school.ts
-var search = ({ ids }) => _2.flow(filterEntitiesSimpleFieldByValues("id", ids));
+var search = ({ ids }) => makeEntitiesFilter({ id: ids });
 var { getSchools, getSchool, searchSchools, makeSearchSchools } = crud("schools", {
   search
 });
 
 // src/selectors/book.ts
 init_define_import_meta();
-import {
-  createSearchSelector as createSearchSelector2,
-  filterEntitiesArrayFieldByValues,
-  filterEntitiesSimpleFieldByValue,
-  filterEntitiesSimpleFieldByValues as filterEntitiesSimpleFieldByValues2,
-  makeGetEntityById as makeGetEntityById2
-} from "@lls/utils";
-import _3 from "lodash/fp.js";
+import { createSearchSelector as createSearchSelector2, makeEntitiesFilter as makeEntitiesFilter2, makeGetEntityById as makeGetEntityById2, pipe } from "@lls/utils";
+import _2 from "lodash/fp.js";
 var search2 = ({
   ids,
   levelIds,
@@ -799,36 +792,43 @@ var search2 = ({
   publishers,
   isRenewed,
   isPrimary
-}) => _3.flow(
-  filterEntitiesSimpleFieldByValues2("id", ids),
-  filterEntitiesSimpleFieldByValues2("year", years),
-  filterEntitiesArrayFieldByValues("levels", levelIds),
-  filterEntitiesArrayFieldByValues("subjects", subjectIds),
-  filterEntitiesSimpleFieldByValues2("valid", _3.isNil(isValid) ? void 0 : [isValid]),
-  filterEntitiesSimpleFieldByValues2("publisher", publishers),
-  filterEntitiesSimpleFieldByValues2("hasNewDesign", _3.isNil(hasNewDesign) ? void 0 : [hasNewDesign]),
-  filterEntitiesSimpleFieldByValues2("isWorkbook", _3.isNil(isWorkbook) ? void 0 : [isWorkbook]),
-  filterEntitiesSimpleFieldByValues2("isWorkplan", _3.isNil(isWorkplan) ? void 0 : [isWorkplan]),
-  filterEntitiesSimpleFieldByValues2("hasNoTeacherBook", _3.isNil(hasNoTeacherBook) ? void 0 : [hasNoTeacherBook]),
-  filterEntitiesSimpleFieldByValues2("slug", slugs),
-  filterEntitiesSimpleFieldByValues2("uri", uris),
-  filterEntitiesSimpleFieldByValues2("isRenewed", _3.isNil(isRenewed) ? void 0 : [isRenewed]),
-  filterEntitiesSimpleFieldByValue("isPrimary", isPrimary),
-  _3.isFunction(sortByQuery) ? sortByQuery : sortByQuery ? _3.sortBy(sortByQuery) : _3.identity
-);
+}) => {
+  return (books) => pipe(
+    books,
+    makeEntitiesFilter2({
+      id: ids,
+      year: years,
+      levels: levelIds,
+      subjects: subjectIds,
+      valid: isValid,
+      publishers,
+      hasNewDesign,
+      isWorkbook,
+      isWorkplan,
+      hasNoTeacherBook,
+      slug: slugs,
+      uri: uris,
+      isRenewed,
+      isPrimary
+    }),
+    _2.isFunction(sortByQuery) ? sortByQuery : sortByQuery ? _2.sortBy(sortByQuery) : _2.identity
+  );
+};
 var { getBooks, getBook, searchBooks, makeSearchBooks } = crud("books", {
   search: search2
 });
-var makeSearchValidBooks = () => createSearchSelector2(makeSearchBooks(), (books) => _3.filter({ valid: true, hasNewDesign: true }, books));
+var makeSearchValidBooks = () => createSearchSelector2(makeSearchBooks(), (books) => _2.filter({ valid: true, hasNewDesign: true }, books));
 var searchValidBooks = makeSearchValidBooks();
 var makeGetBook = () => makeGetEntityById2("books");
 
 // src/selectors/user.ts
 init_define_import_meta();
 var import_reselect = __toESM(require_lib(), 1);
-import { filterEntitiesArrayFieldByValues as filterEntitiesArrayFieldByValues2, filterEntitiesSimpleFieldByValues as filterEntitiesSimpleFieldByValues3 } from "@lls/utils";
-import _4 from "lodash/fp.js";
-var search3 = ({ ids, schoolIds }) => _4.flow(filterEntitiesArrayFieldByValues2("schools", schoolIds), filterEntitiesSimpleFieldByValues3("id", ids));
+import { makeEntitiesFilter as makeEntitiesFilter3 } from "@lls/utils";
+var search3 = ({ ids, schoolIds }) => makeEntitiesFilter3({
+  schools: schoolIds,
+  id: ids
+});
 var { getUsers, getUser, searchUsers, makeSearchUsers } = crud("users", {
   search: search3
 });
@@ -840,12 +840,14 @@ var getCurrentUser = (0, import_reselect.createSelector)(
 
 // src/selectors/chapter.ts
 init_define_import_meta();
-import { filterEntitiesFieldExists, filterEntitiesSimpleFieldByValues as filterEntitiesSimpleFieldByValues4 } from "@lls/utils";
-import _5 from "lodash/fp.js";
-var search4 = ({ bookIds, ids, hasTeacherBook }) => _5.flow(
-  filterEntitiesSimpleFieldByValues4("book", bookIds),
-  filterEntitiesSimpleFieldByValues4("id", ids),
-  filterEntitiesFieldExists("teacherBook", hasTeacherBook)
+import { makeEntitiesFilter as makeEntitiesFilter4 } from "@lls/utils";
+import _3 from "lodash/fp.js";
+var search4 = ({ bookIds, ids, hasTeacherBook }) => makeEntitiesFilter4(
+  {
+    book: bookIds,
+    id: ids
+  },
+  !_3.isNil(hasTeacherBook) && ((chapter2) => !!chapter2?.teacherBook === hasTeacherBook)
 );
 var { getChapters, getChapter, searchChapters, makeSearchChapters } = crud("chapters", {
   search: search4
@@ -853,14 +855,8 @@ var { getChapters, getChapter, searchChapters, makeSearchChapters } = crud("chap
 
 // src/selectors/page.ts
 init_define_import_meta();
-import {
-  createSearchSelector as createSearchSelector3,
-  filterEntitiesArrayFieldByValues as filterEntitiesArrayFieldByValues3,
-  filterEntitiesSimpleFieldByValues as filterEntitiesSimpleFieldByValues5,
-  makeGetAllEntities as makeGetAllEntities2,
-  makeGetEntityById as makeGetEntityById3
-} from "@lls/utils";
-import _6 from "lodash/fp.js";
+import { createSearchSelector as createSearchSelector3, makeEntitiesFilter as makeEntitiesFilter5, makeGetAllEntities as makeGetAllEntities2, makeGetEntityById as makeGetEntityById3 } from "@lls/utils";
+import _4 from "lodash/fp.js";
 var search5 = ({
   ids,
   chapterIds,
@@ -873,27 +869,45 @@ var search5 = ({
   hasNewDesign,
   slugs,
   isLearningAssessment,
-  isCreatedFromScratch
-}) => _6.flow(
-  filterEntitiesSimpleFieldByValues5("id", ids),
-  filterEntitiesSimpleFieldByValues5("chapter", chapterIds),
-  filterEntitiesSimpleFieldByValues5("valid", _6.isNil(isValid) ? void 0 : [isValid]),
-  filterEntitiesSimpleFieldByValues5("isOriginal", _6.isNil(isOriginal) ? void 0 : [isOriginal]),
-  filterEntitiesSimpleFieldByValues5("hasNewDesign", _6.isNil(hasNewDesign) ? void 0 : [hasNewDesign]),
-  filterEntitiesSimpleFieldByValues5("slug", slugs),
-  filterEntitiesSimpleFieldByValues5("oldLesson", oldLessonIds),
-  filterEntitiesSimpleFieldByValues5(
-    "isLearningAssessment",
-    _6.isNil(isLearningAssessment) ? void 0 : [isLearningAssessment]
-  ),
-  filterEntitiesSimpleFieldByValues5(
-    "isCreatedFromScratch",
-    _6.isNil(isCreatedFromScratch) ? void 0 : [isCreatedFromScratch]
-  ),
-  filterEntitiesSimpleFieldByValues5("premium", _6.isNil(premium) ? void 0 : [premium]),
-  filterEntitiesSimpleFieldByValues5("thematicName", thematicNames),
-  filterEntitiesSimpleFieldByValues5("book", bookIds)
-);
+  isCreatedFromScratch,
+  userIds,
+  parentIds,
+  originalPageIds,
+  sharedUserIds,
+  sharedGroups,
+  isDraft,
+  isParentCreatedFromScratch,
+  updatedAfter
+}) => {
+  let pageById = false;
+  return makeEntitiesFilter5(
+    {
+      id: ids,
+      chapter: chapterIds,
+      valid: isValid,
+      isOriginal,
+      hasNewDesign,
+      slug: slugs,
+      oldLesson: oldLessonIds,
+      isLearningAssessment,
+      isCreatedFromScratch,
+      premium,
+      thematicName: thematicNames,
+      book: bookIds,
+      parent: parentIds,
+      user: userIds,
+      originalPage: originalPageIds,
+      sharedUsers: sharedUserIds,
+      sharedGroups,
+      isDraft
+    },
+    isParentCreatedFromScratch && ((page2, pages) => {
+      pageById = pageById || _4.keyBy("id", pages);
+      return !!_4.get([page2?.originalPage, "isCreatedFromScratch"], pageById);
+    }),
+    updatedAfter && _4.flow(_4.get("updatedAt"), (date) => new Date(date) - updatedAfter >= 0)
+  );
+};
 var { getPages, getPage, searchPages, makeSearchPages, filterPages } = crud("pages", {
   search: search5
 });
@@ -909,64 +923,30 @@ var searchDraftPages = makeSearchDraftPages();
 var makeSearchModifiedPages = () => createSearchSelector3(
   getPages,
   (_state, params) => params,
-  (pages, {
-    chapterIds,
-    userIds,
-    originalPageIds,
-    parentIds,
-    bookIds,
-    sharedUserIds,
-    updatedAfter,
-    isLearningAssessment,
-    thematicNames,
-    isDraft,
-    isCreatedFromScratch,
-    isParentCreatedFromScratch,
-    sharedGroups
-  }) => _6.flow(
-    filterEntitiesSimpleFieldByValues5("parent", parentIds),
-    filterEntitiesSimpleFieldByValues5("chapter", chapterIds),
-    filterEntitiesSimpleFieldByValues5("book", bookIds),
-    filterEntitiesSimpleFieldByValues5("user", userIds),
-    filterEntitiesSimpleFieldByValues5("originalPage", originalPageIds),
-    filterEntitiesArrayFieldByValues3("sharedUsers", sharedUserIds),
-    filterEntitiesArrayFieldByValues3("sharedGroups", sharedGroups),
-    filterEntitiesSimpleFieldByValues5("isOriginal", [false]),
-    filterEntitiesSimpleFieldByValues5("thematicName", thematicNames),
-    !_6.isNil(isLearningAssessment) ? filterEntitiesSimpleFieldByValues5("isLearningAssessment", [isLearningAssessment]) : _6.identity,
-    !_6.isNil(isCreatedFromScratch) ? filterEntitiesSimpleFieldByValues5("isCreatedFromScratch", [isCreatedFromScratch]) : _6.identity,
-    !_6.isNil(isDraft) ? filterEntitiesSimpleFieldByValues5("isDraft", [isDraft]) : _6.identity,
-    isParentCreatedFromScratch ? _6.filter(
-      (entity) => _6.flow(_6.find({ id: entity?.originalPage }), _6.get("isCreatedFromScratch"))(pages)
-    ) : _6.identity,
-    updatedAfter ? _6.filter(
-      _6.flow(_6.get("updatedAt"), (date) => new Date(date) - updatedAfter >= 0)
-    ) : _6.identity
-  )(pages)
+  (pages, params) => search5({ ...params, isOriginal: false })(pages)
 );
 var searchModifiedPages = makeSearchModifiedPages();
 
 // src/selectors/collection.ts
 init_define_import_meta();
-import _7 from "lodash/fp.js";
-var search6 = (_params) => _7.identity;
+import _5 from "lodash/fp.js";
+var search6 = (_params) => _5.identity;
 var { getCollections, getCollection, searchCollections, makeSearchCollections } = crud("collections", {
   search: search6
 });
 
 // src/selectors/communityProject.ts
 init_define_import_meta();
-import { filterEntitiesArrayFieldByValues as filterEntitiesArrayFieldByValues4, filterEntitiesSimpleFieldByValues as filterEntitiesSimpleFieldByValues6 } from "@lls/utils";
-import _8 from "lodash/fp.js";
+import { makeEntitiesFilter as makeEntitiesFilter6 } from "@lls/utils";
 var search7 = ({
   slugs,
   isFeatured,
   projectTypes
-}) => _8.flow(
-  filterEntitiesSimpleFieldByValues6("slug", slugs),
-  filterEntitiesSimpleFieldByValues6("isFeatured", _8.isNil(isFeatured) ? void 0 : [isFeatured]),
-  filterEntitiesArrayFieldByValues4("projectTypes", projectTypes)
-);
+}) => makeEntitiesFilter6({
+  slug: slugs,
+  isFeatured,
+  projectTypes
+});
 var { getCommunityProjects, getCommunityProject, searchCommunityProjects, makeSearchCommunityProjects } = crud(
   "communityProjects",
   {
@@ -976,45 +956,35 @@ var { getCommunityProjects, getCommunityProject, searchCommunityProjects, makeSe
 
 // src/selectors/contact.ts
 init_define_import_meta();
-import _9 from "lodash/fp.js";
-var search8 = (_params) => _9.identity;
+import _6 from "lodash/fp.js";
+var search8 = (_params) => _6.identity;
 var { getContacts, getContact, searchContacts, makeSearchContacts } = crud("contacts", {
   search: search8
 });
 
 // src/selectors/copyNotification.ts
 init_define_import_meta();
-import { createSearchSelector as createSearchSelector4, filterEntitiesSimpleFieldByValues as filterEntitiesSimpleFieldByValues7, makeGetAllEntities as makeGetAllEntities3 } from "@lls/utils";
-import _10 from "lodash/fp.js";
+import { createSearchSelector as createSearchSelector4, makeEntitiesFilter as makeEntitiesFilter7, makeGetAllEntities as makeGetAllEntities3 } from "@lls/utils";
 var getCopyNotifications = makeGetAllEntities3("copyNotifications");
 var makeSearchCopyNotifications = () => createSearchSelector4(
-  [getCurrentUser, getCopyNotifications, (_26, params) => params],
-  (currentUser, copyNotifications, { pageIds, read }) => _10.flow(
-    _10.get("copyNotifications"),
-    (ids) => _10.flow(
-      filterEntitiesSimpleFieldByValues7("id", ids),
-      filterEntitiesSimpleFieldByValues7("page", pageIds),
-      filterEntitiesSimpleFieldByValues7("read", _10.isNil(read) ? void 0 : [read])
-    )(copyNotifications)
-  )(currentUser)
+  [getCurrentUser, getCopyNotifications, (_17, params) => params],
+  (currentUser, copyNotifications, { pageIds, read }) => {
+    const ids = currentUser?.copyNotifications;
+    return makeEntitiesFilter7({ id: ids, read, page: pageIds })(copyNotifications);
+  }
 );
 var searchCopyNotifications = makeSearchCopyNotifications();
 
 // src/selectors/drawerNotification.ts
 init_define_import_meta();
-import { createSearchSelector as createSearchSelector5, filterEntitiesSimpleFieldByValues as filterEntitiesSimpleFieldByValues8, makeGetAllEntities as makeGetAllEntities4 } from "@lls/utils";
-import _11 from "lodash/fp.js";
+import { createSearchSelector as createSearchSelector5, makeEntitiesFilter as makeEntitiesFilter8, makeGetAllEntities as makeGetAllEntities4 } from "@lls/utils";
 var getDrawerNotifications = makeGetAllEntities4("drawerNotifications");
 var makeSearchDrawerNotifications = () => createSearchSelector5(
-  [getCurrentUser, getDrawerNotifications, (_26, params) => params],
-  (currentUser, drawerNotifications, { read, pageIds }) => _11.flow(
-    _11.get("drawerNotifications"),
-    (ids) => _11.flow(
-      filterEntitiesSimpleFieldByValues8("id", ids),
-      filterEntitiesSimpleFieldByValues8("read", _11.isNil(read) ? void 0 : [read]),
-      filterEntitiesSimpleFieldByValues8("page", pageIds)
-    )(drawerNotifications)
-  )(currentUser)
+  [getCurrentUser, getDrawerNotifications, (_17, params) => params],
+  (currentUser, drawerNotifications, { read, pageIds }) => {
+    const ids = currentUser?.drawerNotifications;
+    return makeEntitiesFilter8({ id: ids, read, page: pageIds })(drawerNotifications);
+  }
 );
 var searchDrawerNotifications = makeSearchDrawerNotifications();
 
@@ -1025,8 +995,8 @@ var getFaqs = makeGetAllEntities5("faq");
 
 // src/selectors/garDivision.ts
 init_define_import_meta();
-import _12 from "lodash/fp.js";
-var search9 = (_params) => _12.identity;
+import _7 from "lodash/fp.js";
+var search9 = (_params) => _7.identity;
 var { getGarDivisions, getGarDivision, searchGarDivisions, makeSearchGarDivisions } = crud("garDivisions", {
   search: search9
 });
@@ -1034,9 +1004,9 @@ var { getGarDivisions, getGarDivision, searchGarDivisions, makeSearchGarDivision
 // src/selectors/group.ts
 init_define_import_meta();
 var import_reselect2 = __toESM(require_lib(), 1);
-import { filterEntitiesSimpleFieldByValues as filterEntitiesSimpleFieldByValues9 } from "@lls/utils";
-import _13 from "lodash/fp.js";
-var search10 = ({ ownerIds }) => _13.flow(filterEntitiesSimpleFieldByValues9("owner", ownerIds), _13.orderBy("createdAt", ["desc"]));
+import { makeEntitiesFilter as makeEntitiesFilter9 } from "@lls/utils";
+import _8 from "lodash/fp.js";
+var search10 = ({ ownerIds }) => _8.flow(makeEntitiesFilter9({ owner: ownerIds }), _8.orderBy("createdAt", ["desc"]));
 var { getGroups, getGroup, searchGroups, makeSearchGroups } = crud("groups", {
   search: search10
 });
@@ -1048,8 +1018,8 @@ var getUserGroups = (0, import_reselect2.createSelector)(
 // src/selectors/level.ts
 init_define_import_meta();
 var import_reselect3 = __toESM(require_lib(), 1);
-import { filterEntitiesSimpleFieldByValue as filterEntitiesSimpleFieldByValue2, filterEntitiesSimpleFieldByValues as filterEntitiesSimpleFieldByValues10 } from "@lls/utils";
-import _14 from "lodash/fp.js";
+import { makeEntitiesFilter as makeEntitiesFilter10 } from "@lls/utils";
+import _9 from "lodash/fp.js";
 var search11 = ({
   ids,
   slugs,
@@ -1059,37 +1029,39 @@ var search11 = ({
   isProHighSchool,
   isGenHighSchool,
   isElementarySchool
-}) => _14.flow(
-  filterEntitiesSimpleFieldByValues10("id", ids),
-  filterEntitiesSimpleFieldByValues10("slug", slugs),
-  filterEntitiesSimpleFieldByValue2("isPreSchool", isPreSchool),
-  filterEntitiesSimpleFieldByValue2("isMiddleSchool", isMiddleSchool),
-  filterEntitiesSimpleFieldByValue2("isHighSchool", isHighSchool),
-  filterEntitiesSimpleFieldByValue2("isProHighSchool", isProHighSchool),
-  filterEntitiesSimpleFieldByValue2("isGenHighSchool", isGenHighSchool),
-  filterEntitiesSimpleFieldByValue2("isElementarySchool", isElementarySchool),
-  _14.orderBy("order", "desc")
+}) => _9.flow(
+  makeEntitiesFilter10({
+    id: ids,
+    slug: slugs,
+    isPreSchool,
+    isMiddleSchool,
+    isHighSchool,
+    isProHighSchool,
+    isGenHighSchool,
+    isElementarySchool
+  }),
+  _9.orderBy("order", "desc")
 );
 var crudLevels = crud("levels", { search: search11 });
 var { getLevel, searchLevels, makeSearchLevels } = crudLevels;
-var getLevels = (0, import_reselect3.createSelector)(crudLevels.getLevels, _14.orderBy("order", "desc"));
+var getLevels = (0, import_reselect3.createSelector)(crudLevels.getLevels, _9.orderBy("order", "desc"));
 
 // src/selectors/mainNotification.ts
 init_define_import_meta();
 var import_reselect4 = __toESM(require_lib(), 1);
-import { filterEntitiesSimpleFieldByValues as filterEntitiesSimpleFieldByValues11, makeGetAllEntities as makeGetAllEntities6 } from "@lls/utils";
-import _15 from "lodash/fp.js";
+import { makeEntitiesFilter as makeEntitiesFilter11, makeGetAllEntities as makeGetAllEntities6 } from "@lls/utils";
+import _10 from "lodash/fp.js";
 var getAllMainNotifications = makeGetAllEntities6("mainNotifications");
-var search12 = ({ ids }) => _15.flow(filterEntitiesSimpleFieldByValues11("id", ids));
+var search12 = ({ ids }) => makeEntitiesFilter11({ id: ids });
 var getMainNotifications = (0, import_reselect4.createSelector)(
-  [_15.flow(getCurrentUser, _15.get("mainNotifications")), getAllMainNotifications],
+  [_10.flow(getCurrentUser, _10.get("mainNotifications")), getAllMainNotifications],
   (userNotifications, notifications) => search12({ ids: userNotifications })(notifications)
 );
 
 // src/selectors/news.ts
 init_define_import_meta();
-import { filterEntitiesSimpleFieldByValues as filterEntitiesSimpleFieldByValues12 } from "@lls/utils";
-var search13 = ({ ids }) => filterEntitiesSimpleFieldByValues12("id", ids);
+import { makeEntitiesFilter as makeEntitiesFilter12 } from "@lls/utils";
+var search13 = ({ ids }) => makeEntitiesFilter12({ id: ids });
 var {
   getNews: getAllNews,
   getNew: getNews,
@@ -1106,8 +1078,8 @@ var getPanorama = makeGetEntityById4("panoramas");
 
 // src/selectors/premiumResource.ts
 init_define_import_meta();
-import { filterEntitiesSimpleFieldByValues as filterEntitiesSimpleFieldByValues13 } from "@lls/utils";
-var search14 = ({ bookIds }) => filterEntitiesSimpleFieldByValues13("book", bookIds);
+import { makeEntitiesFilter as makeEntitiesFilter13 } from "@lls/utils";
+var search14 = ({ bookIds }) => makeEntitiesFilter13({ book: bookIds });
 var { getPremiumResources, getPremiumResource, searchPremiumResources, makeSearchPremiumResources } = crud(
   "premiumResources",
   {
@@ -1117,22 +1089,16 @@ var { getPremiumResources, getPremiumResource, searchPremiumResources, makeSearc
 
 // src/selectors/lexicalFlower.ts
 init_define_import_meta();
-import { filterEntitiesSimpleFieldByValues as filterEntitiesSimpleFieldByValues14 } from "@lls/utils";
-import _16 from "lodash/fp.js";
-var search15 = ({ ids }) => _16.flow(filterEntitiesSimpleFieldByValues14("id", ids));
+import { makeEntitiesFilter as makeEntitiesFilter14 } from "@lls/utils";
+var search15 = ({ ids }) => makeEntitiesFilter14({ id: ids });
 var { getLexicalFlowers, searchLexicalFlowers } = crud("lexicalFlowers", {
   search: search15
 });
 
 // src/selectors/product.ts
 init_define_import_meta();
-import _17 from "lodash/fp.js";
-import {
-  createSearchSelector as createSearchSelector6,
-  filterEntitiesArrayFieldByValues as filterEntitiesArrayFieldByValues5,
-  filterEntitiesSimpleFieldByValues as filterEntitiesSimpleFieldByValues15,
-  makeGetAllEntities as makeGetAllEntities7
-} from "@lls/utils";
+import _11 from "lodash/fp.js";
+import { createSearchSelector as createSearchSelector6, makeEntitiesFilter as makeEntitiesFilter15, makeGetAllEntities as makeGetAllEntities7 } from "@lls/utils";
 var getProducts = makeGetAllEntities7("products");
 var search16 = ({
   ids,
@@ -1143,14 +1109,21 @@ var search16 = ({
   subjectIds,
   productTypes
 }) => {
-  return _17.flow(
-    (products, books) => levelIds || subjectIds ? filterEntitiesArrayFieldByValues5("books", _17.map("id", books))(products) : products,
-    filterEntitiesSimpleFieldByValues15("id", ids),
-    filterEntitiesSimpleFieldByValues15("ean", eans),
-    filterEntitiesSimpleFieldByValues15("isAdoptant", _17.isBoolean(isAdoptant) ? [isAdoptant] : void 0),
-    filterEntitiesSimpleFieldByValues15("isSupportPlus", _17.isBoolean(isSupportPlus) ? [isSupportPlus] : void 0),
-    filterEntitiesSimpleFieldByValues15("productType", productTypes)
+  let bookIds;
+  const filter = makeEntitiesFilter15(
+    {
+      id: ids,
+      ean: eans,
+      isAdoptant,
+      isSupportPlus,
+      productType: productTypes
+    },
+    levelIds || subjectIds ? (product2) => !!product2?.books?.some((bookId) => bookIds.has(bookId)) : false
   );
+  return (products, books) => {
+    bookIds = new Set(_11.map("id", books));
+    return filter(products);
+  };
 };
 var searchBooks2 = makeSearchBooks();
 var searchProducts = createSearchSelector6(
@@ -1162,25 +1135,26 @@ var searchProducts = createSearchSelector6(
 
 // src/selectors/resource.ts
 init_define_import_meta();
-import { filterEntitiesSimpleFieldByValues as filterEntitiesSimpleFieldByValues16 } from "@lls/utils";
-import _18 from "lodash/fp.js";
-var search17 = ({ chapterIds }) => _18.flow(filterEntitiesSimpleFieldByValues16("chapter", chapterIds));
+import { makeEntitiesFilter as makeEntitiesFilter16 } from "@lls/utils";
+var search17 = ({ chapterIds }) => makeEntitiesFilter16({
+  chapter: chapterIds
+});
 var { getResources, getResource, searchResources, makeSearchResources } = crud("resources", {
   search: search17
 });
 
 // src/selectors/schoolType.ts
 init_define_import_meta();
-import { filterEntitiesSimpleFieldByValues as filterEntitiesSimpleFieldByValues17 } from "@lls/utils";
-var search18 = ({ slugs }) => filterEntitiesSimpleFieldByValues17("slug", slugs);
+import { makeEntitiesFilter as makeEntitiesFilter17 } from "@lls/utils";
+var search18 = ({ slugs }) => makeEntitiesFilter17({ slug: slugs });
 var { getSchoolTypes, getSchoolType, searchSchoolTypes, makeSearchSchoolTypes } = crud("schoolTypes", {
   search: search18
 });
 
 // src/selectors/sharedPage.ts
 init_define_import_meta();
-import { createSearchSelector as createSearchSelector7, filterEntitiesSimpleFieldByValue as filterEntitiesSimpleFieldByValue3, filterEntitiesSimpleFieldByValues as filterEntitiesSimpleFieldByValues18 } from "@lls/utils";
-import _19 from "lodash/fp.js";
+import { createSearchSelector as createSearchSelector7, makeEntitiesFilter as makeEntitiesFilter18 } from "@lls/utils";
+import _12 from "lodash/fp.js";
 var search19 = ({
   parentIds,
   userIds,
@@ -1188,45 +1162,39 @@ var search19 = ({
   isCreatedFromScratch,
   isLearningAssessment,
   ids
-}) => _19.flow(
-  filterEntitiesSimpleFieldByValues18("id", ids),
-  filterEntitiesSimpleFieldByValues18("parent", parentIds),
-  filterEntitiesSimpleFieldByValues18("user", userIds),
-  filterEntitiesSimpleFieldByValues18("book", bookIds),
-  filterEntitiesSimpleFieldByValue3("isLearningAssessment", isLearningAssessment),
-  filterEntitiesSimpleFieldByValue3("isCreatedFromScratch", isCreatedFromScratch)
-);
+}) => makeEntitiesFilter18({
+  id: ids,
+  parent: parentIds,
+  user: userIds,
+  book: bookIds,
+  isLearningAssessment,
+  isCreatedFromScratch
+});
 var { getSharedPages, getSharedPage, searchSharedPages, makeSearchSharedPages } = crud("sharedPages", {
   search: search19
 });
 var searchCurrentUserSharedPages = createSearchSelector7(
   getCurrentUser,
   getSharedPages,
-  (_26, params) => params,
+  (_17, params) => params,
   (user2, sharedPages, params) => {
     const sharedUserPageIds = user2?.sharedPages ?? [];
-    return search19({ ...params, ids: _19.intersection(sharedUserPageIds, params.ids || sharedUserPageIds) })(sharedPages);
+    return search19({ ...params, ids: _12.intersection(sharedUserPageIds, params.ids || sharedUserPageIds) })(sharedPages);
   }
 );
 
 // src/selectors/student.ts
 init_define_import_meta();
-import { filterEntitiesSimpleFieldByValues as filterEntitiesSimpleFieldByValues19 } from "@lls/utils";
-var search20 = ({ ids }) => filterEntitiesSimpleFieldByValues19("id", ids);
+import { makeEntitiesFilter as makeEntitiesFilter19 } from "@lls/utils";
+var search20 = ({ ids }) => makeEntitiesFilter19({ id: ids });
 var { getStudents, getStudent, searchStudents, makeSearchStudents } = crud("students", {
   search: search20
 });
 
 // src/selectors/subject.ts
 init_define_import_meta();
-import {
-  filterEntitiesArrayFieldByValues as filterEntitiesArrayFieldByValues6,
-  filterEntitiesFieldExists as filterEntitiesFieldExists2,
-  filterEntitiesSimpleFieldByValue as filterEntitiesSimpleFieldByValue4,
-  filterEntitiesSimpleFieldByValues as filterEntitiesSimpleFieldByValues20,
-  limitToTeacherSubjects
-} from "@lls/utils";
-import _20 from "lodash/fp.js";
+import { limitToTeacherSubjects, makeEntitiesFilter as makeEntitiesFilter20, pipe as pipe2 } from "@lls/utils";
+import _13 from "lodash/fp.js";
 var search21 = ({
   ids,
   slugs,
@@ -1235,14 +1203,19 @@ var search21 = ({
   schoolTypes,
   hasBooks,
   names
-}) => _20.flow(
-  filterEntitiesSimpleFieldByValues20("id", ids),
-  filterEntitiesSimpleFieldByValues20("slug", slugs),
-  filterEntitiesSimpleFieldByValues20("name", names),
-  filterEntitiesSimpleFieldByValue4("hasBooks", hasBooks),
-  filterEntitiesArrayFieldByValues6("schoolTypes", schoolTypes),
-  (subjects) => _20.isNil(isTeacherSubject) ? subjects : limitToTeacherSubjects(subjects),
-  filterEntitiesFieldExists2("newsletterUrl", hasNewsletterUrl)
+}) => (subjects) => pipe2(
+  subjects,
+  makeEntitiesFilter20(
+    {
+      id: ids,
+      slug: slugs,
+      name: names,
+      hasBooks,
+      schoolTypes
+    },
+    !_13.isNil(hasNewsletterUrl) && ((subject2) => Boolean(subject2?.newsletterUrl) === hasNewsletterUrl)
+  ),
+  (subjects2) => _13.isNil(isTeacherSubject) ? subjects2 : limitToTeacherSubjects(subjects2)
 );
 var { getSubjects, getSubject, searchSubjects, makeSearchSubjects } = crud("subjects", {
   search: search21
@@ -1250,22 +1223,23 @@ var { getSubjects, getSubject, searchSubjects, makeSearchSubjects } = crud("subj
 
 // src/selectors/teacher.ts
 init_define_import_meta();
-import { filterEntitiesArrayFieldByValues as filterEntitiesArrayFieldByValues7, filterEntitiesSimpleFieldByValues as filterEntitiesSimpleFieldByValues21 } from "@lls/utils";
-import _21 from "lodash/fp.js";
-var search22 = ({ ids, schoolIds }) => _21.flow(filterEntitiesSimpleFieldByValues21("id", ids), filterEntitiesArrayFieldByValues7("schools", schoolIds));
+import { makeEntitiesFilter as makeEntitiesFilter21 } from "@lls/utils";
+var search22 = ({ ids, schoolIds }) => makeEntitiesFilter21({
+  id: ids,
+  schools: schoolIds
+});
 var { getTeachers, getTeacher, searchTeachers, makeSearchTeachers } = crud("teachers", {
   search: search22
 });
 
 // src/selectors/tool.ts
 init_define_import_meta();
-import { filterEntitiesArrayFieldByValues as filterEntitiesArrayFieldByValues8, filterEntitiesSimpleFieldByValues as filterEntitiesSimpleFieldByValues22 } from "@lls/utils";
-import _22 from "lodash/fp.js";
-var search23 = ({ ids, locked, bookIds }) => _22.flow(
-  filterEntitiesSimpleFieldByValues22("id", ids),
-  filterEntitiesSimpleFieldByValues22("locked", _22.isNil(locked) ? void 0 : [locked]),
-  filterEntitiesArrayFieldByValues8("books", bookIds)
-);
+import { makeEntitiesFilter as makeEntitiesFilter22 } from "@lls/utils";
+var search23 = ({ ids, locked, bookIds }) => makeEntitiesFilter22({
+  id: ids,
+  locked,
+  books: bookIds
+});
 var { getTools, getTool, searchTools, makeSearchTools } = crud("tools", {
   search: search23
 });
@@ -1273,7 +1247,7 @@ var { getTools, getTool, searchTools, makeSearchTools } = crud("tools", {
 // src/reducers/entities.ts
 init_define_import_meta();
 import { makeReducer } from "@lls/utils";
-import _23 from "lodash/fp.js";
+import _14 from "lodash/fp.js";
 
 // src/actions/index.ts
 init_define_import_meta();
@@ -1296,16 +1270,16 @@ var resetAuth = makeActionCreator(actionTypes.RESET_AUTH);
 // src/reducers/entities.ts
 var deleteEntityReducer = (state, payload) => {
   const { path } = payload;
-  return _23.omit(path, state);
+  return _14.omit(path, state);
 };
 var updateEntityReducer = (state, payload) => {
   const { path, entity } = payload;
-  const currentEntity = _23.get(path, state);
-  return _23.set(path, _23.merge(currentEntity, entity), state);
+  const currentEntity = _14.get(path, state);
+  return _14.set(path, _14.merge(currentEntity, entity), state);
 };
 var setEntityReducer = (state, payload) => {
   const { path, entity } = payload;
-  return _23.set(path, entity, state);
+  return _14.set(path, entity, state);
 };
 var setEntitiesReducer = (state, payload) => {
   if (typeof payload !== "object") return state;
@@ -1326,7 +1300,7 @@ var setEntitiesReducer = (state, payload) => {
         }
         const diff = Object.keys(entity).some((prop) => {
           const value = entity[prop];
-          if (!_23.isEqual(state[entityName]?.[id]?.[prop], value)) {
+          if (!_14.isEqual(state[entityName]?.[id]?.[prop], value)) {
             return true;
           }
         });
@@ -1358,7 +1332,7 @@ var entities_default = entities;
 // src/reducers/auth.ts
 init_define_import_meta();
 import { makeReducer as makeReducer2 } from "@lls/utils";
-import _24 from "lodash/fp.js";
+import _15 from "lodash/fp.js";
 var initialState = {
   id: void 0,
   role: null,
@@ -1371,15 +1345,15 @@ var initialState = {
   llsUserId: null
 };
 var auth = makeReducer2(initialState, {
-  [actionTypes.SET_AUTH]: _24.assign,
-  [actionTypes.RESET_AUTH]: _24.constant(initialState)
+  [actionTypes.SET_AUTH]: _15.assign,
+  [actionTypes.RESET_AUTH]: _15.constant(initialState)
 });
 var auth_default = auth;
 
 // src/schema/index.ts
 init_define_import_meta();
 var import_normalizr = __toESM(require_normalizr(), 1);
-import _25 from "lodash/fp.js";
+import _16 from "lodash/fp.js";
 var document = new import_normalizr.schema.Entity("documents", {}, { idAttribute: "resourceId" });
 var subject = new import_normalizr.schema.Entity("subjects");
 var level = new import_normalizr.schema.Entity("levels");
@@ -1570,7 +1544,7 @@ var querySchema = {
     }
   }
 };
-var normalizeData = _25.flow((data) => (0, import_normalizr.normalize)(data, querySchema));
+var normalizeData = _16.flow((data) => (0, import_normalizr.normalize)(data, querySchema));
 export {
   auth_default as authReducer,
   entities_default as entitiesReducer,

package/package.json

@@ -2,7 +2,7 @@
   "name": "@lls/store",
   "description": "model de donnée et selecteurs",
   "homepage": "https://github.com/lelivrescolaire/monorepo/tree/dev/libs/store",
-  "version": "24.1.59-8b07e64c",
+  "version": "24.1.59-8e1a3cff",
   "type": "module",
   "types": "./lib/builttypes/store/src/index.d.ts",
   "exports": {
@@ -28,21 +28,21 @@
     "react": "*"
   },
   "devDependencies": {
-    "@biomejs/biome": "1.8.4-nightly.7aaf0ce",
-    "@types/lodash": "4.17.6",
-    "@types/node": "20.14.10",
-    "@types/react": "18.3.3",
+    "@biomejs/biome": "1.9.1",
+    "@types/lodash": "4.17.7",
+    "@types/node": "22.5.5",
+    "@types/react": "18.3.6",
     "@vitejs/plugin-react-swc": "3.7.0",
-    "esbuild": "0.23.0",
+    "esbuild": "0.23.1",
     "lodash": "4.17.21",
     "react": "18.3.1",
     "reselect": "4.1.8",
-    "typescript": "5.5.4",
-    "vite": "5.3.3",
+    "typescript": "5.6.2",
+    "vite": "5.4.6",
     "vite-tsconfig-paths": "4.3.2",
-    "vitest": "2.0.0",
-    "@lls/utils": "24.1.59-8b07e64c",
-    "@lls/vitescripts": "24.1.59-8b07e64c"
+    "vitest": "2.1.1",
+    "@lls/utils": "24.1.59-8e1a3cff",
+    "@lls/vitescripts": "24.1.59-8e1a3cff"
   },
   "license": "ISC",
   "dependencies": {