Merge branch 'dev' into plugin_system

.eslintignore

@@ -64,13 +64,10 @@ CliClient/build/
 # AUTO-GENERATED - EXCLUDED TYPESCRIPT BUILD
 CliClient/app/LinkSelector.js
 CliClient/app/services/plugins/PluginRunner.js
-CliClient/tests/InMemoryCache.js
 CliClient/tests/models_Setting.js
 CliClient/tests/services_CommandService.js
 CliClient/tests/services_InteropService.js
 CliClient/tests/services_PluginService.js
-CliClient/tests/services_rest_Api.js
-CliClient/tests/services/plugins/api/JoplinSetting.js
 CliClient/tests/services/plugins/sandboxProxy.js
 CliClient/tests/synchronizer_LockHandler.js
 CliClient/tests/synchronizer_MigrationHandler.js
@@ -80,7 +77,6 @@ ElectronClient/commands/copyDevCommand.js
 ElectronClient/commands/focusElement.js
 ElectronClient/commands/startExternalEditing.js
 ElectronClient/commands/stopExternalEditing.js
-ElectronClient/commands/toggleExternalEditing.js
 ElectronClient/ElectronAppWrapper.js
 ElectronClient/global.d.js
 ElectronClient/gui/Button/Button.js
@@ -201,22 +197,13 @@ ReactNativeClient/lib/checkPermissions.js
 ReactNativeClient/lib/commands/historyBackward.js
 ReactNativeClient/lib/commands/historyForward.js
 ReactNativeClient/lib/commands/synchronize.js
-ReactNativeClient/lib/components/BackButtonDialogBox.js
-ReactNativeClient/lib/components/CameraView.js
-ReactNativeClient/lib/components/NoteBodyViewer/hooks/useOnMessage.js
-ReactNativeClient/lib/components/NoteBodyViewer/hooks/useOnResourceLongPress.js
-ReactNativeClient/lib/components/NoteBodyViewer/hooks/useSource.js
-ReactNativeClient/lib/components/NoteBodyViewer/NoteBodyViewer.js
-ReactNativeClient/lib/components/screens/Note.js
 ReactNativeClient/lib/components/screens/UpgradeSyncTargetScreen.js
-ReactNativeClient/lib/components/SelectDateTimeDialog.js
 ReactNativeClient/lib/errorUtils.js
 ReactNativeClient/lib/eventManager.js
 ReactNativeClient/lib/hooks/useEffectDebugger.js
 ReactNativeClient/lib/hooks/useImperativeHandlerDebugger.js
 ReactNativeClient/lib/hooks/usePrevious.js
 ReactNativeClient/lib/hooks/usePropsDebugger.js
-ReactNativeClient/lib/InMemoryCache.js
 ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/checkbox.js
 ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/fence.js
 ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/mermaid.js
@@ -228,7 +215,6 @@ ReactNativeClient/lib/markdownUtils.js
 ReactNativeClient/lib/models/Alarm.js
 ReactNativeClient/lib/models/Setting.js
 ReactNativeClient/lib/ntpDate.js
-ReactNativeClient/lib/PoorManIntervals.js
 ReactNativeClient/lib/reducer.js
 ReactNativeClient/lib/services/AlarmService.js
 ReactNativeClient/lib/services/AlarmServiceDriver.android.js
@@ -274,13 +260,11 @@ ReactNativeClient/lib/services/plugins/api/JoplinSettings.js
 ReactNativeClient/lib/services/plugins/api/JoplinViews.js
 ReactNativeClient/lib/services/plugins/api/JoplinViewsDialogs.js
 ReactNativeClient/lib/services/plugins/api/JoplinViewsMenuItems.js
-ReactNativeClient/lib/services/plugins/api/JoplinViewsMenus.js
 ReactNativeClient/lib/services/plugins/api/JoplinViewsPanels.js
 ReactNativeClient/lib/services/plugins/api/JoplinViewsToolbarButtons.js
 ReactNativeClient/lib/services/plugins/api/JoplinWorkspace.js
 ReactNativeClient/lib/services/plugins/api/types.js
 ReactNativeClient/lib/services/plugins/BasePluginRunner.js
-ReactNativeClient/lib/services/plugins/MenuController.js
 ReactNativeClient/lib/services/plugins/MenuItemController.js
 ReactNativeClient/lib/services/plugins/Plugin.js
 ReactNativeClient/lib/services/plugins/PluginService.js

.github/PULL_REQUEST_TEMPLATE

@@ -20,6 +20,6 @@ If it's not related to any platform (such as a translation, change to the docume
 
 Then please append the issue that you've addressed or fixed. Use "Resolves #123" for new features or improvements and "Fixes #123" for bug fixes.
 
-AND PLEASE READ THE GUIDE: https://github.com/laurent22/joplin/blob/dev/CONTRIBUTING.md
+AND PLEASE READ THE GUIDE: https://github.com/laurent22/joplin/blob/master/CONTRIBUTING.md
 
 -->

.gitignore

@@ -58,13 +58,10 @@ plugin_types/
 # AUTO-GENERATED - EXCLUDED TYPESCRIPT BUILD
 CliClient/app/LinkSelector.js
 CliClient/app/services/plugins/PluginRunner.js
-CliClient/tests/InMemoryCache.js
 CliClient/tests/models_Setting.js
 CliClient/tests/services_CommandService.js
 CliClient/tests/services_InteropService.js
 CliClient/tests/services_PluginService.js
-CliClient/tests/services_rest_Api.js
-CliClient/tests/services/plugins/api/JoplinSetting.js
 CliClient/tests/services/plugins/sandboxProxy.js
 CliClient/tests/synchronizer_LockHandler.js
 CliClient/tests/synchronizer_MigrationHandler.js
@@ -74,7 +71,6 @@ ElectronClient/commands/copyDevCommand.js
 ElectronClient/commands/focusElement.js
 ElectronClient/commands/startExternalEditing.js
 ElectronClient/commands/stopExternalEditing.js
-ElectronClient/commands/toggleExternalEditing.js
 ElectronClient/ElectronAppWrapper.js
 ElectronClient/global.d.js
 ElectronClient/gui/Button/Button.js
@@ -195,22 +191,13 @@ ReactNativeClient/lib/checkPermissions.js
 ReactNativeClient/lib/commands/historyBackward.js
 ReactNativeClient/lib/commands/historyForward.js
 ReactNativeClient/lib/commands/synchronize.js
-ReactNativeClient/lib/components/BackButtonDialogBox.js
-ReactNativeClient/lib/components/CameraView.js
-ReactNativeClient/lib/components/NoteBodyViewer/hooks/useOnMessage.js
-ReactNativeClient/lib/components/NoteBodyViewer/hooks/useOnResourceLongPress.js
-ReactNativeClient/lib/components/NoteBodyViewer/hooks/useSource.js
-ReactNativeClient/lib/components/NoteBodyViewer/NoteBodyViewer.js
-ReactNativeClient/lib/components/screens/Note.js
 ReactNativeClient/lib/components/screens/UpgradeSyncTargetScreen.js
-ReactNativeClient/lib/components/SelectDateTimeDialog.js
 ReactNativeClient/lib/errorUtils.js
 ReactNativeClient/lib/eventManager.js
 ReactNativeClient/lib/hooks/useEffectDebugger.js
 ReactNativeClient/lib/hooks/useImperativeHandlerDebugger.js
 ReactNativeClient/lib/hooks/usePrevious.js
 ReactNativeClient/lib/hooks/usePropsDebugger.js
-ReactNativeClient/lib/InMemoryCache.js
 ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/checkbox.js
 ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/fence.js
 ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/mermaid.js
@@ -222,7 +209,6 @@ ReactNativeClient/lib/markdownUtils.js
 ReactNativeClient/lib/models/Alarm.js
 ReactNativeClient/lib/models/Setting.js
 ReactNativeClient/lib/ntpDate.js
-ReactNativeClient/lib/PoorManIntervals.js
 ReactNativeClient/lib/reducer.js
 ReactNativeClient/lib/services/AlarmService.js
 ReactNativeClient/lib/services/AlarmServiceDriver.android.js
@@ -268,13 +254,11 @@ ReactNativeClient/lib/services/plugins/api/JoplinSettings.js
 ReactNativeClient/lib/services/plugins/api/JoplinViews.js
 ReactNativeClient/lib/services/plugins/api/JoplinViewsDialogs.js
 ReactNativeClient/lib/services/plugins/api/JoplinViewsMenuItems.js
-ReactNativeClient/lib/services/plugins/api/JoplinViewsMenus.js
 ReactNativeClient/lib/services/plugins/api/JoplinViewsPanels.js
 ReactNativeClient/lib/services/plugins/api/JoplinViewsToolbarButtons.js
 ReactNativeClient/lib/services/plugins/api/JoplinWorkspace.js
 ReactNativeClient/lib/services/plugins/api/types.js
 ReactNativeClient/lib/services/plugins/BasePluginRunner.js
-ReactNativeClient/lib/services/plugins/MenuController.js
 ReactNativeClient/lib/services/plugins/MenuItemController.js
 ReactNativeClient/lib/services/plugins/Plugin.js
 ReactNativeClient/lib/services/plugins/PluginService.js

CONTRIBUTING.md

@@ -38,7 +38,7 @@ If you want to start contributing to the project's code, please follow these gui
 - All the applications share the same backend (database, synchronisation, settings, models, business logic, etc.) so if you change something in the backend in one app, makes sure it still work in the other apps. Usually it does, but keep this in mind.
 - Pull requests that make many changes using an automated tool, like for spell fixing, styling, etc. will not be accepted. An exception would be if the changes have been discussed in the forum and someone has agreed to review **and test** the pull request.
 
-Building the apps is relatively easy - please [see the build instructions](https://github.com/laurent22/joplin/blob/dev/BUILD.md) for more details.
+Building the apps is relatively easy - please [see the build instructions](https://github.com/laurent22/joplin/blob/master/BUILD.md) for more details.
 
 ## Coding style
 

CliClient/app/command-config.js

@@ -124,6 +124,7 @@ class Command extends BaseCommand {
 
 		if (args.name == 'locale') {
 			setLocale(Setting.value('locale'));
+			app().onLocaleChanged();
 		}
 
 		await Setting.saveAll();

CliClient/locales-build/index.js

@@ -42,38 +42,38 @@ stats['ar'] = {"percentDone":80};
 stats['eu'] = {"percentDone":34};
 stats['bs_BA'] = {"percentDone":83};
 stats['bg_BG'] = {"percentDone":66};
-stats['ca'] = {"percentDone":96};
-stats['hr_HR'] = {"percentDone":27};
+stats['ca'] = {"percentDone":53};
+stats['hr_HR'] = {"percentDone":28};
 stats['cs_CZ'] = {"percentDone":82};
 stats['da_DK'] = {"percentDone":74};
-stats['de_DE'] = {"percentDone":98};
+stats['de_DE'] = {"percentDone":95};
 stats['et_EE'] = {"percentDone":66};
 stats['en_GB'] = {"percentDone":100};
 stats['en_US'] = {"percentDone":100};
 stats['es_ES'] = {"percentDone":95};
 stats['eo'] = {"percentDone":38};
-stats['fr_FR'] = {"percentDone":99};
+stats['fr_FR'] = {"percentDone":94};
 stats['gl_ES'] = {"percentDone":43};
 stats['id_ID'] = {"percentDone":93};
-stats['it_IT'] = {"percentDone":90};
+stats['it_IT'] = {"percentDone":91};
+stats['nl_NL'] = {"percentDone":96};
 stats['nl_BE'] = {"percentDone":34};
-stats['nl_NL'] = {"percentDone":95};
 stats['nb_NO'] = {"percentDone":88};
-stats['fa'] = {"percentDone":83};
-stats['pl_PL'] = {"percentDone":98};
-stats['pt_PT'] = {"percentDone":88};
+stats['fa'] = {"percentDone":80};
+stats['pl_PL'] = {"percentDone":96};
+stats['pt_PT'] = {"percentDone":89};
 stats['pt_BR'] = {"percentDone":96};
-stats['ro'] = {"percentDone":77};
+stats['ro'] = {"percentDone":78};
 stats['sl_SI'] = {"percentDone":42};
-stats['sv'] = {"percentDone":70};
+stats['sv'] = {"percentDone":71};
 stats['th_TH'] = {"percentDone":52};
 stats['vi'] = {"percentDone":85};
-stats['tr_TR'] = {"percentDone":98};
+stats['tr_TR'] = {"percentDone":96};
 stats['el_GR'] = {"percentDone":96};
 stats['ru_RU'] = {"percentDone":95};
-stats['sr_RS'] = {"percentDone":71};
+stats['sr_RS'] = {"percentDone":72};
 stats['zh_CN'] = {"percentDone":96};
 stats['zh_TW'] = {"percentDone":95};
-stats['ja_JP'] = {"percentDone":98};
-stats['ko'] = {"percentDone":98};
+stats['ja_JP'] = {"percentDone":96};
+stats['ko'] = {"percentDone":86};
 module.exports = { locales: locales, stats: stats };

CliClient/package-lock.json

@@ -4199,6 +4199,11 @@
       "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
       "integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4="
     },
+    "memory-cache": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/memory-cache/-/memory-cache-0.2.0.tgz",
+      "integrity": "sha1-eJCwHVLADI68nVM+H46xfjA0hxo="
+    },
     "micromatch": {
       "version": "3.1.10",
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
@@ -5896,9 +5901,9 @@
       }
     },
     "slug": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/slug/-/slug-3.5.0.tgz",
-      "integrity": "sha512-+pZLDhMtmAc+ZcojQSMlUKDZBYmvhZiZmK8Ffx/D3Q/MIMHPDBAMbWvWN8vJb9xl2MfbDdRWxFzrdOhBiyVpow=="
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/slug/-/slug-3.3.4.tgz",
+      "integrity": "sha512-VpHbtRCEWmgaZsrZcTsVl/Dhw98lcrOYDO17DNmJCNpppI6s3qJvnNu2Q3D4L84/2bi6vkW40mjNQI9oGQsflg=="
     },
     "snapdragon": {
       "version": "0.8.2",

CliClient/package.json

@@ -6,7 +6,7 @@
   "scripts": {
     "test": "gulp buildTests -L && node node_modules/jasmine/bin/jasmine.js --fail-fast=true --config=tests/support/jasmine.json",
     "test-ci": "gulp buildTests -L && node node_modules/jasmine/bin/jasmine.js --config=tests/support/jasmine.json",
-    "postinstall": "npm run build && patch-package --patch-dir ../patches/shared && patch-package --patch-dir ../patches/node",
+    "postinstall": "npm run build && patch-package --patch-dir ../patches",
     "build": "gulp build",
     "start": "gulp build -L && node 'build/main.js' --stack-trace-enabled --log-level debug --env dev"
   },
@@ -80,6 +80,7 @@
     "markdown-it-toc-done-right": "^4.1.0",
     "md5": "^2.2.1",
     "md5-file": "^4.0.0",
+    "memory-cache": "^0.2.0",
     "mime": "^2.0.3",
     "moment": "^2.24.0",
     "multiparty": "^4.2.1",
@@ -101,7 +102,7 @@
     "sax": "^1.2.4",
     "server-destroy": "^1.0.1",
     "sharp": "^0.23.2",
-    "slug": "^3.5.0",
+    "slug": "^3.3.4",
     "sprintf-js": "^1.1.1",
     "sqlite3": "^4.1.1",
     "string-padding": "^1.0.2",

CliClient/tests/InMemoryCache.ts

@@ -1,59 +0,0 @@
-import InMemoryCache from 'lib/InMemoryCache';
-const { time } = require('lib/time-utils.js');
-
-describe('InMemoryCache', function() {
-
-	it('should get and set values', () => {
-		const cache = new InMemoryCache();
-
-		expect(cache.value('test')).toBe(undefined);
-		expect(cache.value('test', 'default')).toBe('default');
-
-		cache.setValue('test', 'something');
-		expect(cache.value('test')).toBe('something');
-
-		// Check we get the exact same object back (cache should not copy)
-		const someObj = { abcd: '123' };
-		cache.setValue('someObj', someObj);
-		expect(cache.value('someObj')).toBe(someObj);
-	});
-
-	it('should expire values', async () => {
-		const cache = new InMemoryCache();
-
-		// Check that the value is udefined once the cache has expired
-		cache.setValue('test', 'something', 500);
-		expect(cache.value('test')).toBe('something');
-		await time.msleep(510);
-		expect(cache.value('test')).toBe(undefined);
-
-		// Check that the TTL is reset every time setValue is called
-		cache.setValue('test', 'something', 300);
-		await time.msleep(100);
-		cache.setValue('test', 'something', 300);
-		await time.msleep(100);
-		cache.setValue('test', 'something', 300);
-		await time.msleep(100);
-		cache.setValue('test', 'something', 300);
-		await time.msleep(100);
-
-		expect(cache.value('test')).toBe('something');
-	});
-
-	it('should delete old records', async () => {
-		const cache = new InMemoryCache(5);
-
-		cache.setValue('1', '1');
-		cache.setValue('2', '2');
-		cache.setValue('3', '3');
-		cache.setValue('4', '4');
-		cache.setValue('5', '5');
-
-		expect(cache.value('1')).toBe('1');
-
-		cache.setValue('6', '6');
-
-		expect(cache.value('1')).toBe(undefined);
-	});
-
-});

CliClient/tests/services/plugins/api/JoplinSetting.ts

@@ -1,16 +0,0 @@
-// import Setting from 'lib/models/Setting';
-
-// const { asyncTest, setupDatabaseAndSynchronizer, switchClient, expectThrow, expectNotThrow } = require('../test-utils.js');
-
-// describe('plugin_api_JoplinSetting', function() {
-
-// 	beforeEach(async (done) => {
-// 		await setupDatabaseAndSynchronizer(1);
-// 		await switchClient(1);
-// 		done();
-// 	});
-
-// 	it('should get and set plugin-specific values', asyncTest(async () => {
-// 		await
-// 	}));
-// });

CliClient/tests/services_PluginService.ts

@@ -2,7 +2,7 @@ import PluginRunner from '../app/services/plugins/PluginRunner';
 import PluginService from 'lib/services/plugins/PluginService';
 
 require('app-module-path').addPath(__dirname);
-const { asyncTest, setupDatabaseAndSynchronizer, switchClient, expectThrow } = require('test-utils.js');
+const { asyncTest, setupDatabaseAndSynchronizer, switchClient } = require('test-utils.js');
 const Note = require('lib/models/Note');
 const Folder = require('lib/models/Folder');
 
@@ -40,7 +40,8 @@ describe('services_PluginService', function() {
 
 	it('should load and run a simple plugin', asyncTest(async () => {
 		const service = newPluginService();
-		await service.loadAndRunPlugins([`${testPluginDir}/simple`]);
+		const plugin = await service.loadPlugin(`${testPluginDir}/simple`);
+		await service.runPlugin(plugin);
 
 		const allFolders = await Folder.all();
 		expect(allFolders.length).toBe(1);
@@ -54,9 +55,9 @@ describe('services_PluginService', function() {
 
 	it('should load and run a plugin that uses external packages', asyncTest(async () => {
 		const service = newPluginService();
-		await service.loadAndRunPlugins([`${testPluginDir}/withExternalModules`]);
-		const plugin = service.pluginById('withexternalmodules');
+		const plugin = await service.loadPlugin(`${testPluginDir}/withExternalModules`);
 		expect(plugin.id).toBe('withexternalmodules');
+		await service.runPlugin(plugin);
 
 		const allFolders = await Folder.all();
 		expect(allFolders.length).toBe(1);
@@ -77,75 +78,4 @@ describe('services_PluginService', function() {
 		expect(allFolders.map((f:any) => f.title).sort().join(', ')).toBe('multi - simple1, multi - simple2');
 	}));
 
-	it('should load plugins from JS bundles', asyncTest(async () => {
-		const service = newPluginService();
-
-		const plugin = await service.loadPluginFromString('example', '/tmp', `
-			/* joplin-manifest:
-			{
-				"manifest_version": 1,
-				"name": "JS Bundle test",
-				"description": "JS Bundle Test plugin",
-				"version": "1.0.0",
-				"author": "Laurent Cozic",
-				"homepage_url": "https://joplinapp.org"
-			}
-			*/
-			
-			joplin.plugins.register({
-				onStart: async function() {
-					await joplin.data.post(['folders'], null, { title: "my plugin folder" });
-				},
-			});
-		`);
-
-		await service.runPlugin(plugin);
-
-		expect(plugin.manifest.manifest_version).toBe(1);
-		expect(plugin.manifest.name).toBe('JS Bundle test');
-
-		const allFolders = await Folder.all();
-		expect(allFolders.length).toBe(1);
-	}));
-
-	it('should load plugins from JS bundle files', asyncTest(async () => {
-		const service = newPluginService();
-		await service.loadAndRunPlugins(`${testPluginDir}/jsbundles`);
-		expect(!!service.pluginById('example')).toBe(true);
-		expect((await Folder.all()).length).toBe(1);
-	}));
-
-	it('should validate JS bundles', asyncTest(async () => {
-		const invalidJsBundles = [
-			`
-				/* joplin-manifest:
-				{
-					"not_a_valid_manifest_at_all": 1
-				}
-				*/
-				
-				joplin.plugins.register({
-					onStart: async function() {},
-				});
-			`, `
-				/* joplin-manifest:
-				*/
-				
-				joplin.plugins.register({
-					onStart: async function() {},
-				});
-			`, `
-				joplin.plugins.register({
-					onStart: async function() {},
-				});
-			`, '',
-		];
-
-		const service = newPluginService();
-
-		for (const jsBundle of invalidJsBundles) {
-			await expectThrow(async () => await service.loadPluginFromString('example', '/tmp', jsBundle));
-		}
-	}));
-
 });

CliClient/tests/services_SearchEngine.js

@@ -4,7 +4,7 @@
 require('app-module-path').addPath(__dirname);
 
 const { time } = require('lib/time-utils.js');
-const { fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, asyncTest, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync, mockDate, restoreDate } = require('test-utils.js');
+const { fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, asyncTest, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('test-utils.js');
 const SearchEngine = require('lib/services/searchengine/SearchEngine');
 const Note = require('lib/models/Note');
 const ItemChange = require('lib/models/ItemChange');
@@ -33,32 +33,16 @@ const calculateScore = (searchString, notes) => {
 	const numTokens = notes.map(note => note.title.split(' ').length);
 	const avgTokens = Math.round(numTokens.reduce((a, b) => a + b, 0) / notes.length);
 
-	const msSinceEpoch = Math.round(new Date().getTime());
-	const msPerDay = 86400000;
-	const weightForDaysSinceLastUpdate = (row) => {
-		// BM25 weights typically range 0-10, and last updated date should weight similarly, though prioritizing recency logarithmically.
-		// An alpha of 200 ensures matches in the last week will show up front (11.59) and often so for matches within 2 weeks (5.99),
-		// but is much less of a factor at 30 days (2.84) or very little after 90 days (0.95), focusing mostly on content at that point.
-		if (!row.user_updated_time) {
-			return 0;
-		}
-
-		const alpha = 200;
-		const daysSinceLastUpdate = (msSinceEpoch - row.user_updated_time) / msPerDay;
-		return alpha * Math.log(1 + 1 / Math.max(daysSinceLastUpdate, 0.5));
-	};
-
-	let titleBM25WeightedByLastUpdate = new Array(notes.length).fill(-1);
+	let titleBM25 = new Array(notes.length).fill(-1);
 	if (avgTokens != 0) {
 		for (let i = 0; i < notes.length; i++) {
-			titleBM25WeightedByLastUpdate[i] = IDF(notes.length, notesWithWord) * ((freqTitle[i] * (K1 + 1)) / (freqTitle[i] + K1 * (1 - B + B * (numTokens[i] / avgTokens))));
-			titleBM25WeightedByLastUpdate[i] += weightForDaysSinceLastUpdate(notes[i]);
+			titleBM25[i] = IDF(notes.length, notesWithWord) * ((freqTitle[i] * (K1 + 1)) / (freqTitle[i] + K1 * (1 - B + B * (numTokens[i] / avgTokens))));
 		}
 	}
 
 	const scores = [];
 	for (let i = 0; i < notes.length; i++) {
-		if (freqTitle[i]) scores.push(titleBM25WeightedByLastUpdate[i]);
+		if (freqTitle[i]) scores.push(titleBM25[i]);
 	}
 
 	scores.sort().reverse();
@@ -158,54 +142,33 @@ describe('services_SearchEngine', function() {
 		expect(rows[1].id).toBe(n2.id);
 	}));
 
-	it('should correctly weigh notes using BM25 and user_updated_time', asyncTest(async () => {
-		await mockDate(2020, 9, 30, 50);
+	it('should correctly weigh notes using BM25', asyncTest(async () => {
+
 		const noteData = [
 			{
 				title: 'abc test2 test2',
-				updated_time: 1601425064756,
-				user_updated_time: 1601425064756,
-				created_time: 1601425064756,
-				user_created_time: 1601425064756,
 			},
 			{
 				title: 'foo foo',
-				updated_time: 1601425064758,
-				user_updated_time: 1601425064758,
-				created_time: 1601425064758,
-				user_created_time: 1601425064758,
 			},
 			{
 				title: 'dead beef',
-				updated_time: 1601425064760,
-				user_updated_time: 1601425064760,
-				created_time: 1601425064760,
-				user_created_time: 1601425064760,
 			},
 			{
 				title: 'test2 bar',
-				updated_time: 1601425064761,
-				user_updated_time: 1601425064761,
-				created_time: 1601425064761,
-				user_created_time: 1601425064761,
 			},
 			{
 				title: 'blah blah abc',
-				updated_time: 1601425064763,
-				user_updated_time: 1601425064763,
-				created_time: 1601425064763,
-				user_created_time: 1601425064763,
 			},
 		];
 
-		const n0 = await Note.save(noteData[0], { autoTimestamp: false });
-		const n1 = await Note.save(noteData[1], { autoTimestamp: false });
-		const n2 = await Note.save(noteData[2], { autoTimestamp: false });
-		const n3 = await Note.save(noteData[3], { autoTimestamp: false });
-		const n4 = await Note.save(noteData[4], { autoTimestamp: false });
-		restoreDate();
+		const n0 = await Note.save(noteData[0]);
+		const n1 = await Note.save(noteData[1]);
+		const n2 = await Note.save(noteData[2]);
+		const n3 = await Note.save(noteData[3]);
+		const n4 = await Note.save(noteData[4]);
+
 		await engine.syncTables();
-		await mockDate(2020, 9, 30, 50);
 
 		let searchString = 'abc';
 		let scores = calculateScore(searchString, noteData);
@@ -235,7 +198,6 @@ describe('services_SearchEngine', function() {
 		// console.log(scores);
 
 		expect(rows[0].weight).toEqual(scores[0]);
-		await restoreDate();
 	}));
 
 	it('should tell where the results are found', asyncTest(async () => {

CliClient/tests/services_rest_Api.js

@@ -1,18 +1,21 @@
-import Api from 'lib/services/rest/Api';
-import shim from 'lib/shim';
+/* eslint-disable no-unused-vars */
+
+require('app-module-path').addPath(__dirname);
 
 const { asyncTest, setupDatabaseAndSynchronizer, switchClient, checkThrowAsync } = require('test-utils.js');
+const Api = require('lib/services/rest/Api').default;
 const Folder = require('lib/models/Folder');
 const Resource = require('lib/models/Resource');
 const Note = require('lib/models/Note');
 const Tag = require('lib/models/Tag');
 const NoteTag = require('lib/models/NoteTag');
+const shim = require('lib/shim').default;
 
 process.on('unhandledRejection', (reason, p) => {
 	console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
 });
 
-let api:Api = null;
+let api = null;
 
 describe('services_rest_Api', function() {
 
@@ -25,23 +28,21 @@ describe('services_rest_Api', function() {
 
 	it('should ping', asyncTest(async () => {
 		const response = await api.route('GET', 'ping');
-		expect(response).toBe('JoplinClipperServer');
 	}));
 
 	it('should handle Not Found errors', asyncTest(async () => {
 		const hasThrown = await checkThrowAsync(async () => await api.route('GET', 'pong'));
-		expect(hasThrown).toBe(true);
 	}));
 
 	it('should get folders', asyncTest(async () => {
-		await Folder.save({ title: 'mon carnet' });
+		const f1 = await Folder.save({ title: 'mon carnet' });
 		const response = await api.route('GET', 'folders');
 		expect(response.length).toBe(1);
 	}));
 
 	it('should update folders', asyncTest(async () => {
 		const f1 = await Folder.save({ title: 'mon carnet' });
-		await api.route('PUT', `folders/${f1.id}`, null, JSON.stringify({
+		const response = await api.route('PUT', `folders/${f1.id}`, null, JSON.stringify({
 			title: 'modifié',
 		}));
 
@@ -83,8 +84,8 @@ describe('services_rest_Api', function() {
 		const response2 = await api.route('GET', `folders/${f1.id}/notes`);
 		expect(response2.length).toBe(0);
 
-		await Note.save({ title: 'un', parent_id: f1.id });
-		await Note.save({ title: 'deux', parent_id: f1.id });
+		const n1 = await Note.save({ title: 'un', parent_id: f1.id });
+		const n2 = await Note.save({ title: 'deux', parent_id: f1.id });
 		const response = await api.route('GET', `folders/${f1.id}/notes`);
 		expect(response.length).toBe(2);
 	}));
@@ -99,7 +100,7 @@ describe('services_rest_Api', function() {
 		const f1 = await Folder.save({ title: 'mon carnet' });
 		const f2 = await Folder.save({ title: 'mon deuxième carnet' });
 		const n1 = await Note.save({ title: 'un', parent_id: f1.id });
-		await Note.save({ title: 'deux', parent_id: f1.id });
+		const n2 = await Note.save({ title: 'deux', parent_id: f1.id });
 		const n3 = await Note.save({ title: 'trois', parent_id: f2.id });
 
 		response = await api.route('GET', 'notes');
@@ -133,41 +134,6 @@ describe('services_rest_Api', function() {
 		expect(!!response.id).toBe(true);
 	}));
 
-	it('should allow setting note properties', asyncTest(async () => {
-		let response:any = null;
-		const f = await Folder.save({ title: 'mon carnet' });
-
-		response = await api.route('POST', 'notes', null, JSON.stringify({
-			title: 'testing',
-			parent_id: f.id,
-			latitude: '48.732071',
-			longitude: '-3.458700',
-			altitude: '21',
-		}));
-
-		const noteId = response.id;
-
-		{
-			const note = await Note.load(noteId);
-			expect(note.latitude).toBe('48.73207100');
-			expect(note.longitude).toBe('-3.45870000');
-			expect(note.altitude).toBe('21.0000');
-		}
-
-		await api.route('PUT', `notes/${noteId}`, null, JSON.stringify({
-			latitude: '49',
-			longitude: '-3',
-			altitude: '22',
-		}));
-
-		{
-			const note = await Note.load(noteId);
-			expect(note.latitude).toBe('49.00000000');
-			expect(note.longitude).toBe('-3.00000000');
-			expect(note.altitude).toBe('22.0000');
-		}
-	}));
-
 	it('should preserve user timestamps when creating notes', asyncTest(async () => {
 		let response = null;
 		const f = await Folder.save({ title: 'mon carnet' });
@@ -255,9 +221,10 @@ describe('services_rest_Api', function() {
 	}));
 
 	it('should delete resources', asyncTest(async () => {
+		let response = null;
 		const f = await Folder.save({ title: 'mon carnet' });
 
-		await api.route('POST', 'notes', null, JSON.stringify({
+		response = await api.route('POST', 'notes', null, JSON.stringify({
 			title: 'testing image',
 			parent_id: f.id,
 			image_data_url: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAIAAABLbSncAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAANZJREFUeNoAyAA3/wFwtO3K6gUB/vz2+Prw9fj/+/r+/wBZKAAExOgF4/MC9ff+MRH6Ui4E+/0Bqc/zutj6AgT+/Pz7+vv7++nu82c4DlMqCvLs8goA/gL8/fz09fb59vXa6vzZ6vjT5fbn6voD/fwC8vX4UiT9Zi//APHyAP8ACgUBAPv5APz7BPj2+DIaC2o3E+3o6ywaC5fT6gD6/QD9/QEVf9kD+/dcLQgJA/7v8vqfwOf18wA1IAIEVycAyt//v9XvAPv7APz8LhoIAPz9Ri4OAgwARgx4W/6fVeEAAAAASUVORK5CYII=',
@@ -319,7 +286,7 @@ describe('services_rest_Api', function() {
 		const tag = await Tag.save({ title: 'mon étiquette' });
 		const note = await Note.save({ title: 'ma note' });
 
-		await api.route('POST', `tags/${tag.id}/notes`, null, JSON.stringify({
+		const response = await api.route('POST', `tags/${tag.id}/notes`, null, JSON.stringify({
 			id: note.id,
 		}));
 
@@ -332,7 +299,7 @@ describe('services_rest_Api', function() {
 		const note = await Note.save({ title: 'ma note' });
 		await Tag.addNote(tag.id, note.id);
 
-		await api.route('DELETE', `tags/${tag.id}/notes/${note.id}`);
+		const response = await api.route('DELETE', `tags/${tag.id}/notes/${note.id}`);
 
 		const noteIds = await Tag.noteIds(tag.id);
 		expect(noteIds.length).toBe(0);

CliClient/tests/support/jasmine.json

@@ -3,7 +3,6 @@
   "spec_files": [
     "*.js",
     "services/plugins/*.js",
-    "services/plugins/api/*.js",
     "!test-utils.js"
   ],
   "stopSpecOnExpectationFailure": false,

CliClient/tests/support/plugins/jsbundles/example.js

@@ -1,16 +0,0 @@
-/* joplin-manifest:
-{
-	"manifest_version": 1,
-	"name": "JS Bundle test",
-	"description": "JS Bundle Test plugin",
-	"version": "1.0.0",
-	"author": "Laurent Cozic",
-	"homepage_url": "https://joplinapp.org"
-}
-*/
-
-joplin.plugins.register({
-	onStart: async function() {
-		await joplin.data.post(['folders'], null, { title: "my plugin folder" });
-	},
-});

CliClient/tests/support/plugins/menu/.gitignore

@@ -1,2 +0,0 @@
-dist/*
-node_modules/

CliClient/tests/support/plugins/menu/README.md

@@ -1,14 +0,0 @@
-# Joplin Plugin
-
-This is a template to create a new Joplin plugin.
-
-The main two files you will want to look at are:
-
-- `/src/index.ts`, which contains the entry point for the plugin source code.
-- `/src/manifest.json`, which is the plugin manifest. It contains information such as the plugin a name, version, etc.
-
-The plugin is built using webpack, which create the compiled code in `/dist`. The project is setup to use TypeScript, although you can change the configuration to use plain JavaScript.
-
-## Building the plugin
-
-To build the plugin, simply run `npm run dist`.

CliClient/tests/support/plugins/menu/api/Global.d.ts

@@ -1,15 +0,0 @@
-import Plugin from '../Plugin';
-import Joplin from './Joplin';
-import Logger from 'lib/Logger';
-/**
- * @ignore
- */
-export default class Global {
-    private joplin_;
-    private requireWhiteList_;
-    constructor(logger: Logger, implementation: any, plugin: Plugin, store: any);
-    get joplin(): Joplin;
-    private requireWhiteList;
-    require(filePath: string): any;
-    get process(): any;
-}

CliClient/tests/support/plugins/menu/api/Joplin.d.ts

@@ -1,38 +0,0 @@
-import Plugin from '../Plugin';
-import JoplinData from './JoplinData';
-import JoplinPlugins from './JoplinPlugins';
-import JoplinWorkspace from './JoplinWorkspace';
-import JoplinFilters from './JoplinFilters';
-import JoplinCommands from './JoplinCommands';
-import JoplinViews from './JoplinViews';
-import JoplinInterop from './JoplinInterop';
-import JoplinSettings from './JoplinSettings';
-import Logger from 'lib/Logger';
-/**
- * This is the main entry point to the Joplin API. You can access various services using the provided accessors.
- */
-export default class Joplin {
-    private data_;
-    private plugins_;
-    private workspace_;
-    private filters_;
-    private commands_;
-    private views_;
-    private interop_;
-    private settings_;
-    constructor(logger: Logger, implementation: any, plugin: Plugin, store: any);
-    get data(): JoplinData;
-    get plugins(): JoplinPlugins;
-    get workspace(): JoplinWorkspace;
-    /**
-     * @ignore
-     *
-     * Not sure if it's the best way to hook into the app
-     * so for now disable filters.
-     */
-    get filters(): JoplinFilters;
-    get commands(): JoplinCommands;
-    get views(): JoplinViews;
-    get interop(): JoplinInterop;
-    get settings(): JoplinSettings;
-}

CliClient/tests/support/plugins/menu/api/JoplinCommands.d.ts

@@ -1,51 +0,0 @@
-import { Command } from './types';
-/**
- * This class allows executing or registering new Joplin commands. Commands can be executed or associated with
- * {@link JoplinViewsToolbarButtons | toolbar buttons} or {@link JoplinViewsMenuItems | menu items}.
- *
- * [View the demo plugin](https://github.com/laurent22/joplin/tree/dev/CliClient/tests/support/plugins/register_command)
- *
- * ## Executing Joplin's internal commands
- *
- * It is also possible to execute internal Joplin's commands which, as of now, are not well documented.
- * You can find the list directly on GitHub though at the following locations:
- *
- * https://github.com/laurent22/joplin/tree/dev/ElectronClient/gui/MainScreen/commands
- * https://github.com/laurent22/joplin/tree/dev/ElectronClient/commands
- * https://github.com/laurent22/joplin/tree/dev/ElectronClient/gui/NoteEditor/commands/editorCommandDeclarations.ts
- *
- * To view what arguments are supported, you can open any of these files and look at the `execute()` command.
- */
-export default class JoplinCommands {
-    /**
-     * <span class="platform-desktop">desktop</span> Executes the given command.
-     * The `props` are the arguments passed to the command, and they vary based on the command
-     *
-     * ```typescript
-     * // Create a new note in the current notebook:
-     * await joplin.commands.execute('newNote');
-     *
-     * // Create a new sub-notebook under the provided notebook
-     * // Note: internally, notebooks are called "folders".
-     * await joplin.commands.execute('newFolder', { parent_id: "SOME_FOLDER_ID" });
-     * ```
-     */
-    execute(commandName: string, props?: any): Promise<any>;
-    /**
-     * <span class="platform-desktop">desktop</span> Registers a new command.
-     *
-     * ```typescript
-     * // Register a new commmand called "testCommand1"
-     *
-     * await joplin.commands.register({
-     *     name: 'testCommand1',
-     *     label: 'My Test Command 1',
-     *     iconName: 'fas fa-music',
-     *     execute: () => {
-     *         alert('Testing plugin command 1');
-     *     },
-     * });
-     * ```
-     */
-    register(command: Command): Promise<void>;
-}

CliClient/tests/support/plugins/menu/api/JoplinData.d.ts

@@ -1,47 +0,0 @@
-import { Path } from './types';
-/**
- * This module provides access to the Joplin data API: https://joplinapp.org/api/references/rest_api/
- * This is the main way to retrieve data, such as notes, notebooks, tags, etc.
- * or to update them or delete them.
- *
- * This is also what you would use to search notes, via the `search` endpoint.
- *
- * [View the demo plugin](https://github.com/laurent22/joplin/tree/dev/CliClient/tests/support/plugins/simple)
- *
- * In general you would use the methods in this class as if you were using a REST API. There are four methods that map to GET, POST, PUT and DELETE calls.
- * And each method takes these parameters:
- *
- * * `path`: This is an array that represents the path to the resource in the form `["resouceName", "resourceId", "resourceLink"]` (eg. ["tags", ":id", "notes"]). The "resources" segment is the name of the resources you want to access (eg. "notes", "folders", etc.). If not followed by anything, it will refer to all the resources in that collection. The optional "resourceId" points to a particular resources within the collection. Finally, an optional "link" can be present, which links the resource to a collection of resources. This can be used in the API for example to retrieve all the notes associated with a tag.
- * * `query`: (Optional) The query parameters. In a URL, this is the part after the question mark "?". In this case, it should be an object with key/value pairs.
- * * `data`: (Optional) Applies to PUT and POST calls only. The request body contains the data you want to create or modify, for example the content of a note or folder.
- * * `files`: (Optional) Used to create new resources and associate them with files.
- *
- * Please refer to the [Joplin API documentation](https://joplinapp.org/api/references/rest_api/) for complete details about each call. As the plugin runs within the Joplin application **you do not need an authorisation token** to use this API.
- *
- * For example:
- *
- * ```typescript
- * // Get a note ID, title and body
- * const noteId = 'some_note_id';
- * const note = await joplin.data.get(['notes', noteId], { fields: ['id', 'title', 'body'] });
- *
- * // Get all folders
- * const folders = await joplin.data.get(['folders']);
- *
- * // Set the note body
- * await joplin.data.put(['notes', noteId], null, { body: "New note body" });
- *
- * // Create a new note under one of the folders
- * await joplin.data.post(['notes'], null, { body: "my new note", title: "some title", parent_id: folders[0].id });
- * ```
- */
-export default class JoplinData {
-    private api_;
-    private pathSegmentRegex_;
-    private serializeApiBody;
-    private pathToString;
-    get(path: Path, query?: any): Promise<any>;
-    post(path: Path, query?: any, body?: any, files?: any[]): Promise<any>;
-    put(path: Path, query?: any, body?: any, files?: any[]): Promise<any>;
-    delete(path: Path, query?: any): Promise<any>;
-}

CliClient/tests/support/plugins/menu/api/JoplinFilters.d.ts

@@ -1,10 +0,0 @@
-/**
- * @ignore
- *
- * Not sure if it's the best way to hook into the app
- * so for now disable filters.
- */
-export default class JoplinFilters {
-    on(name: string, callback: Function): Promise<void>;
-    off(name: string, callback: Function): Promise<void>;
-}

CliClient/tests/support/plugins/menu/api/JoplinInterop.d.ts

@@ -1,17 +0,0 @@
-import { ExportModule, ImportModule } from './types';
-/**
- * Provides a way to create modules to import external data into Joplin or to export notes into any arbitrary format.
- *
- * [View the demo plugin](https://github.com/laurent22/joplin/tree/dev/CliClient/tests/support/plugins/json_export)
- *
- * To implement an import or export module, you would simply define an object with various event handlers that are called
- * by the application during the import/export process.
- *
- * See the documentation of the [[ExportModule]] and [[ImportModule]] for more information.
- *
- * You may also want to refer to the Joplin API documentation to see the list of properties for each item (note, notebook, etc.) - https://joplinapp.org/api/references/rest_api/
- */
-export default class JoplinInterop {
-    registerExportModule(module: ExportModule): Promise<void>;
-    registerImportModule(module: ImportModule): Promise<void>;
-}

CliClient/tests/support/plugins/menu/api/JoplinPlugins.d.ts

@@ -1,24 +0,0 @@
-import Plugin from '../Plugin';
-import Logger from 'lib/Logger';
-import { Script } from './types';
-/**
- * This class provides access to plugin-related features.
- */
-export default class JoplinPlugins {
-    private logger;
-    private plugin;
-    constructor(logger: Logger, plugin: Plugin);
-    /**
-     * Registers a new plugin. This is the entry point when creating a plugin. You should pass a simple object with an `onStart` method to it.
-     * That `onStart` method will be executed as soon as the plugin is loaded.
-     *
-     * ```typescript
-     * joplin.plugins.register({
-     *     onStart: async function() {
-     *         // Run your plugin code here
-     *     }
-     * });
-     * ```
-     */
-    register(script: Script): Promise<void>;
-}