Added support to multiples versicles

data/books/pt-br.json

@@ -1,30 +1,37 @@
 {
     "GEN": [
         "gênesis",
+        "genesis",
         "gn"
     ],
     "EXO": [
         "êxodo",
+        "exodo",
         "ex"
     ],
     "LEV": [
         "levítico",
+        "levitico",
         "lv"
     ],
     "NUM": [
         "números",
+        "numeros",
         "nm"
     ],
     "DEU": [
         "deuteronômio",
+        "deuteronomio",
         "dt"
     ],
     "JOS": [
         "josué",
+        "josue",
         "js"
     ],
     "JDG": [
         "juízes",
+        "juizes",
         "jz"
     ],
     "RUT": [
@@ -49,10 +56,12 @@
     ],
     "1CH": [
         "1crônicas",
+        "1cronicas",
         "1cr"
     ],
     "2CH": [
         "2crônicas",
+        "2cronicas",
         "2cr"
     ],
     "EZR": [
@@ -76,6 +85,7 @@
     ],
     "PRO": [
         "provérbios",
+        "proverbios",
         "pv"
     ],
     "ECC": [
@@ -84,10 +94,14 @@
     ],
     "SNG": [
         "cantaresdesalomão",
+        "cantares",
+        "cânticodoscânticos",
+        "canticodoscanticos",
         "ct"
     ],
     "ISA": [
         "isaías",
+        "isaias",
         "is"
     ],
     "JER": [
@@ -96,6 +110,8 @@
     ],
     "LAM": [
         "lamentações",
+        "lamentaçoes",
+        "lamentacoes",
         "lm"
     ],
     "EZK": [
@@ -108,6 +124,7 @@
     ],
     "HOS": [
         "oséias",
+        "oseias",
         "os"
     ],
     "JOL": [
@@ -116,6 +133,7 @@
     ],
     "AMO": [
         "amós",
+        "amos",
         "am"
     ],
     "OBA": [
@@ -128,6 +146,7 @@
     ],
     "MIC": [
         "miquéias",
+        "miqueias",
         "mq"
     ],
     "NAM": [
@@ -168,6 +187,7 @@
     ],
     "JHN": [
         "joão",
+        "joao",
         "jo"
     ],
     "ACT": [
@@ -180,18 +200,22 @@
     ],
     "1CO": [
         "1coríntios",
+        "1corintios",
         "1co"
     ],
     "2CO": [
         "2coríntios",
+        "2corintios",
         "2co"
     ],
     "GAL": [
         "gálatas",
+        "galatas",
         "gl"
     ],
     "EPH": [
         "efésios",
+        "efesios",
         "ef"
     ],
     "PHP": [
@@ -212,10 +236,12 @@
     ],
     "1TI": [
         "1timóteo",
+        "1timoteo",
         "1tm"
     ],
     "2TI": [
         "2timóteo",
+        "2timoteo",
         "2tm"
     ],
     "TIT": [
@@ -244,14 +270,17 @@
     ],
     "1JN": [
         "1joão",
+        "1joao",
         "1jo"
     ],
     "2JN": [
         "2joão",
+        "2joao",
         "2jo"
     ],
     "3JN": [
         "3joão",
+        "3joao",
         "3jo"
     ],
     "JUD": [

src/EditorSuggester.ts

@@ -26,9 +26,8 @@ export class EditorSuggester extends EditorSuggest<VerseLink> {
 		cursor: EditorPosition,
 		editor: Editor,
 		file: TFile | null
-	): EditorSuggestTriggerInfo | null {
+	): EditorSuggestTriggerInfo | null {		
 		const currentLine = editor.getLine(cursor.line);
-
 		const link_pos = currentLine.search(
 			new RegExp(this.settings.linkTrigger, "u")
 		);
@@ -116,14 +115,12 @@ export function getSuggestionsFromQuery(
 		return [];
 	}
 
-	const numbersPartsOfQueryString = query.substring(bookName.length);
+	const numbersPartsOfQueryString = query.substring(bookName.length);		
 	const numbers = numbersPartsOfQueryString.split(separatorRegex);
-
+	const verses = numbersPartsOfQueryString.split(':')[1].replaceAll(' ', '').trim() // get verses provide by user
 	const chapterNumber = parseInt(numbers[0]);
 	const verseNumber = numbers.length > 1 ? parseInt(numbers[1]) : undefined;
-	const verseEndNumber =
-		numbers.length === 3 ? parseInt(numbers[2]) : undefined;
-
+
 	return booksUrl.flatMap(
 		(bookUrl) =>
 			settings.bibleVersions
@@ -134,17 +131,15 @@ export function getSuggestionsFromQuery(
 							bookUrl,
 							bookName,
 							chapterNumber,
-							verseNumber,
-							verseEndNumber
+							verses
 						);
 					} else if (verseNumber !== undefined) {
 						return new VerseEmbed(
 							version,
 							bookUrl,
 							bookName,
 							chapterNumber,
-							verseNumber,
-							verseEndNumber
+							verses
 						);
 					}
 				})

src/GenerateLinks.ts

@@ -2,25 +2,37 @@ import { Editor, MarkdownView } from "obsidian";
 import { linkRegex } from "./Regex";
 import { getSuggestionsFromQuery } from "./EditorSuggester";
 import { ObsidianYouversionLinkerSettings } from "./SettingsData";
+import Verse from "./Verse";
 
 export default function GenerateLinks(
 	editor: Editor,
 	view: MarkdownView,
 	settings: ObsidianYouversionLinkerSettings
 ) {
+	const removeDuplicatedSuggestionsHandler = (suggestions: Verse[]) => {
+		// remove duplicated suggestions
+		suggestions.map((suggestion) => {
+			const index = suggestions.indexOf(suggestion);
+			if (index >= 0) {
+				suggestions = suggestions.slice(index, 1)
+			}
+		})
+		return suggestions
+	}
+
 	const lines = editor.lineCount();
 	for (let i = 0; i < lines; i++) {
 		const line = editor.getLine(i);
 
-		const match = [...line.matchAll(linkRegex)];
+		const match = [...line.matchAll(linkRegex)];		
 		match.forEach((match) => {
-			const suggestions = getSuggestionsFromQuery(
+			const suggestions = removeDuplicatedSuggestionsHandler(getSuggestionsFromQuery(
 				match[0],
 				true,
 				settings
-			);
+			));			
 			suggestions.forEach(async (s) => {
-				if (match.index === undefined) return;
+				if (match.index === undefined) return;				
 				editor.replaceRange(
 					await s.toReplace(),
 					{

src/Regex.ts

@@ -1,5 +1,4 @@
-export const linkRegex =
-	/([12345]\s?)?\p{L}+\s?\d{1,3}([:,.]\s?\d{1,3}([-–]\d{1,3})?)?/gu;
+export const linkRegex = /([12345]?\p{L}{2,}\d?\s?\d{1,3}([:,.]\s?\d{1,3}([-–]\d{1,3})?)?(,\s?\d{1,3}([-–]\d{1,3})?)*)/gu;
 
 export const bookRegex = /([12345]\s?)?\p{L}+/u;
 

src/Verse.ts

@@ -7,8 +7,7 @@ export default abstract class Verse {
 		private bookUrl: string,
 		private book: string,
 		private chapter: number,
-		private verse: number | undefined,
-		private verseEnd: number | undefined
+		private verses: string
 	) {}
 
 	public render(el: HTMLElement) {
@@ -24,21 +23,21 @@ export default abstract class Verse {
 	}
 
 	toSimpleText() {
-		return this.verse
-			? this.verseEnd
-				? `${this.book} ${this.chapter}:${this.verse}-${this.verseEnd}`
-				: `${this.book} ${this.chapter}:${this.verse}`
-			: `${this.book} ${this.chapter}`;
+		const formatBookNameHandler = (book: string) => {
+			return book.charAt(0).toUpperCase() + book.toLowerCase().slice(1);
+		}
+		return this.verses
+			? `${formatBookNameHandler(this.book)} ${this.chapter}:${this.verses.replaceAll(',', ', ')}`
+			: `${formatBookNameHandler(this.book)} ${this.chapter}`;
 	}
 
 	abstract toReplace(): Promise<string>;
 
 	getUrl(): string {
 		const base = "https://www.bible.com/bible";
 		let url = `${base}/${this.version.id}/${this.bookUrl}.${this.chapter}`;
-		if (this.verse) {
-			url += `.${this.verse}`;
-			if (this.verseEnd) url += `-${this.verseEnd}`;
+		if (this.verses) {
+			url += `.${this.verses}`;
 		}
 		return url;
 	}

tsconfig.json

@@ -17,7 +17,8 @@
       "DOM",
       "ES5",
       "ES6",
-      "ES7"
+      "ES7",
+      "ES2021.String"
     ]
   },
   "include": [