Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(settings): put synonyms and rules in the configure file #128

Merged
merged 3 commits into from
Feb 13, 2018
Merged

refactor(settings): put synonyms and rules in the configure file #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c306393
refactor(npm): rewrite getDownloads using async/await
Haroenv Feb 12, 2018
0dab2dd
refactor(settings): put synonyms and rules in the configure file
Haroenv Feb 13, 2018
ea9dfc1
Merge branch 'master' into refactor/written-rules-synonyms
Haroenv Feb 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 25 additions & 4 deletions src/__tests__/__snapshots__/config.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,23 @@ Object {
"bootstrapConcurrency": 100,
"bootstrapIndexName": "npm-search-bootstrap",
"indexName": "fake-index",
"indexRules": Array [
Object {
"condition": Object {
"anchoring": "is",
"pattern": "{facet:concatenatedName}",
},
"consequence": Object {
"params": Object {
"automaticOptionalFacetFilters": Array [
"concatenatedName",
],
},
},
"description": "promote exact matches",
"objectID": "promote-exact",
},
],
"indexSettings": Object {
"attributesForFaceting": Array [
"filterOnly(concatenatedName)",
Expand Down Expand Up @@ -58,13 +75,17 @@ Object {
"owners.name",
],
"separatorsToIndex": "_",
"synonyms": Array [
Array [
},
"indexSynonyms": Array [
Object {
"objectID": "underscore",
"synonyms": Array [
"_",
"underscore",
],
],
},
"type": "synonym",
},
],
"maxObjSize": 450000,
"npmDownloadsEndpoint": "https://api.npmjs.org/downloads",
"npmRegistryEndpoint": "https://replicate.npmjs.com/registry",
Expand Down
23 changes: 22 additions & 1 deletion src/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,30 @@ const defaultConfig = {
],
optionalWords: ['js', 'javascript'],
separatorsToIndex: '_',
synonyms: [['_', 'underscore']],
replaceSynonymsInHighlight: false,
},
indexSynonyms: [
{
type: 'synonym',
synonyms: ['_', 'underscore'],
objectID: 'underscore',
},
],
indexRules: [
{
objectID: 'promote-exact',
description: 'promote exact matches',
condition: {
pattern: '{facet:concatenatedName}',
anchoring: 'is',
},
consequence: {
params: {
automaticOptionalFacetFilters: ['concatenatedName'],
},
},
},
],
};

export default Object.entries(defaultConfig).reduce(
Expand Down
17 changes: 14 additions & 3 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,8 @@ const { index: mainIndex, client } = createAlgoliaIndex(c.indexName);
const { index: bootstrapIndex } = createAlgoliaIndex(c.bootstrapIndexName);
const stateManager = createStateManager(mainIndex);

mainIndex
.setSettings(c.indexSettings)
.then(({ taskID }) => mainIndex.waitTask(taskID))
setSettings(mainIndex)
.then(() => setSettings(bootstrapIndex))
.then(() => stateManager.check())
.then(bootstrap)
.then(() => stateManager.get())
Expand All @@ -35,6 +34,18 @@ mainIndex
.then(watch)
.catch(error);

async function setSettings(index) {
await index.setSettings(c.indexSettings);
await index.batchSynonyms(c.indexSynonyms, {
replaceExistingSynonyms: true,
});
const { taskID } = await index.batchRules(c.indexRules, {
replaceExistingRules: true,
});

return index.waitTask(taskID);
}

function infoChange(seq, nbChanges, emoji) {
return npm.info().then(npmInfo => {
const ratePerSecond = nbChanges / ((Date.now() - loopStart) / 1000);
Expand Down