WIP demo and FACETs no longer include empty buckets by default

fergiemcdowall · Oct 26, 2023 · 503f488 · 503f488
1 parent f5f6220
commit 503f488
Show file tree

Hide file tree

Showing 14 changed files with 171 additions and 68 deletions.
diff --git a/demo/src/search-app.js b/demo/src/search-app.js
@@ -116,11 +116,11 @@ autocomplete({
   },
   container: '#searchbox',
   placeholder: 'Search for pictures of nature',
-  getSources({ query }) {
+  getSources ({ query }) {
     return [
       {
         sourceId: 'dictionary',
-        getItems({ query }) {
+        getItems ({ query }) {
           return si.DICTIONARY(query).then(res => [
             ...res.map(item => ({
               label: item,
@@ -129,12 +129,12 @@ autocomplete({
             { label: 'clear', value: '' }
           ])
         },
-        getItemUrl({ item }) {
+        getItemUrl ({ item }) {
           console.log('fetching ... ' + item.label)
           return '?q=' + item.label
         },
         templates: {
-          item({ item, html }) {
+          item ({ item, html }) {
             return html`<a href="?q=${item.value}">${item.label}</a>`
           }
         }

diff --git a/demo2/index.html b/demo2/index.html
@@ -84,11 +84,7 @@
       }
     </style>
 
-    <script src="./lib/search-index.js"></script>
-    <script src="./lib/stopwords.js"></script>
-    <script src="./lib/ui.js"></script>
-    <script src="./lib/autocomplete.js"></script>
-    <script src="./src/app.js"></script>
+    <script src="./src/app.js" type="module"></script>
     <title>Search-index demo</title>
   </head>
   <body>

diff --git a/demo2/lib/autocomplete.js b/demo2/lib/autocomplete.js
@@ -1,4 +1,4 @@
-const autocomplete = async (inp, DICTIONARY, search) => {
+export const autocomplete = async (inp, DICTIONARY, search) => {
   /*the autocomplete function takes two arguments,
   the text field element and an array of possible autocompleted values:*/
   var currentFocus

diff --git a/demo2/lib/stopwords.js b/demo2/lib/stopwords.js
@@ -1,13 +1,112 @@
 // eslint-disable-next-line no-unused-vars
-const stopwords = [
-  'about', 'after', 'all', 'also', 'am', 'an', 'and', 'another', 'any', 'are', 'as', 'at', 'be',
-  'because', 'been', 'before', 'being', 'between', 'both', 'but', 'by', 'came', 'can',
-  'come', 'could', 'did', 'do', 'each', 'for', 'from', 'get', 'got', 'has', 'had',
-  'he', 'have', 'her', 'here', 'him', 'himself', 'his', 'how', 'if', 'in', 'into',
-  'is', 'it', 'like', 'make', 'many', 'me', 'might', 'more', 'most', 'much', 'must',
-  'my', 'never', 'now', 'of', 'on', 'only', 'or', 'other', 'our', 'out', 'over',
-  'said', 'same', 'see', 'should', 'since', 'some', 'still', 'such', 'take', 'than',
-  'that', 'the', 'their', 'them', 'then', 'there', 'these', 'they', 'this', 'those',
-  'through', 'to', 'too', 'under', 'up', 'very', 'was', 'way', 'we', 'well', 'were',
-  'what', 'where', 'which', 'while', 'who', 'with', 'would', 'you', 'your', 'a', 'i'
+export const stopwords = [
+  'about',
+  'after',
+  'all',
+  'also',
+  'am',
+  'an',
+  'and',
+  'another',
+  'any',
+  'are',
+  'as',
+  'at',
+  'be',
+  'because',
+  'been',
+  'before',
+  'being',
+  'between',
+  'both',
+  'but',
+  'by',
+  'came',
+  'can',
+  'come',
+  'could',
+  'did',
+  'do',
+  'each',
+  'for',
+  'from',
+  'get',
+  'got',
+  'has',
+  'had',
+  'he',
+  'have',
+  'her',
+  'here',
+  'him',
+  'himself',
+  'his',
+  'how',
+  'if',
+  'in',
+  'into',
+  'is',
+  'it',
+  'like',
+  'make',
+  'many',
+  'me',
+  'might',
+  'more',
+  'most',
+  'much',
+  'must',
+  'my',
+  'never',
+  'now',
+  'of',
+  'on',
+  'only',
+  'or',
+  'other',
+  'our',
+  'out',
+  'over',
+  'said',
+  'same',
+  'see',
+  'should',
+  'since',
+  'some',
+  'still',
+  'such',
+  'take',
+  'than',
+  'that',
+  'the',
+  'their',
+  'them',
+  'then',
+  'there',
+  'these',
+  'they',
+  'this',
+  'those',
+  'through',
+  'to',
+  'too',
+  'under',
+  'up',
+  'very',
+  'was',
+  'way',
+  'we',
+  'well',
+  'were',
+  'what',
+  'where',
+  'which',
+  'while',
+  'who',
+  'with',
+  'would',
+  'you',
+  'your',
+  'a',
+  'i'
 ]
diff --git a/demo2/lib/ui.js b/demo2/lib/ui.js
@@ -1,6 +1,7 @@
 // should be eventually bundled in with search-index
+import { autocomplete } from '/lib/autocomplete.js'
 
-const ui = ({
+export const ui = ({
   index = null,
   count = {},
   hits = {},
@@ -37,6 +38,9 @@ const ui = ({
 
   refiners = refiners.map(refiner => ({
     el: document.getElementById(refiner.elementId),
+    sort: (a, b) => {
+      a.VALUE.localeCompare(b.VALUE)
+    },
     ...refiner
   }))
 
@@ -56,21 +60,25 @@ const ui = ({
   ]
 
   const searchQuery = () => {
-    // debugger
-    return [
+    const q = [
       [
         ...searchInput.el.value.split(/\s+/).filter(item => item),
         ...activeFilters
       ],
       {
         FACETS: [
           {
-            FIELD: ['month', 'year']
+            FIELD: ['month']
+          },
+          {
+            FIELD: ['year']
           }
         ],
         DOCUMENTS: true
       }
     ]
+    console.log(JSON.stringify(q, null, 2))
+    return q
   }
 
   const search = () =>
@@ -82,6 +90,10 @@ const ui = ({
         // query: q,
         result // TODO: should this be nested like this?
       }))
+      .then(res => {
+        console.log(res)
+        return res
+      })
       .then(displaySearch)
 
   const displaySearch = res => {
@@ -100,6 +112,7 @@ const ui = ({
         refinerTitleTemplate(refiner.title) +
         facets
           .filter(item => item.FIELD == refiner.field)
+          .sort(refiner.sort)
           .reduce(
             (acc, { VALUE, _id }) =>
               acc +

diff --git a/demo2/src/app.js b/demo2/src/app.js
@@ -1,14 +1,18 @@
-const si = new SearchIndex.SearchIndex({
+import { stopwords } from '/lib/stopwords.js'
+import { ui } from '/lib/ui.js'
+import { SearchIndex } from '/lib/search-index-esm-5.0.0-rc1.js'
+
+const si = new SearchIndex({
   name: 'mySearchIndex',
   stopwords
 })
 
-fetch('data/EarthPorn-top-search-index.json')
-  .then(res => res.json())
-  .then(si.IMPORT)
-  .catch(e => console.error('problem with import'))
-
-window.onload = function () {
+Promise.all([
+  fetch('data/EarthPorn-top-search-index.json')
+    .then(res => res.json())
+    .then(si.IMPORT),
+  new Promise(res => (window.onload = () => res()))
+]).then(() =>
   ui({
     index: si,
     count: {
@@ -26,8 +30,17 @@ window.onload = function () {
     },
     refiners: [
       { elementId: 'year-refiner', title: 'YEAR', field: 'year' },
-      { elementId: 'month-refiner', title: 'MONTH', field: 'month' }
+      {
+        elementId: 'month-refiner',
+        title: 'MONTH',
+        field: 'month',
+        sort: (a, b) => {
+          const monthNumber = month =>
+            new Date(Date.parse(month + ' 1, 2012')).getMonth() + 1
+          return monthNumber(a.VALUE) - monthNumber(b.VALUE)
+        }
+      }
     ],
     searchInput: { elementId: 'searchbox' }
   })
-}
+)
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -81,7 +81,7 @@
     "world-bank-dataset": "^1.0.0"
   },
   "dependencies": {
-    "fergies-inverted-index": "13.0.0-rc.4",
+    "fergies-inverted-index": "13.0.0-rc.5",
     "lru-cache": "10.0.0",
     "ngraminator": "3.0.2",
     "p-queue": "7.3.4",

diff --git a/src/main.js b/src/main.js
@@ -7,12 +7,12 @@ import { Writer } from './write.js'
 import { validateVersion } from './util.js'
 
 export class Main {
-  constructor(ops = {}) {
+  constructor (ops = {}) {
     ops = {
       cacheLength: 1000,
       caseSensitive: false,
       docExistsSpace: 'DOC_RAW',
-      idGenerator: (function* generateId() {
+      idGenerator: (function * generateId () {
         let i = 0
         while (true) {
           yield Date.now() + '-' + i++

diff --git a/src/read.js b/src/read.js
@@ -90,7 +90,7 @@ export class Reader {
       options.BUCKETS
         ? this.#ii.BUCKETS(...options.BUCKETS).then(bkts =>
           Object.assign(result, {
-            BUCKETS: this.#ii.AGGREGATION_FILTER(bkts, result.RESULT)
+            BUCKETS: this.#ii.AGGREGATION_FILTER(bkts, result.RESULT, false)
           })
         )
         : result

diff --git a/src/version.js b/src/version.js
@@ -1 +1 @@
-export const packageVersion = "5.0.0-rc1"
+export const packageVersion = '5.0.0-rc1'
diff --git a/test/src/QUERY-test.js b/test/src/QUERY-test.js
@@ -78,7 +78,6 @@ test('can add data', t => {
       brand: 'Volvo'
     }
   ]
-
   t.plan(1)
   global[indexName].PUT(data).then(t.pass)
 })
@@ -196,7 +195,6 @@ test('QUERY with FACETS', t => {
         RESULT_LENGTH: 2,
         FACETS: [
           { FIELD: 'make', VALUE: 'bmw', _id: [7] },
-          { FIELD: 'make', VALUE: 'tesla', _id: [] },
           { FIELD: 'make', VALUE: 'volvo', _id: [8] }
         ]
       })
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		export const packageVersion = "5.0.0-rc1"
		export const packageVersion = '5.0.0-rc1'