Exclude from search commands without a label

.eslintignore

@@ -64,13 +64,10 @@ CliClient/build/
 # AUTO-GENERATED - EXCLUDED TYPESCRIPT BUILD
 CliClient/app/LinkSelector.js
 CliClient/app/services/plugins/PluginRunner.js
-CliClient/tests/fsDriver.js
 CliClient/tests/InMemoryCache.js
-CliClient/tests/MdToHtml.js
 CliClient/tests/models_Setting.js
 CliClient/tests/services_CommandService.js
 CliClient/tests/services_InteropService.js
-CliClient/tests/services_keychainService.js
 CliClient/tests/services_PluginService.js
 CliClient/tests/services_rest_Api.js
 CliClient/tests/services/plugins/api/JoplinSetting.js
@@ -81,7 +78,6 @@ ElectronClient/app.js
 ElectronClient/bridge.js
 ElectronClient/commands/copyDevCommand.js
 ElectronClient/commands/focusElement.js
-ElectronClient/commands/openProfileDirectory.js
 ElectronClient/commands/startExternalEditing.js
 ElectronClient/commands/stopExternalEditing.js
 ElectronClient/commands/toggleExternalEditing.js
@@ -184,7 +180,6 @@ ElectronClient/gui/SideBar/styles/index.js
 ElectronClient/gui/StatusScreen/StatusScreen.js
 ElectronClient/gui/style/StyledInput.js
 ElectronClient/gui/style/StyledTextInput.js
-ElectronClient/gui/TagList.js
 ElectronClient/gui/ToggleEditorsButton/styles/index.js
 ElectronClient/gui/ToggleEditorsButton/ToggleEditorsButton.js
 ElectronClient/gui/ToolbarBase.js
@@ -219,36 +214,22 @@ ReactNativeClient/lib/components/screens/UpgradeSyncTargetScreen.js
 ReactNativeClient/lib/components/SelectDateTimeDialog.js
 ReactNativeClient/lib/errorUtils.js
 ReactNativeClient/lib/eventManager.js
-ReactNativeClient/lib/fs-driver-node.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/MarkupToHtml.js
-ReactNativeClient/lib/joplin-renderer/MdToHtml.js
 ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/checkbox.js
-ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/code_inline.js
 ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/fence.js
-ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/fountain.js
-ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/highlight_keywords.js
-ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/html_image.js
-ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/image.js
-ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/katex.js
-ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/link_open.js
 ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/mermaid.js
 ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/sanitize_html.js
-ReactNativeClient/lib/joplin-renderer/noteStyle.js
-ReactNativeClient/lib/joplin-renderer/pathUtils.js
 ReactNativeClient/lib/JoplinServerApi.js
 ReactNativeClient/lib/locale.js
 ReactNativeClient/lib/Logger.js
 ReactNativeClient/lib/markdownUtils.js
-ReactNativeClient/lib/markupLanguageUtils.js
 ReactNativeClient/lib/models/Alarm.js
 ReactNativeClient/lib/models/Setting.js
 ReactNativeClient/lib/ntpDate.js
-ReactNativeClient/lib/path-utils.js
 ReactNativeClient/lib/PoorManIntervals.js
 ReactNativeClient/lib/reducer.js
 ReactNativeClient/lib/services/AlarmService.js
@@ -309,7 +290,6 @@ ReactNativeClient/lib/services/plugins/PluginService.js
 ReactNativeClient/lib/services/plugins/reducer.js
 ReactNativeClient/lib/services/plugins/sandboxProxy.js
 ReactNativeClient/lib/services/plugins/ToolbarButtonController.js
-ReactNativeClient/lib/services/plugins/utils/contentScriptsToRendererRules.js
 ReactNativeClient/lib/services/plugins/utils/createViewHandle.js
 ReactNativeClient/lib/services/plugins/utils/executeSandboxCall.js
 ReactNativeClient/lib/services/plugins/utils/manifestFromObject.js

.gitignore

@@ -58,13 +58,10 @@ plugin_types/
 # AUTO-GENERATED - EXCLUDED TYPESCRIPT BUILD
 CliClient/app/LinkSelector.js
 CliClient/app/services/plugins/PluginRunner.js
-CliClient/tests/fsDriver.js
 CliClient/tests/InMemoryCache.js
-CliClient/tests/MdToHtml.js
 CliClient/tests/models_Setting.js
 CliClient/tests/services_CommandService.js
 CliClient/tests/services_InteropService.js
-CliClient/tests/services_keychainService.js
 CliClient/tests/services_PluginService.js
 CliClient/tests/services_rest_Api.js
 CliClient/tests/services/plugins/api/JoplinSetting.js
@@ -75,7 +72,6 @@ ElectronClient/app.js
 ElectronClient/bridge.js
 ElectronClient/commands/copyDevCommand.js
 ElectronClient/commands/focusElement.js
-ElectronClient/commands/openProfileDirectory.js
 ElectronClient/commands/startExternalEditing.js
 ElectronClient/commands/stopExternalEditing.js
 ElectronClient/commands/toggleExternalEditing.js
@@ -178,7 +174,6 @@ ElectronClient/gui/SideBar/styles/index.js
 ElectronClient/gui/StatusScreen/StatusScreen.js
 ElectronClient/gui/style/StyledInput.js
 ElectronClient/gui/style/StyledTextInput.js
-ElectronClient/gui/TagList.js
 ElectronClient/gui/ToggleEditorsButton/styles/index.js
 ElectronClient/gui/ToggleEditorsButton/ToggleEditorsButton.js
 ElectronClient/gui/ToolbarBase.js
@@ -213,36 +208,22 @@ ReactNativeClient/lib/components/screens/UpgradeSyncTargetScreen.js
 ReactNativeClient/lib/components/SelectDateTimeDialog.js
 ReactNativeClient/lib/errorUtils.js
 ReactNativeClient/lib/eventManager.js
-ReactNativeClient/lib/fs-driver-node.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/MarkupToHtml.js
-ReactNativeClient/lib/joplin-renderer/MdToHtml.js
 ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/checkbox.js
-ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/code_inline.js
 ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/fence.js
-ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/fountain.js
-ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/highlight_keywords.js
-ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/html_image.js
-ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/image.js
-ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/katex.js
-ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/link_open.js
 ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/mermaid.js
 ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/sanitize_html.js
-ReactNativeClient/lib/joplin-renderer/noteStyle.js
-ReactNativeClient/lib/joplin-renderer/pathUtils.js
 ReactNativeClient/lib/JoplinServerApi.js
 ReactNativeClient/lib/locale.js
 ReactNativeClient/lib/Logger.js
 ReactNativeClient/lib/markdownUtils.js
-ReactNativeClient/lib/markupLanguageUtils.js
 ReactNativeClient/lib/models/Alarm.js
 ReactNativeClient/lib/models/Setting.js
 ReactNativeClient/lib/ntpDate.js
-ReactNativeClient/lib/path-utils.js
 ReactNativeClient/lib/PoorManIntervals.js
 ReactNativeClient/lib/reducer.js
 ReactNativeClient/lib/services/AlarmService.js
@@ -303,7 +284,6 @@ ReactNativeClient/lib/services/plugins/PluginService.js
 ReactNativeClient/lib/services/plugins/reducer.js
 ReactNativeClient/lib/services/plugins/sandboxProxy.js
 ReactNativeClient/lib/services/plugins/ToolbarButtonController.js
-ReactNativeClient/lib/services/plugins/utils/contentScriptsToRendererRules.js
 ReactNativeClient/lib/services/plugins/utils/createViewHandle.js
 ReactNativeClient/lib/services/plugins/utils/executeSandboxCall.js
 ReactNativeClient/lib/services/plugins/utils/manifestFromObject.js

.ignore

@@ -7,13 +7,10 @@
 # AUTO-GENERATED - EXCLUDED TYPESCRIPT BUILD
 CliClient/app/LinkSelector.js
 CliClient/app/services/plugins/PluginRunner.js
-CliClient/tests/fsDriver.js
 CliClient/tests/InMemoryCache.js
-CliClient/tests/MdToHtml.js
 CliClient/tests/models_Setting.js
 CliClient/tests/services_CommandService.js
 CliClient/tests/services_InteropService.js
-CliClient/tests/services_keychainService.js
 CliClient/tests/services_PluginService.js
 CliClient/tests/services_rest_Api.js
 CliClient/tests/services/plugins/api/JoplinSetting.js
@@ -24,7 +21,6 @@ ElectronClient/app.js
 ElectronClient/bridge.js
 ElectronClient/commands/copyDevCommand.js
 ElectronClient/commands/focusElement.js
-ElectronClient/commands/openProfileDirectory.js
 ElectronClient/commands/startExternalEditing.js
 ElectronClient/commands/stopExternalEditing.js
 ElectronClient/commands/toggleExternalEditing.js
@@ -127,7 +123,6 @@ ElectronClient/gui/SideBar/styles/index.js
 ElectronClient/gui/StatusScreen/StatusScreen.js
 ElectronClient/gui/style/StyledInput.js
 ElectronClient/gui/style/StyledTextInput.js
-ElectronClient/gui/TagList.js
 ElectronClient/gui/ToggleEditorsButton/styles/index.js
 ElectronClient/gui/ToggleEditorsButton/ToggleEditorsButton.js
 ElectronClient/gui/ToolbarBase.js
@@ -162,36 +157,22 @@ ReactNativeClient/lib/components/screens/UpgradeSyncTargetScreen.js
 ReactNativeClient/lib/components/SelectDateTimeDialog.js
 ReactNativeClient/lib/errorUtils.js
 ReactNativeClient/lib/eventManager.js
-ReactNativeClient/lib/fs-driver-node.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/MarkupToHtml.js
-ReactNativeClient/lib/joplin-renderer/MdToHtml.js
 ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/checkbox.js
-ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/code_inline.js
 ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/fence.js
-ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/fountain.js
-ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/highlight_keywords.js
-ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/html_image.js
-ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/image.js
-ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/katex.js
-ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/link_open.js
 ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/mermaid.js
 ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/sanitize_html.js
-ReactNativeClient/lib/joplin-renderer/noteStyle.js
-ReactNativeClient/lib/joplin-renderer/pathUtils.js
 ReactNativeClient/lib/JoplinServerApi.js
 ReactNativeClient/lib/locale.js
 ReactNativeClient/lib/Logger.js
 ReactNativeClient/lib/markdownUtils.js
-ReactNativeClient/lib/markupLanguageUtils.js
 ReactNativeClient/lib/models/Alarm.js
 ReactNativeClient/lib/models/Setting.js
 ReactNativeClient/lib/ntpDate.js
-ReactNativeClient/lib/path-utils.js
 ReactNativeClient/lib/PoorManIntervals.js
 ReactNativeClient/lib/reducer.js
 ReactNativeClient/lib/services/AlarmService.js
@@ -252,7 +233,6 @@ ReactNativeClient/lib/services/plugins/PluginService.js
 ReactNativeClient/lib/services/plugins/reducer.js
 ReactNativeClient/lib/services/plugins/sandboxProxy.js
 ReactNativeClient/lib/services/plugins/ToolbarButtonController.js
-ReactNativeClient/lib/services/plugins/utils/contentScriptsToRendererRules.js
 ReactNativeClient/lib/services/plugins/utils/createViewHandle.js
 ReactNativeClient/lib/services/plugins/utils/executeSandboxCall.js
 ReactNativeClient/lib/services/plugins/utils/manifestFromObject.js

CliClient/app/app.js

@@ -8,7 +8,7 @@ const Note = require('lib/models/Note.js');
 const Tag = require('lib/models/Tag.js');
 const Setting = require('lib/models/Setting').default;
 const { reg } = require('lib/registry.js');
-const { fileExtension } = require('lib/path-utils');
+const { fileExtension } = require('lib/path-utils.js');
 const { _ } = require('lib/locale');
 const fs = require('fs-extra');
 const { cliUtils } = require('./cli-utils.js');

CliClient/app/build-doc.js

@@ -1,5 +1,5 @@
 const fs = require('fs-extra');
-const { fileExtension, dirname } = require('lib/path-utils');
+const { fileExtension, dirname } = require('lib/path-utils.js');
 const wrap_ = require('word-wrap');
 const { languageCode } = require('lib/locale');
 

CliClient/app/cli-integration-tests.js

@@ -2,7 +2,7 @@
 
 const fs = require('fs-extra');
 const Logger = require('lib/Logger').default;
-const { dirname } = require('lib/path-utils');
+const { dirname } = require('lib/path-utils.js');
 const { DatabaseDriverNode } = require('lib/database-driver-node.js');
 const { JoplinDatabase } = require('lib/joplin-database.js');
 const BaseModel = require('lib/BaseModel.js');

CliClient/app/command-e2ee.js

@@ -5,7 +5,7 @@ const DecryptionWorker = require('lib/services/DecryptionWorker');
 const BaseItem = require('lib/models/BaseItem');
 const Setting = require('lib/models/Setting').default;
 const shim = require('lib/shim').default;
-const pathUtils = require('lib/path-utils');
+const pathUtils = require('lib/path-utils.js');
 const imageType = require('image-type');
 const readChunk = require('read-chunk');
 

CliClient/app/fuzzing.js

@@ -3,8 +3,8 @@
 const { time } = require('lib/time-utils.js');
 const Logger = require('lib/Logger').default;
 const Resource = require('lib/models/Resource.js');
-const { dirname } = require('lib/path-utils');
-const FsDriverNode = require('lib/fs-driver-node').default;
+const { dirname } = require('lib/path-utils.js');
+const { FsDriverNode } = require('./fs-driver-node.js');
 const lodash = require('lodash');
 const exec = require('child_process').exec;
 const fs = require('fs-extra');

CliClient/app/main.js

@@ -24,7 +24,7 @@ const MasterKey = require('lib/models/MasterKey');
 const Setting = require('lib/models/Setting').default;
 const Revision = require('lib/models/Revision.js');
 const Logger = require('lib/Logger').default;
-const FsDriverNode = require('lib/fs-driver-node').default;
+const { FsDriverNode } = require('lib/fs-driver-node.js');
 const { shimInit } = require('lib/shim-init-node.js');
 const { _ } = require('lib/locale');
 const { FileApiDriverLocal } = require('lib/file-api-driver-local.js');

CliClient/app/services/plugins/PluginRunner.ts

@@ -54,25 +54,15 @@ export default class PluginRunner extends BasePluginRunner {
 		};
 	}
 
-	async run(plugin:Plugin, sandbox:Global):Promise<void> {
-		return new Promise((resolve:Function, reject:Function) => {
-			const onStarted = () => {
-				plugin.off('started', onStarted);
-				resolve();
-			};
+	async run(plugin:Plugin, sandbox:Global) {
+		const vmSandbox = vm.createContext(this.newSandboxProxy(plugin.id, sandbox));
 
-			plugin.on('started', onStarted);
-
-			const vmSandbox = vm.createContext(this.newSandboxProxy(plugin.id, sandbox));
-
-			try {
-				vm.runInContext(plugin.scriptText, vmSandbox);
-			} catch (error) {
-				reject(error);
-				// this.logger().error(`In plugin ${plugin.id}:`, error);
-				// return;
-			}
-		});
+		try {
+			vm.runInContext(plugin.scriptText, vmSandbox);
+		} catch (error) {
+			this.logger().error(`In plugin ${plugin.id}:`, error);
+			return;
+		}
 	}
 
 }

CliClient/locales-build/index.js

@@ -38,42 +38,42 @@ locales['tr_TR'] = require('./tr_TR.json');
 locales['vi'] = require('./vi.json');
 locales['zh_CN'] = require('./zh_CN.json');
 locales['zh_TW'] = require('./zh_TW.json');
-stats['ar'] = {"percentDone":79};
-stats['eu'] = {"percentDone":33};
-stats['bs_BA'] = {"percentDone":82};
-stats['bg_BG'] = {"percentDone":65};
-stats['ca'] = {"percentDone":95};
+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['cs_CZ'] = {"percentDone":99};
-stats['da_DK'] = {"percentDone":73};
-stats['de_DE'] = {"percentDone":97};
-stats['et_EE'] = {"percentDone":65};
+stats['cs_CZ'] = {"percentDone":82};
+stats['da_DK'] = {"percentDone":74};
+stats['de_DE'] = {"percentDone":98};
+stats['et_EE'] = {"percentDone":66};
 stats['en_GB'] = {"percentDone":100};
 stats['en_US'] = {"percentDone":100};
-stats['es_ES'] = {"percentDone":99};
-stats['eo'] = {"percentDone":37};
-stats['fr_FR'] = {"percentDone":98};
-stats['gl_ES'] = {"percentDone":42};
-stats['id_ID'] = {"percentDone":92};
-stats['it_IT'] = {"percentDone":98};
-stats['nl_BE'] = {"percentDone":33};
-stats['nl_NL'] = {"percentDone":94};
-stats['nb_NO'] = {"percentDone":87};
-stats['fa'] = {"percentDone":82};
-stats['pl_PL'] = {"percentDone":97};
-stats['pt_PT'] = {"percentDone":98};
-stats['pt_BR'] = {"percentDone":95};
+stats['es_ES'] = {"percentDone":95};
+stats['eo'] = {"percentDone":38};
+stats['fr_FR'] = {"percentDone":99};
+stats['gl_ES'] = {"percentDone":43};
+stats['id_ID'] = {"percentDone":93};
+stats['it_IT'] = {"percentDone":90};
+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['pt_BR'] = {"percentDone":96};
 stats['ro'] = {"percentDone":77};
 stats['sl_SI'] = {"percentDone":42};
 stats['sv'] = {"percentDone":70};
 stats['th_TH'] = {"percentDone":52};
-stats['vi'] = {"percentDone":84};
-stats['tr_TR'] = {"percentDone":97};
-stats['el_GR'] = {"percentDone":95};
-stats['ru_RU'] = {"percentDone":94};
-stats['sr_RS'] = {"percentDone":70};
-stats['zh_CN'] = {"percentDone":95};
-stats['zh_TW'] = {"percentDone":94};
-stats['ja_JP'] = {"percentDone":97};
-stats['ko'] = {"percentDone":99};
+stats['vi'] = {"percentDone":85};
+stats['tr_TR'] = {"percentDone":98};
+stats['el_GR'] = {"percentDone":96};
+stats['ru_RU'] = {"percentDone":95};
+stats['sr_RS'] = {"percentDone":71};
+stats['zh_CN'] = {"percentDone":96};
+stats['zh_TW'] = {"percentDone":95};
+stats['ja_JP'] = {"percentDone":98};
+stats['ko'] = {"percentDone":98};
 module.exports = { locales: locales, stats: stats };

CliClient/tests/EnexToHtml.js

@@ -3,7 +3,6 @@ require('app-module-path').addPath(__dirname);
 const { asyncTest, setupDatabaseAndSynchronizer, switchClient } = require('test-utils.js');
 const shim = require('lib/shim').default;
 const { enexXmlToHtml } = require('lib/import-enex-html-gen.js');
-const cleanHtml = require('clean-html');
 
 process.on('unhandledRejection', (reason, p) => {
 	console.warn('Unhandled Rejection at: Promise', p, 'reason:', reason);
@@ -20,20 +19,6 @@ const audioResource = {
 	title: 'audio test',
 };
 
-// All the test HTML files are beautified ones, so we need to run
-// this before the comparison. Before, beautifying was done by `enexXmlToHtml`
-// but that was removed due to problems with the clean-html package.
-const beautifyHtml = (html) => {
-	return new Promise((resolve) => {
-		try {
-			cleanHtml.clean(html, { wrap: 0 }, (...cleanedHtml) => resolve(cleanedHtml.join('')));
-		} catch (error) {
-			console.warn(`Could not clean HTML - the "unclean" version will be used: ${error.message}: ${html.trim().substr(0, 512).replace(/[\n\r]/g, ' ')}...`);
-			resolve([html].join(''));
-		}
-	});
-};
-
 /**
  * Tests the importer for a single note, checking that the result of
  * processing the given `.enex` input file matches the contents of the given
@@ -53,7 +38,7 @@ const compareOutputToExpected = (options) => {
 	it(testTitle, asyncTest(async () => {
 		const enexInput = await shim.fsDriver().readFile(inputFile);
 		const expectedOutput = await shim.fsDriver().readFile(outputFile);
-		const actualOutput = await beautifyHtml(await enexXmlToHtml(enexInput, options.resources));
+		const actualOutput = await enexXmlToHtml(enexInput, options.resources);
 
 		expect(actualOutput).toEqual(expectedOutput);
 	}));

CliClient/tests/EnexToMd.js

@@ -4,7 +4,7 @@ require('app-module-path').addPath(__dirname);
 
 const os = require('os');
 const { time } = require('lib/time-utils.js');
-const { filename } = require('lib/path-utils');
+const { filename } = require('lib/path-utils.js');
 const { asyncTest, fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('test-utils.js');
 const Folder = require('lib/models/Folder.js');
 const Note = require('lib/models/Note.js');

CliClient/tests/HtmlToHtml.js

@@ -4,7 +4,7 @@ require('app-module-path').addPath(__dirname);
 
 const os = require('os');
 const { time } = require('lib/time-utils.js');
-const { filename } = require('lib/path-utils');
+const { filename } = require('lib/path-utils.js');
 const { asyncTest, fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('test-utils.js');
 const Folder = require('lib/models/Folder.js');
 const Note = require('lib/models/Note.js');

CliClient/tests/HtmlToMd.js

@@ -4,7 +4,7 @@ require('app-module-path').addPath(__dirname);
 
 const os = require('os');
 const { time } = require('lib/time-utils.js');
-const { filename } = require('lib/path-utils');
+const { filename } = require('lib/path-utils.js');
 const { asyncTest, fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('test-utils.js');
 const Folder = require('lib/models/Folder.js');
 const Note = require('lib/models/Note.js');

CliClient/tests/MarkupToHtml.js

@@ -1,7 +1,7 @@
 require('app-module-path').addPath(__dirname);
 
 const { asyncTest } = require('test-utils.js');
-const MarkupToHtml = require('lib/joplin-renderer/MarkupToHtml').default;
+const MarkupToHtml = require('lib/joplin-renderer/MarkupToHtml');
 
 describe('MarkupToHtml', function() {
 

CliClient/tests/MdToHtml.js

@@ -1,11 +1,24 @@
+/* eslint-disable no-unused-vars */
+
+require('app-module-path').addPath(__dirname);
+
 const os = require('os');
-const { filename } = require('lib/path-utils');
-const { asyncTest, setupDatabaseAndSynchronizer, switchClient } = require('test-utils.js');
+const { time } = require('lib/time-utils.js');
+const { filename } = require('lib/path-utils.js');
+const { asyncTest, fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('test-utils.js');
+const Folder = require('lib/models/Folder.js');
+const Note = require('lib/models/Note.js');
+const BaseModel = require('lib/BaseModel.js');
 const shim = require('lib/shim').default;
-const MdToHtml = require('lib/joplin-renderer/MdToHtml').default;
+const MdToHtml = require('lib/joplin-renderer/MdToHtml');
+const { enexXmlToMd } = require('lib/import-enex-md-gen.js');
 const { themeStyle } = require('lib/theme');
 
-function newTestMdToHtml(options:any = null) {
+process.on('unhandledRejection', (reason, p) => {
+	console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
+});
+
+function newTestMdToHtml(options = null) {
 	options = {
 		ResourceModel: {
 			isResourceUrl: () => false,
@@ -19,7 +32,7 @@ function newTestMdToHtml(options:any = null) {
 
 describe('MdToHtml', function() {
 
-	beforeEach(async (done:Function) => {
+	beforeEach(async (done) => {
 		await setupDatabaseAndSynchronizer(1);
 		await switchClient(1);
 		done();
@@ -39,14 +52,14 @@ describe('MdToHtml', function() {
 
 			// if (mdFilename !== 'sanitize_9.md') continue;
 
-			const mdToHtmlOptions:any = {
+			const mdToHtmlOptions = {
 				bodyOnly: true,
 			};
 
 			if (mdFilename === 'checkbox_alternative.md') {
 				mdToHtmlOptions.plugins = {
 					checkbox: {
-						checkboxRenderingType: 2,
+						renderingType: 2,
 					},
 				};
 			}
@@ -83,7 +96,7 @@ describe('MdToHtml', function() {
 	}));
 
 	it('should return enabled plugin assets', asyncTest(async () => {
-		const pluginOptions:any = {};
+		const pluginOptions = {};
 		const pluginNames = MdToHtml.pluginNames();
 
 		for (const n of pluginNames) pluginOptions[n] = { enabled: false };
@@ -113,7 +126,7 @@ describe('MdToHtml', function() {
 		// In this case, the HTML contains both the style and
 		// the rendered markdown wrapped in a DIV.
 		const result = await mdToHtml.render('just **testing**');
-		expect(result.cssStrings.length).toBeGreaterThan(0);
+		expect(result.cssStrings.length).toBe(0);
 		expect(result.html.indexOf('rendered-md') >= 0).toBe(true);
 	}));
 
@@ -124,7 +137,7 @@ describe('MdToHtml', function() {
 		// with no wrapper and no style.
 		// The style is instead in the cssStrings property.
 		const result = await mdToHtml.render('just **testing**', null, { bodyOnly: true });
-		expect(result.cssStrings.length).toBeGreaterThan(0);
+		expect(result.cssStrings.length).toBe(1);
 		expect(result.html.trim()).toBe('just <strong>testing</strong>');
 	}));
 
@@ -134,7 +147,7 @@ describe('MdToHtml', function() {
 		// It is similar to the bodyOnly option, excepts that
 		// the rendered Markdown is wrapped in a DIV
 		const result = await mdToHtml.render('just **testing**', null, { splitted: true });
-		expect(result.cssStrings.length).toBeGreaterThan(0);
+		expect(result.cssStrings.length).toBe(1);
 		expect(result.html.trim()).toBe('<div id="rendered-md"><p>just <strong>testing</strong></p>\n</div>');
 	}));
 

CliClient/tests/fsDriver.ts

@@ -1,29 +0,0 @@
-import FsDriverNode from 'lib/fs-driver-node';
-import shim from 'lib/shim';
-const { expectThrow } = require('test-utils.js');
-
-// On Windows, path.resolve is going to convert a path such as
-// /tmp/file.txt to c:\tmp\file.txt
-function platformPath(path:string) {
-	if (shim.isWindows()) {
-		return `C:${path.replace(/\//g, '\\')}`;
-	} else {
-		return path;
-	}
-}
-
-describe('fsDriver', function() {
-
-	it('should resolveRelativePathWithinDir', () => {
-		const fsDriver = new FsDriverNode();
-		expect(fsDriver.resolveRelativePathWithinDir('/test/temp', './my/file.txt')).toBe(platformPath('/test/temp/my/file.txt'));
-		expect(fsDriver.resolveRelativePathWithinDir('/', './test')).toBe(platformPath('/test'));
-		expect(fsDriver.resolveRelativePathWithinDir('/test', 'myfile.txt')).toBe(platformPath('/test/myfile.txt'));
-		expect(fsDriver.resolveRelativePathWithinDir('/test/temp', './mydir/../test.txt')).toBe(platformPath('/test/temp/test.txt'));
-
-		expectThrow(() => fsDriver.resolveRelativePathWithinDir('/test/temp', '../myfile.txt'));
-		expectThrow(() => fsDriver.resolveRelativePathWithinDir('/test/temp', './mydir/../../test.txt'));
-		expectThrow(() => fsDriver.resolveRelativePathWithinDir('/test/temp', '/var/local/no.txt'));
-	});
-
-});

CliClient/tests/pathUtils.js

@@ -2,7 +2,7 @@
 
 require('app-module-path').addPath(__dirname);
 
-const { extractExecutablePath, quotePath, unquotePath, friendlySafeFilename, toFileProtocolPath } = require('lib/path-utils');
+const { extractExecutablePath, quotePath, unquotePath, friendlySafeFilename, toFileProtocolPath } = require('lib/path-utils.js');
 const { asyncTest, fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('test-utils.js');
 
 process.on('unhandledRejection', (reason, p) => {

CliClient/tests/services_KeymapService.js

@@ -299,7 +299,7 @@ describe('services_KeymapService', () => {
 				],
 				[
 					{ command: 'showLocalSearch', accelerator: 'Option+Cmd+S' },
-					{ command: 'print', accelerator: 'Cmd+P' /* Default of gotoAnything */ },
+					{ command: 'print', accelerator: 'Cmd+G' /* Default of gotoAnything */ },
 					{ command: 'focusElementNoteTitle', accelerator: 'Option+Shift+Cmd+J' },
 				],
 			];
@@ -317,7 +317,7 @@ describe('services_KeymapService', () => {
 				],
 				[
 					{ command: 'showLocalSearch', accelerator: 'Ctrl+Alt+S' },
-					{ command: 'print', accelerator: 'Ctrl+P' /* Default of gotoAnything */ },
+					{ command: 'print', accelerator: 'Ctrl+G' /* Default of gotoAnything */ },
 					{ command: 'focusElementNoteTitle', accelerator: 'Ctrl+Alt+Shift+J' },
 				],
 			];

CliClient/tests/services_PluginService.ts

@@ -1,11 +1,8 @@
 import PluginRunner from '../app/services/plugins/PluginRunner';
 import PluginService from 'lib/services/plugins/PluginService';
-import { ContentScriptType } from 'lib/services/plugins/api/types';
-import MdToHtml from 'lib/joplin-renderer/MdToHtml';
-import shim from 'lib/shim';
 
 require('app-module-path').addPath(__dirname);
-const { asyncTest, setupDatabaseAndSynchronizer, switchClient, expectThrow, createTempDir } = require('test-utils.js');
+const { asyncTest, setupDatabaseAndSynchronizer, switchClient, expectThrow } = require('test-utils.js');
 const Note = require('lib/models/Note');
 const Folder = require('lib/models/Folder');
 
@@ -63,9 +60,6 @@ describe('services_PluginService', function() {
 
 		const allFolders = await Folder.all();
 		expect(allFolders.length).toBe(1);
-
-		// If you have an error here, it might mean you need to run `npm i` from
-		// the "withExternalModules" folder. Not clear exactly why.
 		expect(allFolders[0].title).toBe('  foo');
 	}));
 
@@ -154,54 +148,4 @@ describe('services_PluginService', function() {
 		}
 	}));
 
-	it('should register a Markdown-it plugin', asyncTest(async () => {
-		const tempDir = await createTempDir();
-
-		const contentScriptPath = `${tempDir}/markdownItTestPlugin.js`;
-		await shim.fsDriver().copy(`${testPluginDir}/content_script/src/markdownItTestPlugin.js`, contentScriptPath);
-
-		const service = newPluginService();
-
-		const plugin = await service.loadPluginFromString('example', tempDir, `
-			/* 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.plugins.registerContentScript('markdownItPlugin', 'justtesting', './markdownItTestPlugin.js');
-				},
-			});
-		`);
-
-		await service.runPlugin(plugin);
-
-		const contentScripts = plugin.contentScriptsByType(ContentScriptType.MarkdownItPlugin);
-		expect(contentScripts.length).toBe(1);
-		expect(!!contentScripts[0].path).toBe(true);
-
-		const contentScript = contentScripts[0];
-
-		const mdToHtml = new MdToHtml();
-		const module = require(contentScript.path).default;
-		mdToHtml.loadExtraRendererRule(contentScript.id, module({}));
-
-		const result = await mdToHtml.render([
-			'```justtesting',
-			'something',
-			'```',
-		].join('\n'));
-
-		expect(result.html.includes('JUST TESTING: something')).toBe(true);
-
-		await shim.fsDriver().remove(tempDir);
-	}));
-
 });

CliClient/tests/services_keychainService.js

@@ -0,0 +1,60 @@
+/* eslint-disable no-unused-vars */
+
+require('app-module-path').addPath(__dirname);
+
+const { asyncTest, fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('test-utils.js');
+const shim = require('lib/shim').default;
+const Setting = require('lib/models/Setting').default;
+const KeychainService = require('lib/services/keychain/KeychainService').default;
+
+process.on('unhandledRejection', (reason, p) => {
+	console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
+});
+
+function describeIfCompatible(name, fn) {
+	if (['win32', 'darwin'].includes(shim.platformName())) {
+		return describe(name, fn);
+	}
+}
+
+describeIfCompatible('services_KeychainService', function() {
+
+	beforeEach(async (done) => {
+		await setupDatabaseAndSynchronizer(1, { keychainEnabled: true });
+		await switchClient(1, { keychainEnabled: true });
+		await Setting.deleteKeychainPasswords();
+		done();
+	});
+
+	afterEach(async (done) => {
+		await Setting.deleteKeychainPasswords();
+		done();
+	});
+
+	it('should be enabled on macOS and Windows', asyncTest(async () => {
+		expect(Setting.value('keychain.supported')).toBe(1);
+	}));
+
+	it('should set, get and delete passwords', asyncTest(async () => {
+		const service = KeychainService.instance();
+
+		const isSet = await service.setPassword('zz_testunit', 'password');
+		expect(isSet).toBe(true);
+
+		const password = await service.password('zz_testunit');
+		expect(password).toBe('password');
+
+		await service.deletePassword('zz_testunit');
+
+		expect(await service.password('zz_testunit')).toBe(null);
+	}));
+
+	it('should save and load secure settings', asyncTest(async () => {
+		Setting.setObjectValue('encryption.passwordCache', 'testing', '123456');
+		await Setting.saveAll();
+		await Setting.load();
+		const passwords = Setting.value('encryption.passwordCache');
+		expect(passwords.testing).toBe('123456');
+	}));
+
+});

CliClient/tests/services_keychainService.ts

@@ -1,94 +0,0 @@
-import KeychainService from 'lib/services/keychain/KeychainService';
-import shim from 'lib/shim';
-import Setting from 'lib/models/Setting';
-
-const { db, asyncTest, setupDatabaseAndSynchronizer, switchClient } = require('test-utils.js');
-
-function describeIfCompatible(name:string, fn:any) {
-	if (['win32', 'darwin'].includes(shim.platformName())) {
-		return describe(name, fn);
-	}
-}
-
-describeIfCompatible('services_KeychainService', function() {
-
-	beforeEach(async (done:Function) => {
-		await setupDatabaseAndSynchronizer(1, { keychainEnabled: true });
-		await switchClient(1, { keychainEnabled: true });
-		await Setting.deleteKeychainPasswords();
-		done();
-	});
-
-	afterEach(async (done:Function) => {
-		await Setting.deleteKeychainPasswords();
-		done();
-	});
-
-	it('should be enabled on macOS and Windows', asyncTest(async () => {
-		expect(Setting.value('keychain.supported')).toBe(1);
-	}));
-
-	it('should set, get and delete passwords', asyncTest(async () => {
-		const service = KeychainService.instance();
-
-		const isSet = await service.setPassword('zz_testunit', 'password');
-		expect(isSet).toBe(true);
-
-		const password = await service.password('zz_testunit');
-		expect(password).toBe('password');
-
-		await service.deletePassword('zz_testunit');
-
-		expect(await service.password('zz_testunit')).toBe(null);
-	}));
-
-	it('should save and load secure settings', asyncTest(async () => {
-		Setting.setObjectValue('encryption.passwordCache', 'testing', '123456');
-		await Setting.saveAll();
-		await Setting.load();
-		const passwords = Setting.value('encryption.passwordCache');
-		expect(passwords.testing).toBe('123456');
-	}));
-
-	it('should delete db settings if they have been saved in keychain', asyncTest(async () => {
-		// First save some secure settings and make sure it ends up in the databse
-		KeychainService.instance().enabled = false;
-
-		Setting.setValue('sync.5.password', 'password');
-		await Setting.saveAll();
-
-		{
-			// Check that it is in the database
-			const row = await db().selectOne('SELECT * FROM settings WHERE key = "sync.5.password"');
-			expect(row.value).toBe('password');
-		}
-
-		KeychainService.instance().enabled = true;
-
-		// Change any setting to make sure a save operation is triggered
-		Setting.setValue('sync.5.path', '/tmp');
-
-		// Save the settings - now db secure keys should have been cleared and moved to keychain
-		await Setting.saveAll();
-
-		{
-			// Check that it's been removed from the database
-			const row = await db().selectOne('SELECT * FROM settings WHERE key = "sync.5.password"');
-			expect(row).toBe(undefined);
-		}
-
-		// However we should still get it via the Setting class, since it will use the keychain
-		expect(Setting.value('sync.5.password')).toBe('password');
-
-		// Now do it again - because there was a bug that would cause the second attempt to save to the db instead
-		Setting.setValue('sync.5.username', 'john');
-		await Setting.saveAll();
-
-		{
-			// Check that it's been removed from the database
-			const row = await db().selectOne('SELECT * FROM settings WHERE key = "sync.5.password"');
-			expect(row).toBe(undefined);
-		}
-	}));
-
-});

CliClient/tests/services_rest_Api.ts

@@ -183,59 +183,6 @@ describe('services_rest_Api', function() {
 
 		expect(response.user_updated_time).toBe(updatedTime);
 		expect(response.user_created_time).toBe(createdTime);
-
-		const timeBefore = Date.now();
-
-		response = await api.route('POST', 'notes', null, JSON.stringify({
-			parent_id: f.id,
-		}));
-
-		const newNote = await Note.load(response.id);
-		expect(newNote.user_updated_time).toBeGreaterThanOrEqual(timeBefore);
-		expect(newNote.user_created_time).toBeGreaterThanOrEqual(timeBefore);
-	}));
-
-	it('should preserve user timestamps when updating notes', asyncTest(async () => {
-		const folder = await Folder.save({ title: 'mon carnet' });
-
-		const updatedTime = Date.now() - 1000;
-		const createdTime = Date.now() - 10000;
-
-		const response = await api.route('POST', 'notes', null, JSON.stringify({
-			parent_id: folder.id,
-		}));
-
-		const noteId = response.id;
-
-		{
-			// Check that if user timestamps are supplied, they are preserved by the API
-
-			await api.route('PUT', `notes/${noteId}`, null, JSON.stringify({
-				user_updated_time: updatedTime,
-				user_created_time: createdTime,
-				title: 'mod',
-			}));
-
-			const modNote = await Note.load(noteId);
-			expect(modNote.title).toBe('mod');
-			expect(modNote.user_updated_time).toBe(updatedTime);
-			expect(modNote.user_created_time).toBe(createdTime);
-		}
-
-		{
-			// Check if no user timestamps are supplied they are automatically updated.
-
-			const beforeTime = Date.now();
-
-			await api.route('PUT', `notes/${noteId}`, null, JSON.stringify({
-				title: 'mod2',
-			}));
-
-			const modNote = await Note.load(noteId);
-			expect(modNote.title).toBe('mod2');
-			expect(modNote.user_updated_time).toBeGreaterThanOrEqual(beforeTime);
-			expect(modNote.user_created_time).toBeGreaterThanOrEqual(createdTime);
-		}
 	}));
 
 	it('should create notes with supplied ID', asyncTest(async () => {

CliClient/tests/support/plugins/content_script/.gitignore

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