Refactor SQL Queries

.devcontainer/devcontainer.json

@@ -7,31 +7,31 @@
 		// Update 'VARIANT' to pick a Node version: 18, 16, 14.
 		// Append -bullseye or -buster to pin to an OS version.
 		// Use -bullseye variants on local arm64/Apple Silicon.
-		"args": { "VARIANT": "16-bullseye" }
+		"args": {
+			"VARIANT": "16-bullseye"
+		}
 	},
-
 	// Configure tool-specific properties.
 	"customizations": {
 		// Configure properties specific to VS Code.
 		"vscode": {
 			// Add the IDs of extensions you want installed when the container is created.
 			"extensions": [
 				"dbaeumer.vscode-eslint",
-				"eamodio.gitlens"
+				"eamodio.gitlens",
+				"maty.vscode-mocha-sidebar",
+				"ryanluker.vscode-coverage-gutters"
 			]
 		}
 	},
-
 	// Use 'forwardPorts' to make a list of ports inside the container available locally.
 	// "forwardPorts": [],
-
 	// Use 'postCreateCommand' to run commands after the container is created.
 	"postCreateCommand": "npm install",
-
 	// Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
 	"remoteUser": "node",
 	"features": {
 		"git": "latest",
 		"github-cli": "latest"
 	}
-}
+}

.github/workflows/main.yaml

@@ -1,19 +1,27 @@
 name: CI
 
 on:
-    push:
-        branches: [master]
-    pull_request:
-        branches: [master]
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
 
 jobs:
-    lint-and-test:
-        runs-on: ubuntu-latest
-        steps:
-            - uses: actions/checkout@v2
+  lint-and-test:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
 
-            - name: Install modules
-              run: npm install
+    - name: Use Node.js
+      uses: actions/setup-node@v3
+      with:
+          node-version: "16.x"
 
-            - name: Lint
-              run: npm run lint
+    - name: Install modules
+      run: npm install
+
+    - name: Lint
+      run: npm run lint
+
+    - name: Build
+      run: npm run build

.github/workflows/publish.yaml

@@ -14,11 +14,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Use Node.js
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v3
         with:
-          node-version: "14.x"
+          node-version: "16.x"
       - name: Build
         id: build
         run: |

.gitignore

@@ -20,3 +20,8 @@ data.json
 
 # Exclude macOS Finder (System Explorer) View States
 .DS_Store
+
+lib
+coverage
+.nyc_output
+KoboReader.sqlite

.mocharc.json

@@ -0,0 +1,8 @@
+{
+    "extension": [
+        "ts"
+    ],
+    "spec": "src/**/*.test.ts",
+    "require": "ts-node/register",
+    "timeout": "10000"
+}

.vscode/settings.json

@@ -0,0 +1,9 @@
+{
+    "mocha.files.glob": "src/**/*.test.ts",
+    "mocha.requires": [
+        "ts-node/register"
+    ],
+    "mocha.options": {
+        "timeout": "10000"
+    }
+}

manifest.json

@@ -1,7 +1,7 @@
 {
 	"id": "obsidian-kobo-highlights-importer-plugin",
 	"name": "Kobo Highlights Importer",
-	"version": "1.1.1",
+	"version": "1.2.0-beta.1",
 	"minAppVersion": "0.15.9",
 	"description": "Import highlights from your Kobo device",
 	"author": "Kevin Hellemun",