atriusmaps-node-sdk 3.3.898 → 3.3.900

package/dist/cjs/plugins/searchService/src/flexsearchExports/lang.js

@@ -1,249 +1,75 @@
 'use strict';
 
-/* eslint-disable camelcase */
-/**
- * @param {!string} str
- * @param {boolean|Array<string|RegExp>=} normalize
- * @param {boolean|string|RegExp=} split
- * @param {boolean=} _collapse
- * @returns {string|Array<string>}
- * @this IndexInterface
- */
-
-function pipeline(str, normalize, split, _collapse) {
+function pipeline(str, normalize2, split, _collapse) {
   if (str) {
-    if (normalize) {
-      str = replace(str, /** @type {Array<string|RegExp>} */ normalize);
+    if (normalize2) {
+      str = replace(
+        str,
+        /** @type {Array<string|RegExp>} */
+        normalize2
+      );
     }
-
     if (this.matcher) {
       str = replace(str, this.matcher);
     }
-
     if (this.stemmer && str.length > 1) {
       str = replace(str, this.stemmer);
     }
-
     if (_collapse && str.length > 1) {
       str = collapse(str);
     }
-
-    if (split || split === '') {
-      const words = str.split(/** @type {string|RegExp} */ split);
-
+    if (split || split === "") {
+      const words = str.split(
+        /** @type {string|RegExp} */
+        split
+      );
       return this.filter ? filter(words, this.filter) : words;
     }
   }
-
   return str;
 }
-
-// TODO improve normalize + remove non-delimited chars like in "I'm" + split on whitespace+
-
 const regex_whitespace = /[\p{Z}\p{S}\p{P}\p{C}]+/u;
-// https://github.com/nextapps-de/flexsearch/pull/414
-// export const regex_whitespace = /[\s\xA0\u2000-\u200B\u2028\u2029\u3000\ufeff!"#$%&'()*+,\-./:;<=>?@[\\\]^_`{|}~]/
 const regex_normalize = /[\u0300-\u036f'-]/gu;
-
 function normalize(str) {
   if (str.normalize) {
-    str = str.normalize('NFD').replace(regex_normalize, '');
+    str = str.normalize("NFD").replace(regex_normalize, "");
   }
-
   return str;
 }
-
-/**
- * @param {!string} str
- * @param {boolean|Array<string|RegExp>=} normalize
- * @param {boolean|string|RegExp=} split
- * @param {boolean=} _collapse
- * @returns {string|Array<string>}
- */
-
-// FlexSearch.prototype.pipeline = function(str, normalize, split, _collapse){
-//
-//     if(str){
-//
-//         if(normalize && str){
-//
-//             str = replace(str, /** @type {Array<string|RegExp>} */ (normalize));
-//         }
-//
-//         if(str && this.matcher){
-//
-//             str = replace(str, this.matcher);
-//         }
-//
-//         if(this.stemmer && str.length > 1){
-//
-//             str = replace(str, this.stemmer);
-//         }
-//
-//         if(_collapse && str.length > 1){
-//
-//             str = collapse(str);
-//         }
-//
-//         if(str){
-//
-//             if(split || (split === "")){
-//
-//                 const words = str.split(/** @type {string|RegExp} */ (split));
-//
-//                 return this.filter ? filter(words, this.filter) : words;
-//             }
-//         }
-//     }
-//
-//     return str;
-// };
-
-// export function pipeline(str, normalize, matcher, stemmer, split, _filter, _collapse){
-//
-//     if(str){
-//
-//         if(normalize && str){
-//
-//             str = replace(str, normalize);
-//         }
-//
-//         if(matcher && str){
-//
-//             str = replace(str, matcher);
-//         }
-//
-//         if(stemmer && str.length > 1){
-//
-//             str = replace(str, stemmer);
-//         }
-//
-//         if(_collapse && str.length > 1){
-//
-//             str = collapse(str);
-//         }
-//
-//         if(str){
-//
-//             if(split !== false){
-//
-//                 str = str.split(split);
-//
-//                 if(_filter){
-//
-//                     str = filter(str, _filter);
-//                 }
-//             }
-//         }
-//     }
-//
-//     return str;
-// }
-
-/**
- * @param {!string} str
- * @param {Array} regexp
- * @returns {string}
- */
-
 function replace(str, regexp) {
   for (let i = 0, len = regexp.length; i < len; i += 2) {
     str = str.replace(regexp[i], regexp[i + 1]);
-
     if (!str) {
       break;
     }
   }
-
   return str;
 }
-
-/**
- * @param {!string} str
- * @returns {RegExp}
- */
-
 function regex(str) {
-  return new RegExp(str, 'g');
+  return new RegExp(str, "g");
 }
-
-/**
- * Regex: replace(/(?:(\w)(?:\1)*)/g, "$1")
- * @param {!string} string
- * @returns {string}
- */
-
 function collapse(string) {
-  let final = '';
-  let prev = '';
-
+  let final = "";
+  let prev = "";
   for (let i = 0, len = string.length, char; i < len; i++) {
     if ((char = string[i]) !== prev) {
       final += prev = char;
     }
   }
-
   return final;
 }
-
-// TODO using fast-swap
 function filter(words, map) {
   const length = words.length;
   const filtered = [];
-
   for (let i = 0, count = 0; i < length; i++) {
     const word = words[i];
-
     if (word && !map[word]) {
       filtered[count++] = word;
     }
   }
-
   return filtered;
 }
 
-// const chars = {a:1, e:1, i:1, o:1, u:1, y:1};
-//
-// function collapse_repeating_chars(string){
-//
-//     let collapsed_string = "",
-//         char_prev = "",
-//         char_next = "";
-//
-//     for(let i = 0; i < string.length; i++){
-//
-//         const char = string[i];
-//
-//         if(char !== char_prev){
-//
-//             if(i && (char === "h")){
-//
-//                 if((chars[char_prev] && chars[char_next]) || (char_prev === " ")){
-//
-//                     collapsed_string += char;
-//                 }
-//             }
-//             else{
-//
-//                 collapsed_string += char;
-//             }
-//         }
-//
-//         char_next = (
-//
-//             (i === (string.length - 1)) ?
-//
-//                 ""
-//             :
-//                 string[i + 1]
-//         );
-//
-//         char_prev = char;
-//     }
-//
-//     return collapsed_string;
-// }
-
 exports.collapse = collapse;
 exports.filter = filter;
 exports.normalize = normalize;

package/dist/cjs/plugins/searchService/src/flexsearchExports/simple.js

@@ -2,58 +2,51 @@
 
 var lang = require('./lang.js');
 
-/* eslint-disable camelcase */
-const // regex_whitespace = /\W+/,
-  // regex_strip = regex("[^a-z0-9 ]"),
-  regex_a = lang.regex('[àáâãäå]');
-const regex_e = lang.regex('[èéêë]');
-const regex_i = lang.regex('[ìíîï]');
-const regex_o = lang.regex('[òóôõöő]');
-const regex_u = lang.regex('[ùúûüű]');
-const regex_y = lang.regex('[ýŷÿ]');
-const regex_n = lang.regex('ñ');
-const regex_c = lang.regex('[çc]');
-const regex_s = lang.regex('ß');
-const regex_and = lang.regex(' & ');
+const regex_a = lang.regex("[\xE0\xE1\xE2\xE3\xE4\xE5]");
+const regex_e = lang.regex("[\xE8\xE9\xEA\xEB]");
+const regex_i = lang.regex("[\xEC\xED\xEE\xEF]");
+const regex_o = lang.regex("[\xF2\xF3\xF4\xF5\xF6\u0151]");
+const regex_u = lang.regex("[\xF9\xFA\xFB\xFC\u0171]");
+const regex_y = lang.regex("[\xFD\u0177\xFF]");
+const regex_n = lang.regex("\xF1");
+const regex_c = lang.regex("[\xE7c]");
+const regex_s = lang.regex("\xDF");
+const regex_and = lang.regex(" & ");
 const pairs = [
   regex_a,
-  'a',
+  "a",
   regex_e,
-  'e',
+  "e",
   regex_i,
-  'i',
+  "i",
   regex_o,
-  'o',
+  "o",
   regex_u,
-  'u',
+  "u",
   regex_y,
-  'y',
+  "y",
   regex_n,
-  'n',
+  "n",
   regex_c,
-  'k',
+  "k",
   regex_s,
-  's',
+  "s",
   regex_and,
-  ' and ',
+  " and "
   // regex_whitespace, " "
   // regex_strip, ""
 ];
-
-/**
- * @param {string|number} str
- * @this IndexInterface
- */
-
 function encode(str) {
-  str = '' + str;
-
+  str = "" + str;
   return lang.pipeline.call(
     this,
-    /* string: */ lang.normalize(str).toLowerCase(),
-    /* normalize: */ !str.normalize && pairs,
-    /* split: */ lang.regex_whitespace,
-    false,
+    /* string: */
+    lang.normalize(str).toLowerCase(),
+    /* normalize: */
+    !str.normalize && pairs,
+    /* split: */
+    lang.regex_whitespace,
+    false
   );
 }
 

package/dist/cjs/plugins/searchService/src/poiSearch.js

@@ -22,41 +22,30 @@ function _interopNamespaceDefault(e) {
 
 var R__namespace = /*#__PURE__*/_interopNamespaceDefault(R);
 
-const DEFAULT_RESULTS_LIMIT = 5000;
-
+const DEFAULT_RESULTS_LIMIT = 5e3;
 function createPOISearch(pois, lang) {
   const index = utils.getFlexSearchInstance({ lang });
-
-  // index.addMatcher({
-  //   '[\'.,]': ''
-  // })
-
   prepareIndexEntries(pois).forEach(([id, content]) => index.add(id, content));
-
-  function prepareIndexEntries(pois) {
-    return Object.values(pois).map(poi => {
-      const { poiId, category = '', name, keywords = [], roomId = '' } = poi;
-      const grabTags = R__namespace.path(['dynamicData', 'grab', 'tags'], poi) || [];
-      const searchKeywords = keywords.filter(R__namespace.prop('isUserSearchable')).map(R__namespace.prop('name'));
-      const content = `${name} ${category.split('.').join(' ')} ${roomId} ${searchKeywords.join(' ')} ${grabTags.join(' ')}`;
+  function prepareIndexEntries(pois2) {
+    return Object.values(pois2).map((poi) => {
+      const { poiId, category = "", name, keywords = [], roomId = "" } = poi;
+      const grabTags = R__namespace.path(["dynamicData", "grab", "tags"], poi) || [];
+      const searchKeywords = keywords.filter(R__namespace.prop("isUserSearchable")).map(R__namespace.prop("name"));
+      const content = `${name} ${category.split(".").join(" ")} ${roomId} ${searchKeywords.join(" ")} ${grabTags.join(" ")}`;
       return [Number(poiId), content];
     });
   }
-
   function search(queryParams) {
     const options = { ...queryParams };
-    if (!options.limit) // sometimes limit is NaN or undefined!
-    {
+    if (!options.limit) {
       options.limit = DEFAULT_RESULTS_LIMIT;
     }
     const ids = index.search(options);
     return Object.values(R__namespace.pick(ids, pois));
   }
-
-  function updateMultiple(pois) {
-    prepareIndexEntries(pois).forEach(([id, content]) => index.update(id, content));
+  function updateMultiple(pois2) {
+    prepareIndexEntries(pois2).forEach(([id, content]) => index.update(id, content));
   }
-
   return { search, updateMultiple };
 }
 

package/dist/cjs/plugins/searchService/src/searchService.js

@@ -30,154 +30,84 @@ function create(app, config) {
   const state = {
     poiSearch: null,
     typeahead: null,
-    indexesCreated: new Zousan(), // re-initialize this when changing venues
+    indexesCreated: new Zousan(),
+    // re-initialize this when changing venues
     defaultSearchTerms: null,
-    specialQueryTerms: {},
+    specialQueryTerms: {}
   };
-
   const init = async () => {
-    const pois = await app.bus.get('poi/getAll');
+    const pois = await app.bus.get("poi/getAll");
     state.poiSearch = poiSearch(pois, app.i18n().language);
     state.typeahead = searchTypeahead(pois, state.poiSearch.search, app.i18n().language);
-    state.defaultSearchTerms = configUtils.getLocalized(config, 'defaultSearchTerms', app.i18n().language);
+    state.defaultSearchTerms = configUtils.getLocalized(config, "defaultSearchTerms", app.i18n().language);
     state.indexesCreated.resolve();
   };
-
-  /**
-   * Prepares and send an event with up to 50 non-portal POIs sorted by distance to user location.
-   */
-  // todo check if async events (events which send a new event as a result) are still needed
-  app.bus.on('search/queryNearby', async () => {
+  app.bus.on("search/queryNearby", async () => {
     const pois = await searchNearby();
-    app.bus.send('search/showNearby', { pois, term: 'Nearby' });
+    app.bus.send("search/showNearby", { pois, term: "Nearby" });
     return pois;
   });
-
-  /**
-   * Returns max 50 non-portal POIs sorted by distance to user location.
-   * @returns Array.<POI>
-   */
-  app.bus.on('search/queryNearbyAsync', searchNearby);
-
+  app.bus.on("search/queryNearbyAsync", searchNearby);
   async function searchNearby() {
-    const startLocation = await app.bus.getFirst('user/getPhysicalLocation');
+    const startLocation = await app.bus.getFirst("user/getPhysicalLocation");
     if (!startLocation?.floorId) {
       return [];
     }
-    const poisSameFloor = await app.bus.get('poi/getByFloorId', {
-      floorId: startLocation?.floorId,
+    const poisSameFloor = await app.bus.get("poi/getByFloorId", {
+      floorId: startLocation?.floorId
     });
-    const isNotPortal = poi => poi.category.indexOf('portal') === -1 && poi.category !== 'element.door';
+    const isNotPortal = (poi) => poi.category.indexOf("portal") === -1 && poi.category !== "element.door";
     const noPortalPois = Object.values(R__namespace.pickBy(isNotPortal, poisSameFloor));
-    const poisWithDistance = await app.bus.get('wayfinder/addPathTimeMultiple', {
+    const poisWithDistance = await app.bus.get("wayfinder/addPathTimeMultiple", {
       pois: noPortalPois,
-      startLocation,
+      startLocation
     });
-    return R__namespace.sortBy(R__namespace.prop('distance'), Object.values(poisWithDistance)).slice(0, 50);
+    return R__namespace.sortBy(R__namespace.prop("distance"), Object.values(poisWithDistance)).slice(0, 50);
   }
-
-  /**
-   * Searches for POIs with search term or category name
-   * and sends a new event 'search/showCategory' with search result POIs.
-   *
-   * @param {string} searchTerm - term to search POIs
-   * @param {string} category - category name, fallback term to search POIs
-   * @param {string} categoryName - label to display in search results input view
-   */
-  app.bus.on('search/queryCategory', async ({ category, categoryName, searchTerm }) => {
+  app.bus.on("search/queryCategory", async ({ category, categoryName, searchTerm }) => {
     const pois = await state.indexesCreated.then(() => state.poiSearch.search({ query: searchTerm || category }));
-    app.bus.send('search/showCategory', { pois, category, categoryName });
+    app.bus.send("search/showCategory", { pois, category, categoryName });
     return pois;
   });
-
-  /**
-   * Searches for POIs with search term
-   * and sends a new event 'search/showCategory' with search result POIs.
-   *
-   * @param {string} term - search term
-   */
-  // todo introduce consistent naming for parameters are return values (searchTem or term, pois or results, keywords or searchTerms)
-  app.bus.on('search/query', ({ term }) => {
+  app.bus.on("search/query", ({ term }) => {
     return state.indexesCreated.then(() => {
       const pois = state.poiSearch.search({ query: term });
-      app.bus.send('search/showSearchResults', { results: pois, term });
+      app.bus.send("search/showSearchResults", { results: pois, term });
       return pois;
     });
   });
-
-  /**
-   * Search for POIs with search term.
-   *
-   * @param {string} term - search term
-   * @returns Array.<POI>
-   */
-  app.bus.on('search/queryAsync', ({ term }) =>
-    state.indexesCreated.then(() => state.poiSearch.search({ query: term })),
+  app.bus.on(
+    "search/queryAsync",
+    ({ term }) => state.indexesCreated.then(() => state.poiSearch.search({ query: term }))
   );
-
-  /**
-   * If search term matches any registered special query term,
-   * then send an event with params for this special query,
-   * otherwise search for POIs with term and send the event 'search/query' with search result POIs
-   *
-   * @param {string} term - search term or special query
-   */
-  app.bus.on('search/queryWithSpecial', ({ term }) => {
+  app.bus.on("search/queryWithSpecial", ({ term }) => {
     if (state.specialQueryTerms[term]) {
       const { event, params } = state.specialQueryTerms[term];
-      // use "send" as we can't gaurentee this event is a "get" or even returns POIs
       return app.bus.send(event, params);
     } else {
-      return app.bus.get('search/query', { term });
+      return app.bus.get("search/query", { term });
     }
   });
-
-  /**
-   * Returns list of all localized default search terms declared in the configuration
-   * or list of up to 'limit' random unique POI categories as a fallback.
-   * Returns a list of keywords and sends an event 'search/showDefaultSearchKeywords' with same the list of keywords.
-   *
-   * @param {number} [limit=5] - Used to limit number of random unique categories list if default search terms are not defined in configuration.
-   * @returns Array.<string> - list of keywords
-   */
-  app.bus.on('search/getDefaultSearchTerms', async ({ limit = 5 } = {}) => {
+  app.bus.on("search/getDefaultSearchTerms", async ({ limit = 5 } = {}) => {
     const defaultSearchTerms = state.defaultSearchTerms;
     const hasDefaultSearchTerms = defaultSearchTerms && defaultSearchTerms.length;
     const keywords = hasDefaultSearchTerms ? defaultSearchTerms : await getUniqueRandomCategories(limit);
-    app.bus.send('search/showDefaultSearchKeywords', { keywords });
+    app.bus.send("search/showDefaultSearchKeywords", { keywords });
     return keywords;
   });
-
   async function getUniqueRandomCategories(limit) {
-    const allCategories = (await app.bus.send('poi/getAllCategories'))[0];
+    const allCategories = (await app.bus.send("poi/getAllCategories"))[0];
     const uniqueCategories = Array.from(new Set(allCategories));
     const shuffledUniqueCategories = rand.randomizeArray(uniqueCategories);
     return shuffledUniqueCategories.slice(0, limit);
   }
-
-  /**
-   * Returns list of up to 'limit' unique random navigable POIs.
-   *
-   * @param {number} [limit=5]
-   * @returns Array.<POI>
-   */
-  app.bus.on('search/getDefaultSearchPois', async ({ limit = 5 } = {}) => {
-    const allPois = await app.bus.get('poi/getAll');
-    const navigablePred = val => val.isNavigable;
+  app.bus.on("search/getDefaultSearchPois", async ({ limit = 5 } = {}) => {
+    const allPois = await app.bus.get("poi/getAll");
+    const navigablePred = (val) => val.isNavigable;
     const navigablePois = R__namespace.pickBy(navigablePred, allPois);
     return rand.arrayPick(Object.values(navigablePois), limit);
   });
-
-  /**
-   * Registers an event and event params for special query term.
-   * Optionally adds passed special query term to keywords search index.
-   *
-   * @param {string} term - special query term
-   * @param {string} event - name of associated event
-   * @param {Object} params - parameters for associated event
-   * @param {boolean} addKeyword - indicates if term has to be added to keywords search index
-   */
-  app.bus.on('search/registerSpecialQuery', ({ term, event, params, addKeyword = true }) => {
+  app.bus.on("search/registerSpecialQuery", ({ term, event, params, addKeyword = true }) => {
     state.indexesCreated.then(() => {
       if (addKeyword) {
         state.typeahead.addKeyword(term);
@@ -185,69 +115,37 @@ function create(app, config) {
       state.specialQueryTerms[term] = { event, params };
     });
   });
-
-  /**
-   * Adds list of keywords to keywords search index.
-   *
-   * @param {Array.<string>} keywords - list of new keywords
-   */
-  app.bus.on('search/addKeywords', ({ keywords }) =>
-    state.indexesCreated.then(() => keywords.forEach(keyword => state.typeahead.addKeyword(keyword))),
+  app.bus.on(
+    "search/addKeywords",
+    ({ keywords }) => state.indexesCreated.then(() => keywords.forEach((keyword) => state.typeahead.addKeyword(keyword)))
   );
-
-  /**
-   * Returns lists of keywords and POIs matching search term.
-   *
-   * For term shorter than 3 characters only keywords index is queried.
-   * If no keywords are found or when term is longer,
-   * then POIs index is queried for the the remaining results.
-   *
-   * @param {string} term - search term
-   * @param {number} limit - maximum number of results
-   * @returns {{ pois: Array.<POI>, keywords: Array.<String>, term: string }} - list of keywords, list of POIs, search term
-   */
-  app.bus.on('search/typeahead', ({ term, limit }) =>
-    state.indexesCreated.then(() => {
+  app.bus.on(
+    "search/typeahead",
+    ({ term, limit }) => state.indexesCreated.then(() => {
       const { keywords, pois } = state.typeahead.query(term, limit);
       return { keywords, pois, term };
-    }),
+    })
   );
-
-  /**
-   * Resets plugin state.
-   */
-  app.bus.on('venueData/loadNewVenue', () => {
+  app.bus.on("venueData/loadNewVenue", () => {
     state.indexesCreated = new Zousan();
     init();
   });
-
-  /**
-   * Updates POIs search index with dynamic Grab POIs.
-   *
-   * @param {string} plugin - type of dynamic data
-   * @param {Object<string, Object>} - dictionary of POI id to dynamic data object
-   */
-  app.bus.on('poi/setDynamicData', async ({ plugin, idValuesMap }) => {
-    if (plugin !== 'grab') {
+  app.bus.on("poi/setDynamicData", async ({ plugin, idValuesMap }) => {
+    if (plugin !== "grab") {
       return;
     }
-
-    const dynamicPoisPromises = Object.keys(idValuesMap).map(id => app.bus.get('poi/getById', { id }));
-
-    return Promise.all(dynamicPoisPromises).then(pois =>
-      state.indexesCreated.then(() => state.poiSearch.updateMultiple(pois)),
+    const dynamicPoisPromises = Object.keys(idValuesMap).map((id) => app.bus.get("poi/getById", { id }));
+    return Promise.all(dynamicPoisPromises).then(
+      (pois) => state.indexesCreated.then(() => state.poiSearch.updateMultiple(pois))
     );
   });
-
   const runTest = async (initialState, testRoutine) => {
-    // state = { ...initialState }
     await testRoutine();
     return state;
   };
-
   return {
     init,
-    runTest,
+    runTest
   };
 }