#204 - Evernote bug bounty

src/formats/yarle/utils/templates/apply-functions/apply-tags-array-template.ts

@@ -5,10 +5,11 @@ import { applyTemplateOnBlock } from './apply-template-on-block';
 import { getTemplateBlockSettings } from './get-templateblock-settings';
 
 export const applyTagsArrayTemplate = (noteData: NoteData, inputText: string, check: Function): string => {
-	if (noteData.tags) {
-		noteData.tags = JSON.stringify(noteData.tags.split(' '));
-	}
-	const tagsTemplateSettings = getTemplateBlockSettings(inputText, check, P, noteData.tags);
+	const tags = (noteData.tags) 
+		? JSON.stringify(noteData.tags.split(' '))
+		: undefined;
+
+	const tagsTemplateSettings = getTemplateBlockSettings(inputText, check, P, tags);
 
 	return applyTemplateOnBlock(tagsTemplateSettings);
 };

src/formats/yarle/utils/templates/apply-functions/apply-tags-yaml-list-template.ts

@@ -0,0 +1,15 @@
+import { NoteData } from '../../../models/NoteData';
+import * as P from '../placeholders/tags-yaml-list-placeholders';
+
+import { applyTemplateOnBlock } from './apply-template-on-block';
+import { getTemplateBlockSettings } from './get-templateblock-settings';
+
+export const applyTagsYamlListTemplate = (noteData: NoteData, inputText: string, check: Function): string => {
+	let tags;
+	if (noteData.tags) {
+		tags = '\n'+noteData.tags.split(' ').map(tag => `  - ${tag.replace(/^#/, '')}`).join('\n');
+	}
+	const tagsTemplateSettings = getTemplateBlockSettings(inputText, check, P, tags);
+
+	return applyTemplateOnBlock(tagsTemplateSettings);
+};

src/formats/yarle/utils/templates/apply-functions/index.ts

@@ -10,3 +10,4 @@ export * from './apply-remindertime-template';
 export * from './apply-reminderorder-template';
 export * from './apply-reminderdonetime-template';
 export * from './apply-tags-array-template';
+export * from './apply-tags-yaml-list-template';

src/formats/yarle/utils/templates/checker-functions.ts

@@ -8,6 +8,7 @@ import * as REMINDERORDER from './placeholders/reminderorder-placeholders';
 import * as REMINDERTIME from './placeholders/remindertime-placeholders';
 import * as SOURCEURL from './placeholders/sourceurl-placeholders';
 import * as YAMLARRAYTAGS from './placeholders/tags-array-placeholders';
+import * as YAMLLISTTAGS from './placeholders/tags-yaml-list-placeholders';
 import * as TAGS from './placeholders/tags-placeholders';
 import * as UPDATETIME from './placeholders/updatedat-placeholders';
 
@@ -40,7 +41,8 @@ export const hasSourceURLInTemplate = (templateContent: string): boolean => {
 };
 export const hasAnyTagsInTemplate = (templateContent: string): boolean => {
 	return (hasItemInTemplate(TAGS, templateContent)
-		|| hasItemInTemplate(YAMLARRAYTAGS, templateContent));
+		|| hasItemInTemplate(YAMLARRAYTAGS, templateContent)
+		|| hasItemInTemplate(YAMLLISTTAGS, templateContent));
 };
 
 export const hasMetadataInTemplate = (templateContent: string): boolean => {

src/formats/yarle/utils/templates/default-template.ts

@@ -1,6 +1,6 @@
 const frontmatterDelimiter = '---\n';
-const sourceBlock = '{source-url-block}\nsource: {source-url}\n\n{end-source-url-block}';
-const tagBlock = '{tags-array-block}\ntags: {tags-array}\n\n{end-tags-array-block}';
+const sourceBlock = '{source-url-block}source: {source-url}{end-source-url-block}\n';
+const tagBlock = '{tags-yaml-list-block}\ntags: {tags-yaml-list}\n\n{end-tags-yaml-list-block}';
 const titleBlock = '{title-block}# {title}\n\n{end-title-block}';
 const contentBlock = '{content-block}{content}{end-content-block}\n';
 

src/formats/yarle/utils/templates/placeholders/tags-yaml-list-placeholders.ts

@@ -0,0 +1,3 @@
+export const CONTENT_PLACEHOLDER = '{tags-yaml-list}';
+export const START_BLOCK = '{tags-yaml-list-block}';
+export const END_BLOCK = '{end-tags-yaml-list-block}';

src/formats/yarle/utils/templates/templates.ts

@@ -1,7 +1,7 @@
 import { NoteData } from '../../models/NoteData';
 
 import { YarleOptions } from '../../options';
-import { applyContentTemplate, applyCreatedAtTemplate, applyLocationTemplate, applyNotebookTemplate, applyReminderDoneTimeTemplate, applyReminderOrderTemplate, applyReminderTimeTemplate, applySourceUrlTemplate, applyTagsArrayTemplate, applyTagsTemplate, applyTitleTemplate, applyUpdatedAtTemplate } from './apply-functions';
+import { applyContentTemplate, applyCreatedAtTemplate, applyLocationTemplate, applyNotebookTemplate, applyReminderDoneTimeTemplate, applyReminderOrderTemplate, applyReminderTimeTemplate, applySourceUrlTemplate, applyTagsArrayTemplate,applyTagsYamlListTemplate,  applyTagsTemplate, applyTitleTemplate, applyUpdatedAtTemplate } from './apply-functions';
 
 import * as T from './placeholders/metadata-placeholders';
 import { removeCreatedAtPlaceholder, removeLinkToOriginalTemplate, removeLocationPlaceholder, removeNotebookPlaceholder, removeReminderDoneTimePlaceholder, removeReminderOrderPlaceholder, removeReminderTimePlaceholder, removeSourceUrlPlaceholder, removeUpdatedAtPlaceholder } from './remove-functions';
@@ -13,7 +13,7 @@ export const applyTemplate = (noteData: NoteData, yarleOptions: YarleOptions) =>
 	result = applyTitleTemplate(noteData, result, () => noteData.title);
 	result = applyTagsTemplate(noteData, result, () => !yarleOptions.skipTags);
 	result = applyTagsArrayTemplate(noteData, result, () => !yarleOptions.skipTags);
-
+	result = applyTagsYamlListTemplate(noteData, result, () => !yarleOptions.skipTags);
 	result = applyContentTemplate(noteData, result, () => noteData.content);
 
 	result = removeLinkToOriginalTemplate(result);