prehistoric-systems/tilde
1
0
Fork 0
mirror of https://github.com/xvvvyz/tilde.git synced 2026-03-11 14:44:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

pass parsed instead of raw query to influencers

Browse source
This commit is contained in:
Cade Scroggins 2022-02-20 13:19:25 -08:00
parent 3ddf0ded47
commit f516bcebfa
No known key found for this signature in database
GPG key ID: 6AC5A902158265D0
1 changed files with 37 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
index.html
View file

@ -801,7 +801,6 @@
constructor(options) { constructor(options) {
this._limit = options.limit; this._limit = options.limit;
this._minChars = options.minChars; this._minChars = options.minChars;
this._parseQuery = options.parseQuery;
} }
addItem() { addItem() {
@ -812,9 +811,8 @@
return Promise.resolve([]); return Promise.resolve([]);
} }
_addSearchPrefix(items, query) { _addSearchPrefix(items, { isSearch, key, split }) {
const { isSearch, key, split } = this._parseQuery(query); const searchPrefix = isSearch ? `${key}${split}` : false;
const searchPrefix = isSearch ? `${key}${split} ` : false;
return items.map((s) => (searchPrefix ? searchPrefix + s : s)); return items.map((s) => (searchPrefix ? searchPrefix + s : s));
} }
@ -829,25 +827,23 @@
this._suggestionDefaults = suggestionDefaults; this._suggestionDefaults = suggestionDefaults;
} }
getSuggestions(rawQuery) { getSuggestions({ raw }) {
if (this._isTooShort(rawQuery)) return Promise.resolve([]); if (this._isTooShort(raw)) return Promise.resolve([]);
return new Promise((resolve) => return new Promise((resolve) =>
resolve( resolve((this._suggestionDefaults[raw] || []).slice(0, this._limit))
(this._suggestionDefaults[rawQuery] || []).slice(0, this._limit)
)
); );
} }
} }
class DuckDuckGoInfluencer extends Influencer { class DuckDuckGoInfluencer extends Influencer {
constructor({ queryParser }) { constructor() {
super(...arguments); super(...arguments);
} }
getSuggestions(rawQuery) { getSuggestions(parsedQuery) {
const { query } = this._parseQuery(rawQuery); const { query } = parsedQuery;
if (this._isTooShort(rawQuery) || !query) return Promise.resolve([]); if (this._isTooShort(query) || !query) return Promise.resolve([]);
return new Promise((resolve) => { return new Promise((resolve) => {
window.autocompleteCallback = (res) => window.autocompleteCallback = (res) =>
@ -857,7 +853,7 @@
.map((i) => i.phrase) .map((i) => i.phrase)
.filter((s) => s.toLowerCase() !== query.toLowerCase()) .filter((s) => s.toLowerCase() !== query.toLowerCase())
.slice(0, this._limit), .slice(0, this._limit),
rawQuery parsedQuery
) )
); );
@ -897,8 +893,8 @@
this._setHistory(sorted); this._setHistory(sorted);
} }
getSuggestions(rawQuery) { getSuggestions({ raw }) {
if (this._isTooShort(rawQuery)) return Promise.resolve([]); if (this._isTooShort(raw)) return Promise.resolve([]);
return new Promise((resolve) => return new Promise((resolve) =>
resolve( resolve(
@ -906,9 +902,9 @@
.map(([item]) => item) .map(([item]) => item)
.filter( .filter(
(item) => (item) =>
rawQuery && raw &&
item.toLowerCase() !== rawQuery.toLowerCase() && item.toLowerCase() !== raw.toLowerCase() &&
item.toLowerCase().indexOf(rawQuery.toLowerCase()) !== -1 item.toLowerCase().indexOf(raw.toLowerCase()) !== -1
) )
.slice(0, this._limit) .slice(0, this._limit)
) )
@ -939,7 +935,7 @@
this._el = $.el('#search-suggestions'); this._el = $.el('#search-suggestions');
this._influencers = options.influencers; this._influencers = options.influencers;
this._limit = options.limit; this._limit = options.limit;
this._currentInput = ''; this._parsedQuery = '';
this._highlightedSuggestion = null; this._highlightedSuggestion = null;
this._suggestionEls = []; this._suggestionEls = [];
this._handleKeydown = this._handleKeydown.bind(this); this._handleKeydown = this._handleKeydown.bind(this);
@ -964,11 +960,11 @@
this._clearSuggestions(); this._clearSuggestions();
} }
suggest(input) { suggest(parsedQuery) {
this._currentInput = input.trim(); this._parsedQuery = parsedQuery;
this._highlightedSuggestion = null; this._highlightedSuggestion = null;
if (!this._currentInput) { if (!parsedQuery.query) {
this._clearSuggestions(); this._clearSuggestions();
return; return;
} }
@ -978,7 +974,7 @@
_buildSuggestionsHtml(suggestions) { _buildSuggestionsHtml(suggestions) {
return suggestions.slice(0, this._limit).reduce((acc, suggestion) => { return suggestions.slice(0, this._limit).reduce((acc, suggestion) => {
const match = new RegExp($.escapeRegex(this._currentInput), 'i'); const match = new RegExp($.escapeRegex(this._parsedQuery.query), 'i');
const matched = suggestion.match(match); const matched = suggestion.match(match);
const suggestionHtml = matched const suggestionHtml = matched
@ -1050,7 +1046,7 @@
_getInfluencers() { _getInfluencers() {
return this._influencers.map((influencer) => return this._influencers.map((influencer) =>
influencer.getSuggestions(this._currentInput) influencer.getSuggestions(this._parsedQuery)
); );
} }
@ -1132,7 +1128,8 @@
parse(query) { parse(query) {
const res = []; const res = [];
res.query = query; res.raw = query.trim();
res.query = res.raw;
res.split = null; res.split = null;
if (this._urlRegex.test(query)) { if (this._urlRegex.test(query)) {
@ -1142,9 +1139,8 @@
return res; return res;
} }
const trimmed = query.trim(); const splitSearch = res.query.split(this._searchDelimiter);
const splitSearch = trimmed.split(this._searchDelimiter); const splitPath = res.query.split(this._pathDelimiter);
const splitPath = trimmed.split(this._pathDelimiter);
const isScript = Object.entries(this._scripts).some(([key, script]) => { const isScript = Object.entries(this._scripts).some(([key, script]) => {
if (query === key) { if (query === key) {
@ -1291,13 +1287,17 @@
_handleInput() { _handleInput() {
const newQuery = this._inputEl.value; const newQuery = this._inputEl.value;
const isHelp = newQuery === '?'; const isHelp = newQuery === '?';
const { isKey } = this._parseQuery(newQuery); const parsedQuery = this._parseQuery(newQuery);
this._inputElVal = newQuery; this._inputElVal = newQuery;
this._suggester.suggest(newQuery); this._suggester.suggest(parsedQuery);
this._setColorsFromQuery(newQuery); this._setColorsFromQuery(newQuery);
if (!newQuery || isHelp) this.hide(); if (!newQuery || isHelp) this.hide();
if (isHelp) this._toggleHelp(); if (isHelp) this._toggleHelp();
if (this._instantRedirect && isKey) this._submitWithValue(newQuery);
if (this._instantRedirect && parsedQuery.isKey) {
this._submitWithValue(newQuery);
}
} }
_handleKeydown(e) { _handleKeydown(e) {
@ -1376,6 +1376,11 @@
} }
} }
const help = new Help({
commands: CONFIG.commands,
newTab: CONFIG.queryNewTab,
});
const queryParser = new QueryParser({ const queryParser = new QueryParser({
commands: CONFIG.commands, commands: CONFIG.commands,
pathDelimiter: CONFIG.queryPathDelimiter, pathDelimiter: CONFIG.queryPathDelimiter,
@ -1391,7 +1396,6 @@
}[influencerConfig.name]({ }[influencerConfig.name]({
limit: influencerConfig.limit, limit: influencerConfig.limit,
minChars: influencerConfig.minChars, minChars: influencerConfig.minChars,
parseQuery: queryParser.parse,
suggestionDefaults: CONFIG.suggestionDefaults, suggestionDefaults: CONFIG.suggestionDefaults,
}); });
}); });
@ -1401,11 +1405,6 @@
limit: CONFIG.suggestionLimit, limit: CONFIG.suggestionLimit,
}); });
const help = new Help({
commands: CONFIG.commands,
newTab: CONFIG.queryNewTab,
});
const form = new Form({ const form = new Form({
instantRedirect: CONFIG.queryInstantRedirect, instantRedirect: CONFIG.queryInstantRedirect,
newTab: CONFIG.queryNewTab, newTab: CONFIG.queryNewTab,