@mindful-web/marko-web-search 1.59.2 → 1.68.0

package/components/build-href.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@mindful-web/marko-web-search$1.59.2/components/build-href.marko",
+    marko_componentType = "/@mindful-web/marko-web-search$1.68.0/components/build-href.marko",
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_defaultValue = require("@mindful-web/marko-core/utils/default-value"),
     defaultValue = module_defaultValue.default || module_defaultValue,
@@ -42,5 +42,5 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-search$1.59.2/components/build-href.marko"
+    id: "/@mindful-web/marko-web-search$1.68.0/components/build-href.marko"
   };

package/components/filters/content-types.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@mindful-web/marko-web-search$1.59.2/components/filters/content-types.marko",
+    marko_componentType = "/@mindful-web/marko-web-search$1.68.0/components/filters/content-types.marko",
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_defaultValue = require("@mindful-web/marko-core/utils/default-value"),
     defaultValue = module_defaultValue.default || module_defaultValue,
@@ -35,7 +35,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-search$1.59.2/components/filters/content-types.marko",
+    id: "/@mindful-web/marko-web-search$1.68.0/components/filters/content-types.marko",
     tags: [
       "./filter-block.marko"
     ]

package/components/filters/filter-block.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@mindful-web/marko-web-search$1.59.2/components/filters/filter-block.marko",
+    marko_componentType = "/@mindful-web/marko-web-search$1.68.0/components/filters/filter-block.marko",
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_objectPath_module = require("@mindful-web/object-path"),
     objectPath_module = module_objectPath_module.default || module_objectPath_module,
@@ -141,7 +141,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-search$1.59.2/components/filters/filter-block.marko",
+    id: "/@mindful-web/marko-web-search$1.68.0/components/filters/filter-block.marko",
     tags: [
       "@mindful-web/marko-web/components/browser-component.marko",
       "../links/set-filter-value.marko",

package/components/filters/filter-container.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@mindful-web/marko-web-search$1.59.2/components/filters/filter-container.marko",
+    marko_componentType = "/@mindful-web/marko-web-search$1.68.0/components/filters/filter-container.marko",
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_objectPath_module = require("@mindful-web/object-path"),
     objectPath_module = module_objectPath_module.default || module_objectPath_module,
@@ -76,7 +76,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-search$1.59.2/components/filters/filter-container.marko",
+    id: "/@mindful-web/marko-web-search$1.68.0/components/filters/filter-container.marko",
     tags: [
       "@mindful-web/marko-web/components/browser-component.marko",
       "@mindful-web/marko-web/components/element/index.marko",

package/components/filters/selected/index.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@mindful-web/marko-web-search$1.59.2/components/filters/selected/index.marko",
+    marko_componentType = "/@mindful-web/marko-web-search$1.68.0/components/filters/selected/index.marko",
     marko_component = require("./index.marko"),
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_defaultValue = require("@mindful-web/marko-core/utils/default-value"),
@@ -105,7 +105,7 @@ marko_template._ = marko_renderer(render, {
   }, marko_component);
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-search$1.59.2/components/filters/selected/index.marko",
+    id: "/@mindful-web/marko-web-search$1.68.0/components/filters/selected/index.marko",
     component: "./index.marko",
     tags: [
       "./item.marko",

package/components/filters/selected/item.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@mindful-web/marko-web-search$1.59.2/components/filters/selected/item.marko",
+    marko_componentType = "/@mindful-web/marko-web-search$1.68.0/components/filters/selected/item.marko",
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_objectPath_module = require("@mindful-web/object-path"),
     objectPath_module = module_objectPath_module.default || module_objectPath_module,
@@ -91,7 +91,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-search$1.59.2/components/filters/selected/item.marko",
+    id: "/@mindful-web/marko-web-search$1.68.0/components/filters/selected/item.marko",
     tags: [
       "@mindful-web/marko-web/components/element/index.marko",
       "@mindful-web/marko-web-icons/components/icon.marko",

package/components/filters/website-sections-by-alias.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@mindful-web/marko-web-search$1.59.2/components/filters/website-sections-by-alias.marko",
+    marko_componentType = "/@mindful-web/marko-web-search$1.68.0/components/filters/website-sections-by-alias.marko",
     marko_component = require("./website-sections-by-alias.marko"),
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_defaultValue = require("@mindful-web/marko-core/utils/default-value"),
@@ -130,7 +130,7 @@ marko_template._ = marko_renderer(render, {
   }, marko_component);
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-search$1.59.2/components/filters/website-sections-by-alias.marko",
+    id: "/@mindful-web/marko-web-search$1.68.0/components/filters/website-sections-by-alias.marko",
     component: "./website-sections-by-alias.marko",
     tags: [
       "../links/set-filter-value.marko",

package/components/filters/website-sections.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@mindful-web/marko-web-search$1.59.2/components/filters/website-sections.marko",
+    marko_componentType = "/@mindful-web/marko-web-search$1.68.0/components/filters/website-sections.marko",
     marko_component = require("./website-sections.marko"),
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_defaultValue = require("@mindful-web/marko-core/utils/default-value"),
@@ -114,7 +114,7 @@ marko_template._ = marko_renderer(render, {
   }, marko_component);
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-search$1.59.2/components/filters/website-sections.marko",
+    id: "/@mindful-web/marko-web-search$1.68.0/components/filters/website-sections.marko",
     component: "./website-sections.marko",
     tags: [
       "../links/set-filter-value.marko",

package/components/form/index.marko

@@ -6,10 +6,8 @@ $ const blockName = "marko-web-search-form";
 $ const { req, $markoWebSearch: search } = out.global;
 $ const path = defaultValue(input.path, req.path);
 $ const params = search.buildURLSearchParams({
-  ...(search.config.useMindful && {
-    cursorDirection: 'AFTER',
-    cursorValue: '',
-  }),
+  cursorDirection: 'AFTER',
+  cursorValue: '',
   page: 1,
 }, { searchQuery: true });
 

package/components/form/index.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@mindful-web/marko-web-search$1.59.2/components/form/index.marko",
+    marko_componentType = "/@mindful-web/marko-web-search$1.68.0/components/form/index.marko",
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_objectPath_module = require("@mindful-web/object-path"),
     objectPath_module = module_objectPath_module.default || module_objectPath_module,
@@ -30,10 +30,8 @@ function render(input, out, __component, component, state) {
   const path = defaultValue(input.path, req.path);
 
   const params = search.buildURLSearchParams({
-  ...(search.config.useMindful && {
-    cursorDirection: 'AFTER',
-    cursorValue: '',
-  }),
+  cursorDirection: 'AFTER',
+  cursorValue: '',
   page: 1,
 }, { searchQuery: true });
 
@@ -78,7 +76,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-search$1.59.2/components/form/index.marko",
+    id: "/@mindful-web/marko-web-search$1.68.0/components/form/index.marko",
     tags: [
       "@mindful-web/marko-web/components/element/block.marko"
     ]

package/components/form/input.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@mindful-web/marko-web-search$1.59.2/components/form/input.marko",
+    marko_componentType = "/@mindful-web/marko-web-search$1.68.0/components/form/input.marko",
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     marko_mergeAttrs = require("marko/dist/runtime/html/helpers/merge-attrs");
 
@@ -26,5 +26,5 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-search$1.59.2/components/form/input.marko"
+    id: "/@mindful-web/marko-web-search$1.68.0/components/form/input.marko"
   };

package/components/links/link.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@mindful-web/marko-web-search$1.59.2/components/links/link.marko",
+    marko_componentType = "/@mindful-web/marko-web-search$1.68.0/components/links/link.marko",
     marko_component = require("./link.marko"),
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     marko_dynamicTag = require("marko/dist/runtime/helpers/dynamic-tag"),
@@ -38,7 +38,7 @@ marko_template._ = marko_renderer(render, {
   }, marko_component);
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-search$1.59.2/components/links/link.marko",
+    id: "/@mindful-web/marko-web-search$1.68.0/components/links/link.marko",
     component: "./link.marko",
     tags: [
       "@mindful-web/marko-web/components/element/link.marko",

package/components/links/next-page.marko

@@ -2,22 +2,17 @@ import { isFunction } from '@mindful-web/utils';
 import defaultValue from "@mindful-web/marko-core/utils/default-value";
 
 $ const { $markoWebSearch: search, i18n } = out.global;
-$ const { useMindful } = search.config;
 $ const pageInfo = defaultValue(input.pageInfo, {});
 $ const { sortField, sortOrder } = search.input;
 
-$ const queryValues = useMindful ? {
+$ const queryValues = {
   cursorDirection: 'AFTER',
   cursorValue: pageInfo.endCursor,
-  sortField, sortOrder,
-} : {
-  page: search.getNextPage(input.totalCount), sortField, sortOrder
+  sortField,
+  sortOrder,
 };
 
-$ const hasNextPage = useMindful ? pageInfo.hasNextPage : search.getNextPage(input.totalCount);
-
-
-<if(hasNextPage)>
+<if(pageInfo.hasNextPage)>
   <marko-web-search-link
     path=input.path
     query-values=queryValues

package/components/links/next-page.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@mindful-web/marko-web-search$1.59.2/components/links/next-page.marko",
+    marko_componentType = "/@mindful-web/marko-web-search$1.68.0/components/links/next-page.marko",
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_utils_module = require("@mindful-web/utils"),
     utils_module = module_utils_module.default || module_utils_module,
@@ -21,23 +21,18 @@ function render(input, out, __component, component, state) {
 
   const { $markoWebSearch: search, i18n } = out.global;
 
-  const { useMindful } = search.config;
-
   const pageInfo = defaultValue(input.pageInfo, {});
 
   const { sortField, sortOrder } = search.input;
 
-  const queryValues = useMindful ? {
+  const queryValues = {
   cursorDirection: 'AFTER',
   cursorValue: pageInfo.endCursor,
-  sortField, sortOrder,
-} : {
-  page: search.getNextPage(input.totalCount), sortField, sortOrder
+  sortField,
+  sortOrder,
 };
 
-  const hasNextPage = useMindful ? pageInfo.hasNextPage : search.getNextPage(input.totalCount);
-
-  if (hasNextPage) {
+  if (pageInfo.hasNextPage) {
     marko_web_search_link_tag({
         path: input.path,
         queryValues: queryValues,
@@ -62,7 +57,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-search$1.59.2/components/links/next-page.marko",
+    id: "/@mindful-web/marko-web-search$1.68.0/components/links/next-page.marko",
     tags: [
       "./link.marko"
     ]

package/components/links/previous-page.marko

@@ -2,22 +2,17 @@ import { isFunction } from '@mindful-web/utils';
 import defaultValue from "@mindful-web/marko-core/utils/default-value";
 
 $ const { $markoWebSearch: search, i18n } = out.global;
-$ const { useMindful } = search.config;
 $ const pageInfo = defaultValue(input.pageInfo, {});
 $ const { sortField, sortOrder } = search.input;
 
-$ const queryValues = useMindful ? {
+$ const queryValues = {
   cursorDirection: 'BEFORE',
   cursorValue: pageInfo.startCursor,
-  sortField, sortOrder,
-} : {
-  page: search.getPrevPage(), sortField, sortOrder
+  sortField,
+  sortOrder,
 };
 
-$ const hasPreviousPage = useMindful ? pageInfo.hasPreviousPage : search.getPrevPage();
-
-
-<if(hasPreviousPage)>
+<if(pageInfo.hasPreviousPage)>
   <marko-web-search-link
     path=input.path
     query-values=queryValues

package/components/links/previous-page.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@mindful-web/marko-web-search$1.59.2/components/links/previous-page.marko",
+    marko_componentType = "/@mindful-web/marko-web-search$1.68.0/components/links/previous-page.marko",
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_utils_module = require("@mindful-web/utils"),
     utils_module = module_utils_module.default || module_utils_module,
@@ -21,23 +21,18 @@ function render(input, out, __component, component, state) {
 
   const { $markoWebSearch: search, i18n } = out.global;
 
-  const { useMindful } = search.config;
-
   const pageInfo = defaultValue(input.pageInfo, {});
 
   const { sortField, sortOrder } = search.input;
 
-  const queryValues = useMindful ? {
+  const queryValues = {
   cursorDirection: 'BEFORE',
   cursorValue: pageInfo.startCursor,
-  sortField, sortOrder,
-} : {
-  page: search.getPrevPage(), sortField, sortOrder
+  sortField,
+  sortOrder,
 };
 
-  const hasPreviousPage = useMindful ? pageInfo.hasPreviousPage : search.getPrevPage();
-
-  if (hasPreviousPage) {
+  if (pageInfo.hasPreviousPage) {
     marko_web_search_link_tag({
         path: input.path,
         queryValues: queryValues,
@@ -62,7 +57,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-search$1.59.2/components/links/previous-page.marko",
+    id: "/@mindful-web/marko-web-search$1.68.0/components/links/previous-page.marko",
     tags: [
       "./link.marko"
     ]

package/components/links/reset-filter.marko

@@ -8,11 +8,9 @@ $ const isDefaultValue = search.isDefaultInputValueFor(name);
 $ const queryValues = {
   [name]: null,
   ...(resetPage && {
+    cursorDirection: 'AFTER',
+    cursorValue: '',
     page: 1,
-    ...(search.config.useMindful && {
-      cursorDirection: 'AFTER',
-      cursorValue: '',
-    }),
   }),
 };
 

package/components/links/reset-filter.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@mindful-web/marko-web-search$1.59.2/components/links/reset-filter.marko",
+    marko_componentType = "/@mindful-web/marko-web-search$1.68.0/components/links/reset-filter.marko",
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_defaultValue = require("@mindful-web/marko-core/utils/default-value"),
     defaultValue = module_defaultValue.default || module_defaultValue,
@@ -25,11 +25,9 @@ function render(input, out, __component, component, state) {
   const queryValues = {
   [name]: null,
   ...(resetPage && {
+    cursorDirection: 'AFTER',
+    cursorValue: '',
     page: 1,
-    ...(search.config.useMindful && {
-      cursorDirection: 'AFTER',
-      cursorValue: '',
-    }),
   }),
 };
 
@@ -54,7 +52,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-search$1.59.2/components/links/reset-filter.marko",
+    id: "/@mindful-web/marko-web-search$1.68.0/components/links/reset-filter.marko",
     tags: [
       "./link.marko"
     ]

package/components/links/set-filter-value.marko

@@ -10,11 +10,9 @@ $ const resetPage = defaultValue(input.resetPage, true);
 $ const queryValues = {
   [name]: v,
   ...(resetPage && {
+    cursorDirection: 'AFTER',
+    cursorValue: '',
     page: 1,
-    ...(search.config.useMindful && {
-      cursorDirection: 'AFTER',
-      cursorValue: '',
-    }),
   }),
 };
 $ const resetValues = {

package/components/links/set-filter-value.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@mindful-web/marko-web-search$1.59.2/components/links/set-filter-value.marko",
+    marko_componentType = "/@mindful-web/marko-web-search$1.68.0/components/links/set-filter-value.marko",
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_defaultValue = require("@mindful-web/marko-core/utils/default-value"),
     defaultValue = module_defaultValue.default || module_defaultValue,
@@ -29,11 +29,9 @@ function render(input, out, __component, component, state) {
   const queryValues = {
   [name]: v,
   ...(resetPage && {
+    cursorDirection: 'AFTER',
+    cursorValue: '',
     page: 1,
-    ...(search.config.useMindful && {
-      cursorDirection: 'AFTER',
-      cursorValue: '',
-    }),
   }),
 };
 
@@ -85,7 +83,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-search$1.59.2/components/links/set-filter-value.marko",
+    id: "/@mindful-web/marko-web-search$1.68.0/components/links/set-filter-value.marko",
     tags: [
       "./link.marko"
     ]

package/components/pagination-controls.marko

@@ -3,16 +3,12 @@ import { get } from "@mindful-web/object-path";
 import { isFunction } from '@mindful-web/utils';
 
 $ const { $markoWebSearch: search, i18n } = out.global;
-$ const { useMindful } = search.config;
 $ const totalCount = defaultValue(input.totalCount, 0);
 $ const pageInfo = defaultValue(input.pageInfo, {});
 $ const linkClasses = get(input.link, "class");
 
 $ const blockName = "marko-web-search-pagination-controls";
-$ const showControls = (() => {
-  if (useMindful) return true;
-  return Boolean(totalCount);
-})();
+$ const showControls = Boolean(pageInfo.hasNextPage || pageInfo.hasPreviousPage || totalCount);
 
 <if(showControls)>
   <marko-web-block ...input.block name=blockName>
@@ -23,23 +19,10 @@ $ const showControls = (() => {
     />
 
     <marko-web-element block-name=blockName name="pages">
-      <if(!useMindful)>
-        <!-- only display page counts when _not_ using mindful cursor pagination -->
+      <if(input.renderBody)>
         $ const currentPage = search.getCurrentPage(pageInfo);
         $ const totalPages = search.getTotalPages(totalCount, pageInfo);
-        <if(input.renderBody)>
-          <!-- custom rendering -->
-          <${input.renderBody} current-page=currentPage total-pages=totalPages />
-        </if>
-        <else>
-          <!-- default rendering -->
-          <if(isFunction(i18n))>
-            ${i18n("Page")} ${currentPage} ${i18n("of")} ${totalPages}
-          </if>
-          <else>
-            Page ${currentPage} of ${totalPages}
-          </else>
-        </else>
+        <${input.renderBody} current-page=currentPage total-pages=totalPages />
       </if>
     </marko-web-element>
 

package/components/pagination-controls.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@mindful-web/marko-web-search$1.59.2/components/pagination-controls.marko",
+    marko_componentType = "/@mindful-web/marko-web-search$1.68.0/components/pagination-controls.marko",
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_defaultValue = require("@mindful-web/marko-core/utils/default-value"),
     defaultValue = module_defaultValue.default || module_defaultValue,
@@ -17,8 +17,6 @@ var marko_template = module.exports = require("marko/dist/html").t(__filename),
     marko_loadTag = require("marko/dist/runtime/helpers/load-tag"),
     marko_web_search_previous_page_link_tag = marko_loadTag(marko_web_search_previous_page_link_template),
     marko_dynamicTag = require("marko/dist/runtime/helpers/dynamic-tag"),
-    helpers_escape_xml = require("marko/dist/runtime/html/helpers/escape-xml"),
-    marko_escapeXml = helpers_escape_xml.x,
     marko_web_element_template = require("@mindful-web/marko-web/components/element/index.marko"),
     marko_web_element_tag = marko_loadTag(marko_web_element_template),
     marko_web_search_next_page_link_template = require("./links/next-page.marko"),
@@ -31,8 +29,6 @@ function render(input, out, __component, component, state) {
 
   const { $markoWebSearch: search, i18n } = out.global;
 
-  const { useMindful } = search.config;
-
   const totalCount = defaultValue(input.totalCount, 0);
 
   const pageInfo = defaultValue(input.pageInfo, {});
@@ -41,10 +37,7 @@ function render(input, out, __component, component, state) {
 
   const blockName = "marko-web-search-pagination-controls";
 
-  const showControls = (() => {
-  if (useMindful) return true;
-  return Boolean(totalCount);
-})();
+  const showControls = Boolean(pageInfo.hasNextPage || pageInfo.hasPreviousPage || totalCount);
 
   if (showControls) {
     marko_web_block_tag(marko_assign({
@@ -63,34 +56,17 @@ function render(input, out, __component, component, state) {
               tag: "div",
               blockName: blockName,
               renderBody: function(out) {
-                if (!useMindful) {
+                if (input.renderBody) {
                   const currentPage = search.getCurrentPage(pageInfo);
 
                   const totalPages = search.getTotalPages(totalCount, pageInfo);
 
-                  if (input.renderBody) {
-                    marko_dynamicTag(out, input.renderBody, function() {
-                      return {
-                          "current-page": currentPage,
-                          "total-pages": totalPages
-                        };
-                    }, null, null, null, __component, "3");
-                  } else {
-                    if (isFunction(i18n)) {
-                      out.w(marko_escapeXml(i18n("Page")) +
-                        " " +
-                        marko_escapeXml(currentPage) +
-                        " " +
-                        marko_escapeXml(i18n("of")) +
-                        " " +
-                        marko_escapeXml(totalPages));
-                    } else {
-                      out.w("Page " +
-                        marko_escapeXml(currentPage) +
-                        " of " +
-                        marko_escapeXml(totalPages));
-                    }
-                  }
+                  marko_dynamicTag(out, input.renderBody, function() {
+                    return {
+                        "current-page": currentPage,
+                        "total-pages": totalPages
+                      };
+                  }, null, null, null, __component, "3");
                 }
               }
             }, out, __component, "2");
@@ -111,7 +87,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-search$1.59.2/components/pagination-controls.marko",
+    id: "/@mindful-web/marko-web-search$1.68.0/components/pagination-controls.marko",
     tags: [
       "./links/previous-page.marko",
       "@mindful-web/marko-web/components/element/index.marko",

package/components/query-child-sections.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@mindful-web/marko-web-search$1.59.2/components/query-child-sections.marko",
+    marko_componentType = "/@mindful-web/marko-web-search$1.68.0/components/query-child-sections.marko",
     marko_component = require("./query-child-sections.marko"),
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_gql = require("graphql-tag"),
@@ -52,7 +52,7 @@ marko_template._ = marko_renderer(render, {
   }, marko_component);
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-search$1.59.2/components/query-child-sections.marko",
+    id: "/@mindful-web/marko-web-search$1.68.0/components/query-child-sections.marko",
     component: "./query-child-sections.marko",
     tags: [
       "@mindful-web/marko-core/components/queries/website-sections.marko"

package/components/query.marko

@@ -1,7 +1,4 @@
-import loader from "../loaders/search";
-
 $ const {
-  $baseBrowse: apolloBaseBrowse,
   $markoWebSearch,
   apollo: apolloMindfulWebCMS,
   config,
@@ -24,22 +21,13 @@ $ const common = {
   sortOrder: input.sortOrder,
 };
 
-$ const runQuery = () => {
-  if ($markoWebSearch.config.useMindful && $markoWebSearch.config.mindful) {
-    return $markoWebSearch.config.mindful.searchPostsAsContentUsingLegacyParams({
-      ...common,
-      apolloMindfulWebCMS,
-      cursorDirection: input.cursorDirection,
-      cursorValue: input.cursorValue,
-    });
-  }
-  return loader({ apolloMindfulWebCMS, apolloBaseBrowse }, {
-    ...common, skip: input.skip, countryCodes: input.countryCodes
-  });
-};
+$ const runQuery = () => $markoWebSearch.config.mindful.searchPostsAsContentUsingLegacyParams({
+  ...common,
+  apolloMindfulWebCMS,
+  cursorDirection: input.cursorDirection,
+  cursorValue: input.cursorValue,
+});
 
 <marko-web-resolve|{ resolved }| promise=runQuery()>
   <${input.renderBody} ...resolved />
 </marko-web-resolve>
-
-

package/components/query.marko.js

@@ -2,11 +2,9 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@mindful-web/marko-web-search$1.59.2/components/query.marko",
+    marko_componentType = "/@mindful-web/marko-web-search$1.68.0/components/query.marko",
     marko_component = require("./query.marko"),
     marko_renderer = require("marko/dist/runtime/components/renderer"),
-    module_loader = require("../loaders/search"),
-    loader = module_loader.default || module_loader,
     marko_dynamicTag = require("marko/dist/runtime/helpers/dynamic-tag"),
     marko_web_resolve_template = require("@mindful-web/marko-core/components/resolve.marko"),
     marko_loadTag = require("marko/dist/runtime/helpers/load-tag"),
@@ -16,7 +14,6 @@ function render(input, out, __component, component, state) {
   var data = input;
 
   const {
-  $baseBrowse: apolloBaseBrowse,
   $markoWebSearch,
   apollo: apolloMindfulWebCMS,
   config,
@@ -40,19 +37,12 @@ function render(input, out, __component, component, state) {
   sortOrder: input.sortOrder,
 };
 
-  const runQuery = () => {
-  if ($markoWebSearch.config.useMindful && $markoWebSearch.config.mindful) {
-    return $markoWebSearch.config.mindful.searchPostsAsContentUsingLegacyParams({
-      ...common,
-      apolloMindfulWebCMS,
-      cursorDirection: input.cursorDirection,
-      cursorValue: input.cursorValue,
-    });
-  }
-  return loader({ apolloMindfulWebCMS, apolloBaseBrowse }, {
-    ...common, skip: input.skip, countryCodes: input.countryCodes
-  });
-};
+  const runQuery = () => $markoWebSearch.config.mindful.searchPostsAsContentUsingLegacyParams({
+  ...common,
+  apolloMindfulWebCMS,
+  cursorDirection: input.cursorDirection,
+  cursorValue: input.cursorValue,
+});
 
   marko_web_resolve_tag({
       promise: runQuery(),
@@ -69,7 +59,7 @@ marko_template._ = marko_renderer(render, {
   }, marko_component);
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-search$1.59.2/components/query.marko",
+    id: "/@mindful-web/marko-web-search$1.68.0/components/query.marko",
     component: "./query.marko",
     tags: [
       "@mindful-web/marko-core/components/resolve.marko"

package/components/sort-by/index.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@mindful-web/marko-web-search$1.59.2/components/sort-by/index.marko",
+    marko_componentType = "/@mindful-web/marko-web-search$1.68.0/components/sort-by/index.marko",
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_objectPath_module = require("@mindful-web/object-path"),
     objectPath_module = module_objectPath_module.default || module_objectPath_module,
@@ -64,7 +64,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-search$1.59.2/components/sort-by/index.marko",
+    id: "/@mindful-web/marko-web-search$1.68.0/components/sort-by/index.marko",
     tags: [
       "@mindful-web/marko-web/components/browser-component.marko",
       "@mindful-web/marko-web/components/element/block.marko"

package/config/index.js

@@ -19,7 +19,6 @@ class MarkoWebSearchConfig {
       mindful,
       resultsPerPage,
       rootAlias,
-      useMindful,
     } = validate(Joi.object({
       resultsPerPage: Joi.object({
         min: Joi.number().integer().default(1),
@@ -62,10 +61,9 @@ class MarkoWebSearchConfig {
 
     this.assignedToWebsiteSectionIds = assignedToWebsiteSectionIds;
 
-    if (useMindful && !mindful) {
-      throw new Error('In order to use native Mindful search, you must provided the Mindful service');
+    if (!mindful) {
+      throw new Error('In order to use Mindful search, you must provide the Mindful service');
     }
-    this.useMindful = useMindful;
     this.mindful = mindful;
 
     this.queryParams = new MarkoWebSearchQueryParamConfig({
@@ -88,8 +86,7 @@ class MarkoWebSearchConfig {
  * @prop {object[]} assignedToWebsiteSectionIds The allowed website section filters. Defaults to
  * none. Should be an array of section IDs, e.g. `[123, 321]`
  * @prop {string} rootAlias The root alias for the search page defaults to 'search'
- * @prop {import("@mindful-web/mindful/marko-web/service").MindfulMarkoWebService} [mindful]
- * @prop {boolean} [useMindful]
+ * @prop {import("@mindful-web/mindful/marko-web/service").MindfulMarkoWebService} mindful
  */
 
 module.exports = MarkoWebSearchConfig;

package/index.js

@@ -98,8 +98,8 @@ class MarkoWebSearch {
    * @param {PageInfo} [pageInfo]
    */
   getCurrentPage(pageInfo) {
-    if (this.config.useMindful && pageInfo) {
-      return 1;
+    if (pageInfo) {
+      return ((pageInfo.startingPosition - 1) / this.getLimit()) + 1;
     }
     return this.getInputValueFor('page');
   }
@@ -119,7 +119,7 @@ class MarkoWebSearch {
   getTotalPages(totalCount, pageInfo) {
     const total = totalCount || 0;
 
-    if (this.config.useMindful && pageInfo) {
+    if (pageInfo) {
       return Math.ceil(total / this.getLimit());
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mindful-web/marko-web-search",
-  "version": "1.59.2",
+  "version": "1.68.0",
   "author": "Jacob Bare <jacob@parameter1.com>",
   "repository": "https://github.com/parameter1/mindful-web/tree/main/packages/marko-web-search",
   "license": "MIT",
@@ -28,5 +28,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "d3eb26cabbb75a87ab1a49dea3d75f511bca6668"
+  "gitHead": "c7b9eeab22222e27f7513dfafaec97eac82b2c69"
 }

package/loaders/search.js

@@ -1,108 +0,0 @@
-const gql = require('graphql-tag');
-const { extractFragmentData } = require('@mindful-web/web-common/utils');
-
-const buildMindfulWebQuery = ({ queryFragment, opSuffix = '' } = {}) => {
-  const { spreadFragmentName, processedFragment } = extractFragmentData(queryFragment);
-  return gql`
-    query MarkoWebSearchContentIdsFromBrowse${opSuffix}($ids: [Int!]!, $limit: Int!) {
-      allContent(input: { ids: $ids, pagination: { limit: $limit } }) {
-        edges {
-          node {
-            id
-            ${spreadFragmentName}
-          }
-        }
-      }
-    }
-    ${processedFragment}
-  `;
-};
-
-const baseBrowseQuery = gql`
-  query MarkoWebSearchSearchContentIds($input: BrowseContentQueryInput!) {
-    searchContentIds(input: $input) {
-      totalCount
-      pageInfo {
-        hasNextPage
-        hasPreviousPage
-      }
-      ids
-    }
-  }
-`;
-
-/**
- * @param {object} clients
- * @param {ApolloClient} clients.apolloMindfulWebCMS The Mindful Web client that will perform the
- * query.
- * @param {ApolloClient} clients.apolloBaseBrowse The BaseBrowse client that will perform the query.
- * @param {object} params
- * @param {number} [params.limit]
- * @param {number} [params.skip]
- * @param {string} [params.sortField=PUBLISHED]
- * @param {string} [params.sortOrder=DESC]
- * @param {string} [params.searchQuery]
- * @param {string[]} [params.contentTypes]
- * @param {string[]} [params.countryCodes]
- * @param {string[]} [params.assignedToWebsiteSiteIds]
- * @param {number[]} [params.assignedToWebsiteSectionIds]
- * @param {string} [params.queryFragment] The `graphql-tag` fragment
- *                                        to apply to the `allContent` query.
- * @param {string} [params.opSuffix] A suffix to add to the GraphQL operation name.
- */
-module.exports = async ({ apolloMindfulWebCMS, apolloBaseBrowse } = {}, {
-  limit,
-  skip,
-
-  sortField = 'PUBLISHED',
-  sortOrder = 'DESC',
-
-  searchQuery,
-  contentTypes = [],
-  countryCodes = [],
-  assignedToWebsiteSiteIds = [],
-  assignedToWebsiteSectionIds = [],
-
-  queryFragment,
-  opSuffix,
-  searchType,
-} = {}) => {
-  if (!apolloMindfulWebCMS || !apolloBaseBrowse) throw new Error('Both the Mindful Web and Base Browse Apollo clients must be provided.');
-  const input = {
-    omitScheduledAndExpiredContent: true,
-    statuses: ['PUBLISHED'],
-    contentTypes,
-    countryCodes,
-    ...(searchQuery && { search: { query: searchQuery, type: searchType } }),
-    ...((assignedToWebsiteSiteIds.length || assignedToWebsiteSectionIds.length) && {
-      assignedToWebsites: {
-        ...(assignedToWebsiteSiteIds.length && { siteIds: assignedToWebsiteSiteIds }),
-        ...(assignedToWebsiteSectionIds.length && { sectionIds: assignedToWebsiteSectionIds }),
-      },
-    }),
-    pagination: { limit, skip },
-    sort: {
-      field: sortField,
-      order: sortOrder,
-    },
-  };
-
-  const { data: baseBrowseData } = await apolloBaseBrowse.query({
-    query: baseBrowseQuery,
-    variables: { input },
-  });
-
-  const { ids, pageInfo, totalCount } = baseBrowseData.searchContentIds;
-  if (!ids.length) return { nodes: [], pageInfo, totalCount };
-
-  const { data } = await apolloMindfulWebCMS.query({
-    query: buildMindfulWebQuery({ queryFragment, opSuffix }),
-    variables: { ids, limit: ids.length },
-  });
-  const nodes = data.allContent.edges
-    .map((edge) => (edge && edge.node ? edge.node : null))
-    .filter((c) => c);
-  const map = nodes.reduce((m, node) => m.set(`${node.id}`, node), new Map());
-  const ordered = ids.map((id) => map.get(`${id}`)).filter((node) => node);
-  return { nodes: ordered, pageInfo, totalCount };
-};