Merge branch 'master' into develop

manifest-beta.json

@@ -1,7 +1,7 @@
 {
 	"id": "omnisearch",
 	"name": "Omnisearch",
-	"version": "1.15.0-beta.1",
+	"version": "1.15.0",
 	"minAppVersion": "1.0.0",
 	"description": "A search engine that just works",
 	"author": "Simon Cambier",

manifest.json

@@ -1,7 +1,7 @@
 {
   "id": "omnisearch",
   "name": "Omnisearch",
-  "version": "1.14.2",
+  "version": "1.15.0",
   "minAppVersion": "1.0.0",
   "description": "A search engine that just works",
   "author": "Simon Cambier",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "scambier.obsidian-search",
-  "version": "1.15.0-beta.2",
+  "version": "1.15.0",
   "description": "A search engine for Obsidian",
   "main": "dist/main.js",
   "scripts": {

src/cache-manager.ts

@@ -126,13 +126,15 @@ async function getAndMapIndexedDocument(
     }
   }
 
+  const tags = getTagsFromMetadata(metadata)
   return {
     basename: removeDiacritics(file.basename),
     content,
     path: file.path,
     mtime: file.stat.mtime,
 
-    tags: getTagsFromMetadata(metadata),
+    tags: tags,
+    unmarkedTags: tags.map(t => t.replace('#', '')),
     aliases: getAliasesFromMetadata(metadata).join(''),
     headings1: metadata ? extractHeadingsFromCache(metadata, 1).join(' ') : '',
     headings2: metadata ? extractHeadingsFromCache(metadata, 2).join(' ') : '',

src/components/ResultItemContainer.svelte

@@ -12,6 +12,7 @@
   class:is-selected={selected}
   on:mousemove
   on:click
+  on:keypress
   on:auxclick>
   {#if glyph}
     <GlyphAddNote />

src/globals.ts

@@ -42,6 +42,7 @@ export type IndexedDocument = {
   content: string
   aliases: string
   tags: string[]
+  unmarkedTags: string[]
   headings1: string
   headings2: string
   headings3: string

src/search/omnisearch.ts

@@ -216,6 +216,7 @@ export class Omnisearch {
         headings1: settings.weightH1,
         headings2: settings.weightH2,
         headings3: settings.weightH3,
+        unmarkedTags: settings.weightUnmarkedTags
       },
     })
 

src/settings.ts

@@ -20,6 +20,7 @@ interface WeightingSettings {
   weightH1: number
   weightH2: number
   weightH3: number
+  weightUnmarkedTags: number
 }
 
 export interface OmnisearchSettings extends WeightingSettings {
@@ -446,6 +447,10 @@ export class SettingsTab extends PluginSettingTab {
       .setName(`Headings level 3 (default: ${DEFAULT_SETTINGS.weightH3})`)
       .addSlider(cb => this.weightSlider(cb, 'weightH3'))
 
+    new Setting(containerEl)
+      .setName(`Tags without the # (default: ${DEFAULT_SETTINGS.weightUnmarkedTags})`)
+      .addSlider(cb => this.weightSlider(cb, 'weightUnmarkedTags'))
+
     //#endregion Results Weighting
 
     //#region Debugging
@@ -546,6 +551,7 @@ export const DEFAULT_SETTINGS: OmnisearchSettings = {
   weightH1: 1.5,
   weightH2: 1.3,
   weightH3: 1.1,
+  weightUnmarkedTags: 1.1,
 
   welcomeMessage: '',
   verboseLogging: false,

versions.json

@@ -110,5 +110,7 @@
 	"1.14.1-beta.2": "1.0.0",
 	"1.14.1": "1.0.0",
 	"1.14.2": "1.0.0",
-	"1.15.0-beta.1": "1.0.0"
+	"1.15.0-beta.1": "1.0.0",
+	"1.15.0-beta.2": "1.0.0",
+	"1.15.0": "1.0.0"
 }