@mindful-web/marko-web-search 1.20.2 → 1.27.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.20.2/components/build-href.marko",
+    marko_componentType = "/@mindful-web/marko-web-search$1.27.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.20.2/components/build-href.marko"
+    id: "/@mindful-web/marko-web-search$1.27.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.20.2/components/filters/content-types.marko",
+    marko_componentType = "/@mindful-web/marko-web-search$1.27.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.20.2/components/filters/content-types.marko",
+    id: "/@mindful-web/marko-web-search$1.27.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.20.2/components/filters/filter-block.marko",
+    marko_componentType = "/@mindful-web/marko-web-search$1.27.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.20.2/components/filters/filter-block.marko",
+    id: "/@mindful-web/marko-web-search$1.27.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.20.2/components/filters/filter-container.marko",
+    marko_componentType = "/@mindful-web/marko-web-search$1.27.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.20.2/components/filters/filter-container.marko",
+    id: "/@mindful-web/marko-web-search$1.27.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.20.2/components/filters/selected/index.marko",
+    marko_componentType = "/@mindful-web/marko-web-search$1.27.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.20.2/components/filters/selected/index.marko",
+    id: "/@mindful-web/marko-web-search$1.27.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.20.2/components/filters/selected/item.marko",
+    marko_componentType = "/@mindful-web/marko-web-search$1.27.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.20.2/components/filters/selected/item.marko",
+    id: "/@mindful-web/marko-web-search$1.27.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.20.2/components/filters/website-sections-by-alias.marko",
+    marko_componentType = "/@mindful-web/marko-web-search$1.27.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.20.2/components/filters/website-sections-by-alias.marko",
+    id: "/@mindful-web/marko-web-search$1.27.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.20.2/components/filters/website-sections.marko",
+    marko_componentType = "/@mindful-web/marko-web-search$1.27.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.20.2/components/filters/website-sections.marko",
+    id: "/@mindful-web/marko-web-search$1.27.0/components/filters/website-sections.marko",
     component: "./website-sections.marko",
     tags: [
       "../links/set-filter-value.marko",

package/components/form/index.marko

@@ -5,7 +5,13 @@ import { cleanPath } from "@mindful-web/utils";
 $ const blockName = "marko-web-search-form";
 $ const { req, $markoWebSearch: search } = out.global;
 $ const path = defaultValue(input.path, req.path);
-$ const params = search.buildURLSearchParams({ page: 1 }, { searchQuery: true });
+$ const params = search.buildURLSearchParams({
+  ...(search.config.useMindful && {
+    cursorDirection: 'AFTER',
+    cursorValue: '',
+  }),
+  page: 1,
+}, { searchQuery: true });
 
 <marko-web-block ...input.block tag="form" name=blockName>
   <@attrs

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.20.2/components/form/index.marko",
+    marko_componentType = "/@mindful-web/marko-web-search$1.27.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,
@@ -29,7 +29,13 @@ function render(input, out, __component, component, state) {
 
   const path = defaultValue(input.path, req.path);
 
-  const params = search.buildURLSearchParams({ page: 1 }, { searchQuery: true });
+  const params = search.buildURLSearchParams({
+  ...(search.config.useMindful && {
+    cursorDirection: 'AFTER',
+    cursorValue: '',
+  }),
+  page: 1,
+}, { searchQuery: true });
 
   marko_web_block_tag(marko_assign({
       name: "block",
@@ -72,7 +78,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-search$1.20.2/components/form/index.marko",
+    id: "/@mindful-web/marko-web-search$1.27.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.20.2/components/form/input.marko",
+    marko_componentType = "/@mindful-web/marko-web-search$1.27.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.20.2/components/form/input.marko"
+    id: "/@mindful-web/marko-web-search$1.27.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.20.2/components/links/link.marko",
+    marko_componentType = "/@mindful-web/marko-web-search$1.27.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.20.2/components/links/link.marko",
+    id: "/@mindful-web/marko-web-search$1.27.0/components/links/link.marko",
     component: "./link.marko",
     tags: [
       "@mindful-web/marko-web/components/element/link.marko",

package/components/links/next-page.marko

@@ -1,15 +1,26 @@
 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 nextPage = search.getNextPage(input.totalCount);
+$ const queryValues = useMindful ? {
+  cursorDirection: 'AFTER',
+  cursorValue: pageInfo.endCursor,
+  sortField, sortOrder,
+} : {
+  page: search.getNextPage(input.totalCount), sortField, sortOrder
+};
+
+$ const hasNextPage = useMindful ? pageInfo.hasNextPage : search.getNextPage(input.totalCount);
 
-$ const { sortField, sortOrder } = search.input;
 
-<if(nextPage)>
+<if(hasNextPage)>
   <marko-web-search-link
     path=input.path
-    query-values={ page: nextPage, sortField, sortOrder }
+    query-values=queryValues
     class=input.class
     target=input.target
     rel=input.rel

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

@@ -2,11 +2,13 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@mindful-web/marko-web-search$1.20.2/components/links/next-page.marko",
+    marko_componentType = "/@mindful-web/marko-web-search$1.27.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,
     isFunction = module_utils_module.isFunction,
+    module_defaultValue = require("@mindful-web/marko-core/utils/default-value"),
+    defaultValue = module_defaultValue.default || module_defaultValue,
     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,
@@ -19,18 +21,26 @@ function render(input, out, __component, component, state) {
 
   const { $markoWebSearch: search, i18n } = out.global;
 
-  const nextPage = search.getNextPage(input.totalCount);
+  const { useMindful } = search.config;
+
+  const pageInfo = defaultValue(input.pageInfo, {});
 
   const { sortField, sortOrder } = search.input;
 
-  if (nextPage) {
+  const queryValues = useMindful ? {
+  cursorDirection: 'AFTER',
+  cursorValue: pageInfo.endCursor,
+  sortField, sortOrder,
+} : {
+  page: search.getNextPage(input.totalCount), sortField, sortOrder
+};
+
+  const hasNextPage = useMindful ? pageInfo.hasNextPage : search.getNextPage(input.totalCount);
+
+  if (hasNextPage) {
     marko_web_search_link_tag({
         path: input.path,
-        queryValues: {
-            page: nextPage,
-            sortField: sortField,
-            sortOrder: sortOrder
-          },
+        queryValues: queryValues,
         class: input.class,
         target: input.target,
         rel: input.rel,
@@ -52,7 +62,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-search$1.20.2/components/links/next-page.marko",
+    id: "/@mindful-web/marko-web-search$1.27.0/components/links/next-page.marko",
     tags: [
       "./link.marko"
     ]

package/components/links/previous-page.marko

@@ -1,15 +1,26 @@
 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 previousPage = search.getPrevPage();
+$ const queryValues = useMindful ? {
+  cursorDirection: 'BEFORE',
+  cursorValue: pageInfo.startCursor,
+  sortField, sortOrder,
+} : {
+  page: search.getPrevPage(), sortField, sortOrder
+};
+
+$ const hasPreviousPage = useMindful ? pageInfo.hasPreviousPage : search.getPrevPage();
 
-$ const { sortField, sortOrder } = search.input;
 
-<if(previousPage)>
+<if(hasPreviousPage)>
   <marko-web-search-link
     path=input.path
-    query-values={ page: previousPage, sortField, sortOrder }
+    query-values=queryValues
     class=input.class
     target=input.target
     rel=input.rel

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

@@ -2,11 +2,13 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@mindful-web/marko-web-search$1.20.2/components/links/previous-page.marko",
+    marko_componentType = "/@mindful-web/marko-web-search$1.27.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,
     isFunction = module_utils_module.isFunction,
+    module_defaultValue = require("@mindful-web/marko-core/utils/default-value"),
+    defaultValue = module_defaultValue.default || module_defaultValue,
     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,
@@ -19,18 +21,26 @@ function render(input, out, __component, component, state) {
 
   const { $markoWebSearch: search, i18n } = out.global;
 
-  const previousPage = search.getPrevPage();
+  const { useMindful } = search.config;
+
+  const pageInfo = defaultValue(input.pageInfo, {});
 
   const { sortField, sortOrder } = search.input;
 
-  if (previousPage) {
+  const queryValues = useMindful ? {
+  cursorDirection: 'BEFORE',
+  cursorValue: pageInfo.startCursor,
+  sortField, sortOrder,
+} : {
+  page: search.getPrevPage(), sortField, sortOrder
+};
+
+  const hasPreviousPage = useMindful ? pageInfo.hasPreviousPage : search.getPrevPage();
+
+  if (hasPreviousPage) {
     marko_web_search_link_tag({
         path: input.path,
-        queryValues: {
-            page: previousPage,
-            sortField: sortField,
-            sortOrder: sortOrder
-          },
+        queryValues: queryValues,
         class: input.class,
         target: input.target,
         rel: input.rel,
@@ -52,7 +62,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-search$1.20.2/components/links/previous-page.marko",
+    id: "/@mindful-web/marko-web-search$1.27.0/components/links/previous-page.marko",
     tags: [
       "./link.marko"
     ]

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.20.2/components/links/reset-filter.marko",
+    marko_componentType = "/@mindful-web/marko-web-search$1.27.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,
@@ -48,7 +48,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-search$1.20.2/components/links/reset-filter.marko",
+    id: "/@mindful-web/marko-web-search$1.27.0/components/links/reset-filter.marko",
     tags: [
       "./link.marko"
     ]

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.20.2/components/links/set-filter-value.marko",
+    marko_componentType = "/@mindful-web/marko-web-search$1.27.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,
@@ -79,7 +79,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-search$1.20.2/components/links/set-filter-value.marko",
+    id: "/@mindful-web/marko-web-search$1.27.0/components/links/set-filter-value.marko",
     tags: [
       "./link.marko"
     ]

package/components/marko.json

@@ -17,6 +17,7 @@
     "template": "./pagination-controls.marko",
     "<block>": {},
     "<link>": {},
+    "@page-info": "object",
     "@total-count": "number"
   },
   "<marko-web-search-query-child-sections>": {

package/components/pagination-controls.marko

@@ -4,6 +4,7 @@ import { isFunction } from '@mindful-web/utils';
 
 $ const { $markoWebSearch: search, i18n } = out.global;
 $ const totalCount = defaultValue(input.totalCount, 0);
+$ const pageInfo = defaultValue(input.pageInfo, {});
 $ const linkClasses = get(input.link, "class");
 
 $ const blockName = "marko-web-search-pagination-controls";
@@ -13,11 +14,12 @@ $ const blockName = "marko-web-search-pagination-controls";
     <marko-web-search-previous-page-link
       ...input.link
       class=`${linkClasses} ${blockName}__prev`
+      page-info=pageInfo
     />
 
     <marko-web-element block-name=blockName name="pages">
-      $ const currentPage = search.getCurrentPage();
-      $ const totalPages = search.getTotalPages(totalCount);
+      $ const currentPage = search.getCurrentPage(pageInfo);
+      $ const totalPages = search.getTotalPages(totalCount, pageInfo);
       <if(input.renderBody)>
         <!-- custom rendering -->
         <${input.renderBody} current-page=currentPage total-pages=totalPages />
@@ -36,6 +38,7 @@ $ const blockName = "marko-web-search-pagination-controls";
     <marko-web-search-next-page-link
       ...input.link
       class=`${linkClasses} ${blockName}__next`
+      page-info=pageInfo
       total-count=totalCount
     />
   </marko-web-block>

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.20.2/components/pagination-controls.marko",
+    marko_componentType = "/@mindful-web/marko-web-search$1.27.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,
@@ -33,6 +33,8 @@ function render(input, out, __component, component, state) {
 
   const totalCount = defaultValue(input.totalCount, 0);
 
+  const pageInfo = defaultValue(input.pageInfo, {});
+
   const linkClasses = get(input.link, "class");
 
   const blockName = "marko-web-search-pagination-controls";
@@ -45,7 +47,8 @@ function render(input, out, __component, component, state) {
         name: blockName,
         renderBody: function(out) {
           marko_web_search_previous_page_link_tag(marko_assign({}, input.link, {
-              class: ((linkClasses + " ") + blockName) + "__prev"
+              class: ((linkClasses + " ") + blockName) + "__prev",
+              pageInfo: pageInfo
             }), out, __component, "1");
 
           marko_web_element_tag({
@@ -53,9 +56,9 @@ function render(input, out, __component, component, state) {
               tag: "div",
               blockName: blockName,
               renderBody: function(out) {
-                const currentPage = search.getCurrentPage();
+                const currentPage = search.getCurrentPage(pageInfo);
 
-                const totalPages = search.getTotalPages(totalCount);
+                const totalPages = search.getTotalPages(totalCount, pageInfo);
 
                 if (input.renderBody) {
                   marko_dynamicTag(out, input.renderBody, function() {
@@ -85,6 +88,7 @@ function render(input, out, __component, component, state) {
 
           marko_web_search_next_page_link_tag(marko_assign({}, input.link, {
               class: ((linkClasses + " ") + blockName) + "__next",
+              pageInfo: pageInfo,
               totalCount: totalCount
             }), out, __component, "4");
         }
@@ -98,7 +102,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-search$1.20.2/components/pagination-controls.marko",
+    id: "/@mindful-web/marko-web-search$1.27.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.20.2/components/query-child-sections.marko",
+    marko_componentType = "/@mindful-web/marko-web-search$1.27.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.20.2/components/query-child-sections.marko",
+    id: "/@mindful-web/marko-web-search$1.27.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,30 +1,45 @@
 import loader from "../loaders/search";
 
 $ const {
-  apollo: apolloMindfulWebCMS,
   $baseBrowse: apolloBaseBrowse,
+  $markoWebSearch,
+  apollo: apolloMindfulWebCMS,
   config,
   site
 } = out.global;
 $ const { assignedToWebsiteSectionIds } = input;
 
-$ const params = {
-  limit: input.limit,
-  skip: input.skip,
-  searchQuery: input.searchQuery,
-  sortField: input.sortField,
-  sortOrder: input.sortOrder,
-  contentTypes: input.contentTypes,
-  countryCodes: input.countryCodes,
+$ const common = {
   ...(assignedToWebsiteSectionIds && assignedToWebsiteSectionIds.length
     ? { assignedToWebsiteSectionIds }
     : { assignedToWebsiteSiteIds: [config.website("id")] }
   ),
-  queryFragment: input.queryFragment,
+  contentTypes: input.contentTypes,
+  limit: input.limit,
   opSuffix: input.opSuffix,
+  queryFragment: input.queryFragment,
+  searchQuery: input.searchQuery,
   searchType: site.get('search.type'),
+  sortField: input.sortField,
+  sortOrder: input.sortOrder,
 };
 
-<marko-web-resolve|{ resolved }| promise=loader({ apolloMindfulWebCMS, apolloBaseBrowse }, params)>
+$ const runQuery = () => {
+  if ($markoWebSearch.config.useMindful) {
+    return $markoWebSearch.mindful.searchPostsAsContentUsingLegacyParams({
+      ...common,
+      apolloMindfulWebCMS,
+      cursorDirection: input.cursorDirection,
+      cursorValue: input.cursorValue,
+    });
+  }
+  return loader({ apolloMindfulWebCMS, apolloBaseBrowse }, {
+    ...common, skip: input.skip, countryCodes: input.countryCodes
+  });
+};
+
+<marko-web-resolve|{ resolved }| promise=runQuery()>
   <${input.renderBody} ...resolved />
 </marko-web-resolve>
+
+

package/components/query.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.20.2/components/query.marko",
+    marko_componentType = "/@mindful-web/marko-web-search$1.27.0/components/query.marko",
     marko_component = require("./query.marko"),
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_loader = require("../loaders/search"),
@@ -16,36 +16,46 @@ function render(input, out, __component, component, state) {
   var data = input;
 
   const {
-  apollo: apolloMindfulWebCMS,
   $baseBrowse: apolloBaseBrowse,
+  $markoWebSearch,
+  apollo: apolloMindfulWebCMS,
   config,
   site
 } = out.global;
 
   const { assignedToWebsiteSectionIds } = input;
 
-  const params = {
-  limit: input.limit,
-  skip: input.skip,
-  searchQuery: input.searchQuery,
-  sortField: input.sortField,
-  sortOrder: input.sortOrder,
-  contentTypes: input.contentTypes,
-  countryCodes: input.countryCodes,
+  const common = {
   ...(assignedToWebsiteSectionIds && assignedToWebsiteSectionIds.length
     ? { assignedToWebsiteSectionIds }
     : { assignedToWebsiteSiteIds: [config.website("id")] }
   ),
-  queryFragment: input.queryFragment,
+  contentTypes: input.contentTypes,
+  limit: input.limit,
   opSuffix: input.opSuffix,
+  queryFragment: input.queryFragment,
+  searchQuery: input.searchQuery,
   searchType: site.get('search.type'),
+  sortField: input.sortField,
+  sortOrder: input.sortOrder,
+};
+
+  const runQuery = () => {
+  if ($markoWebSearch.config.useMindful) {
+    return $markoWebSearch.mindful.searchPostsAsContentUsingLegacyParams({
+      ...common,
+      apolloMindfulWebCMS,
+      cursorDirection: input.cursorDirection,
+      cursorValue: input.cursorValue,
+    });
+  }
+  return loader({ apolloMindfulWebCMS, apolloBaseBrowse }, {
+    ...common, skip: input.skip, countryCodes: input.countryCodes
+  });
 };
 
   marko_web_resolve_tag({
-      promise: loader({
-          apolloMindfulWebCMS: apolloMindfulWebCMS,
-          apolloBaseBrowse: apolloBaseBrowse
-        }, params),
+      promise: runQuery(),
       renderBody: function(out, { resolved }) {
         marko_dynamicTag(out, input.renderBody, function() {
           return resolved;
@@ -59,7 +69,7 @@ marko_template._ = marko_renderer(render, {
   }, marko_component);
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-search$1.20.2/components/query.marko",
+    id: "/@mindful-web/marko-web-search$1.27.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.20.2/components/sort-by/index.marko",
+    marko_componentType = "/@mindful-web/marko-web-search$1.27.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.20.2/components/sort-by/index.marko",
+    id: "/@mindful-web/marko-web-search$1.27.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

@@ -8,31 +8,18 @@ const defaultContentTypes = getDefaultContentTypes();
 
 class MarkoWebSearchConfig {
   /**
-   *
-   * @param {object} params
-   *
-   * @param {object} [params.resultsPerPage=10] The results per page setting.
-   * @param {number} [params.resultsPerPage.min=1]
-   * @param {number} [params.resultsPerPage.max=100]
-   * @param {number} [params.resultsPerPage.default=20]
-   *
-   * @param {string[]} [params.contentTypes] The allowed content type filters. Defaults to all.
-   *                                         Should be provided as an array of classified content
-   *                                         type strings, e.g. ['Article', 'MediaGallery'] etc.
-   *
-   * @param {object[]} [params.assignedToWebsiteSectionIds] The allowed website section filters.
-   *                                                      Defaults to none. Should be an array of
-   *                                                      section IDs, e.g. [123, 321]
-   *
-   * @param {string} [params.rootAlias] The root alias for the search page defaults to 'search'
+   * @param {MarkoWebSearchConfigParams} params
    */
   constructor(params = {}) {
+    /** @type {MarkoWebSearchConfigParams} */
     const {
-      resultsPerPage,
-      contentTypes,
       assignedToWebsiteSectionIds,
+      contentTypes,
       defaultSortField,
+      mindful,
+      resultsPerPage,
       rootAlias,
+      useMindful,
     } = validate(Joi.object({
       resultsPerPage: Joi.object({
         min: Joi.number().integer().default(1),
@@ -55,6 +42,9 @@ class MarkoWebSearchConfig {
       defaultSortField: Joi.string().allow('NAME', 'PUBLISHED', 'SCORE').default('PUBLISHED'),
 
       rootAlias: Joi.string().default('search'),
+
+      useMindful: Joi.boolean(),
+      mindful: Joi.object(),
     }).default(), params);
 
     this.contentTypeObjects = contentTypes.sort().map((type) => (type.label ? ({
@@ -72,13 +62,34 @@ class MarkoWebSearchConfig {
 
     this.assignedToWebsiteSectionIds = assignedToWebsiteSectionIds;
 
+    if (useMindful && !mindful) {
+      throw new Error('In order to use native Mindful search, you must provided the Mindful service');
+    }
+    this.useMindful = useMindful;
+    this.mindful = mindful;
+
     this.queryParams = new MarkoWebSearchQueryParamConfig({
-      resultsPerPage,
       contentTypeIds: this.contentTypeObjects.map(({ id }) => id),
       defaultSortField,
+      resultsPerPage,
     });
     this.rootAlias = rootAlias;
   }
 }
 
+/**
+ * @typedef MarkoWebSearchConfigParams
+ * @prop {object} resultsPerPage The results per page setting.
+ * @prop {number} resultsPerPage.min
+ * @prop {number} resultsPerPage.max
+ * @prop {number} resultsPerPage.default
+ * @prop {string[]} contentTypes The allowed content type filters. Defaults to all.  Should be
+ * provided as an array of classified content type strings, e.g. `['Article', 'MediaGallery']` etc.
+ * @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]
+ */
+
 module.exports = MarkoWebSearchConfig;

package/config/query-params.js

@@ -24,9 +24,9 @@ const sortOrderSet = new Set(['DESC', 'ASC']);
 
 class MarkoWebSearchQueryParamConfig {
   constructor({
-    resultsPerPage = {},
     contentTypeIds = [],
     defaultSortField = 'PUBLISHED',
+    resultsPerPage = {},
   } = {}) {
     this.params = new Map();
 
@@ -36,11 +36,13 @@ class MarkoWebSearchQueryParamConfig {
     }, new Map());
 
     this
-      .add('limit', {
-        type: Number,
-        defaultValue: resultsPerPage.default,
-        validator: (v) => (v >= resultsPerPage.min && v <= resultsPerPage.max),
-        toInput: (v) => parseInt(v, 10),
+      .add('cursorValue', {
+        type: String,
+        defaultValue: '',
+      }).add('cursorDirection', {
+        type: String,
+        defaultValue: 'AFTER',
+        validator: (v) => v === 'AFTER' || v === 'BEFORE',
       })
       .add('page', {
         type: Number,
@@ -52,6 +54,12 @@ class MarkoWebSearchQueryParamConfig {
         },
         toInput: (v) => parseInt(v, 10),
       })
+      .add('limit', {
+        type: Number,
+        defaultValue: resultsPerPage.default,
+        validator: (v) => (v >= resultsPerPage.min && v <= resultsPerPage.max),
+        toInput: (v) => parseInt(v, 10),
+      })
       .add('searchQuery', {
         type: String,
         defaultValue: '',

package/index.js

@@ -1,4 +1,9 @@
 class MarkoWebSearch {
+  /**
+   * @param {object} params
+   * @param {import("./config")} params.config
+   * @param {Record<string, any>} params.query The Express request query object.
+   */
   constructor({ config, query = {} } = {}) {
     this.config = config;
     this.query = query;
@@ -81,7 +86,21 @@ class MarkoWebSearch {
     return this.config.queryParams.names();
   }
 
-  getCurrentPage() {
+  getCursorDirection() {
+    return this.getInputValueFor('cursorDirection');
+  }
+
+  getCursorValue() {
+    return this.getInputValueFor('cursorValue');
+  }
+
+  /**
+   * @param {PageInfo} [pageInfo]
+   */
+  getCurrentPage(pageInfo) {
+    if (this.config.useMindful && pageInfo) {
+      return ((pageInfo.startingPosition - 1) / this.getLimit()) + 1;
+    }
     return this.getInputValueFor('page');
   }
 
@@ -93,8 +112,18 @@ class MarkoWebSearch {
     return this.getLimit() * (this.getCurrentPage() - 1);
   }
 
-  getTotalPages(totalCount = 0) {
-    const count = totalCount > 10000 ? 10000 : totalCount;
+  /**
+   * @param {number} totalCount
+   * @param {PageInfo} [pageInfo]
+   */
+  getTotalPages(totalCount, pageInfo) {
+    const total = totalCount || 0;
+
+    if (this.config.useMindful && pageInfo) {
+      return Math.ceil(total / this.getLimit());
+    }
+
+    const count = (total) > 10000 ? 10000 : total;
     return Math.ceil(count / this.getLimit());
   }
 
@@ -110,4 +139,8 @@ class MarkoWebSearch {
   }
 }
 
+/**
+ * @typedef {import("@mindful-web/mindful/marko-web/service").PostsAsContentPageInfo} PageInfo
+ */
+
 module.exports = MarkoWebSearch;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mindful-web/marko-web-search",
-  "version": "1.20.2",
+  "version": "1.27.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": "c448a31cadb8230e9b4a8e62a2be79767eea3c82"
+  "gitHead": "b21ead88aea0a41608df9fd615f1b61038bb0b0a"
 }