From cc378b83fee2b326610cdda1997cc5236f947fbf Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Wed, 28 Sep 2022 19:46:12 +0200
Subject: [PATCH 1/6] feat: automatically create subtask relations based on
 indention

---
 src/components/tasks/add-task.vue             |  51 ++++++--
 src/helpers/parseSubtasksViaIndention.test.ts | 109 ++++++++++++++++++
 src/helpers/parseSubtasksViaIndention.ts      |  42 +++++++
 3 files changed, 191 insertions(+), 11 deletions(-)
 create mode 100644 src/helpers/parseSubtasksViaIndention.test.ts
 create mode 100644 src/helpers/parseSubtasksViaIndention.ts

diff --git a/src/components/tasks/add-task.vue b/src/components/tasks/add-task.vue
index 2a2953866..88d1f0cf0 100644
--- a/src/components/tasks/add-task.vue
+++ b/src/components/tasks/add-task.vue
@@ -41,18 +41,19 @@
 </template>
 
 <script setup lang="ts">
-import {ref, watch, unref, computed} from 'vue'
+import {computed, ref, unref, watch} from 'vue'
 import {useI18n} from 'vue-i18n'
-import {tryOnMounted, debouncedWatch, useWindowSize, type MaybeRef} from '@vueuse/core'
+import {debouncedWatch, type MaybeRef, tryOnMounted, useWindowSize} from '@vueuse/core'
 
 import QuickAddMagic from '@/components/tasks/partials/quick-add-magic.vue'
+import type {ITask} from '@/modelTypes/ITask'
+import {parseSubtasksViaIndention} from '@/helpers/parseSubtasksViaIndention'
+import TaskRelationService from '@/services/taskRelation'
+import TaskRelationModel from '@/models/taskRelation'
+import {RELATION_KIND} from '@/types/IRelationKind'
 import {useAuthStore} from '@/stores/auth'
 import {useTaskStore} from '@/stores/tasks'
 
-function cleanupTitle(title: string) {
-	return title.replace(/^((\* |\+ |- )(\[ \] )?)/g, '')
-}
-
 function useAutoHeightTextarea(value: MaybeRef<string>) {
 	const textarea = ref<HTMLInputElement>()
 	const minHeight = ref(0)
@@ -161,24 +162,52 @@ async function addTask() {
 	}
 
 	const taskTitleBackup = newTaskTitle.value
-	const newTasks = newTaskTitle.value.split(/[\r\n]+/).map(async uncleanedTitle => {
-		const title = cleanupTitle(uncleanedTitle)
-		if (title === '') {
+	const createdTasks: ITask[] = []
+	const tasksToCreate = parseSubtasksViaIndention(newTaskTitle.value)
+	const newTasks = tasksToCreate.map(async t => {
+		if (t.title === '') {
 			return
 		}
 
 		const task = await taskStore.createNewTask({
-			title,
+			title: t.title,
 			listId: authStore.settings.defaultListId,
 			position: props.defaultPosition,
 		})
-		emit('taskAdded', task)
+		createdTasks.push(task)
 		return task
 	})
 
 	try {
 		newTaskTitle.value = ''
 		await Promise.all(newTasks)
+		
+		const taskRelationService = new TaskRelationService()
+		const relations = tasksToCreate.map(async t => {
+			const createdTask = createdTasks.find(ct => ct.title === t.title)
+			if (t.parent === null) {
+				emit('taskAdded', createdTask)
+				return
+			}
+			
+			const createdParentTask = createdTasks.find(ct => ct.title === t.parent)
+			if (typeof createdTask === 'undefined' || typeof createdParentTask === 'undefined') {
+				return
+			}
+
+			const rel = await taskRelationService.create(new TaskRelationModel({
+				taskId: createdTask.id,
+				otherTaskId: createdParentTask.id,
+				relationKind: RELATION_KIND.PARENTTASK,
+			}))
+			
+			createdTask.relatedTasks[RELATION_KIND.PARENTTASK] = [createdParentTask]
+			// we're only emitting here so that the relation shows up in the task list
+			emit('taskAdded', createdTask)
+			
+			return rel
+		})
+		await Promise.all(relations)
 	} catch (e: any) {
 		newTaskTitle.value = taskTitleBackup
 		if (e?.message === 'NO_LIST') {
diff --git a/src/helpers/parseSubtasksViaIndention.test.ts b/src/helpers/parseSubtasksViaIndention.test.ts
new file mode 100644
index 000000000..bae01b634
--- /dev/null
+++ b/src/helpers/parseSubtasksViaIndention.test.ts
@@ -0,0 +1,109 @@
+import {describe, it, expect} from 'vitest'
+import {parseSubtasksViaIndention} from '@/helpers/parseSubtasksViaIndention'
+
+describe('Parse Subtasks via Relation', () => {
+	it('Should not return a parent for a single task', () => {
+		const tasks = parseSubtasksViaIndention('single task')
+		
+		expect(tasks).to.have.length(1)
+		expect(tasks[0].parent).toBeNull()
+	})
+	it('Should not return a parent for multiple tasks without indention', () => {
+		const tasks = parseSubtasksViaIndention(`task one
+task two`)
+
+		expect(tasks).to.have.length(2)
+		expect(tasks[0].parent).toBeNull()
+		expect(tasks[1].parent).toBeNull()
+	})
+	it('Should return a parent for two tasks with indention', () => {
+		const tasks = parseSubtasksViaIndention(`parent task
+  sub task`)
+
+		expect(tasks).to.have.length(2)
+		expect(tasks[0].parent).toBeNull()
+		expect(tasks[0].title).to.eq('parent task')
+		expect(tasks[1].parent).to.eq('parent task')
+		expect(tasks[1].title).to.eq('sub task')
+	})
+	it('Should return a parent for multiple subtasks', () => {
+		const tasks = parseSubtasksViaIndention(`parent task
+  sub task one
+  sub task two`)
+
+		expect(tasks).to.have.length(3)
+		expect(tasks[0].parent).toBeNull()
+		expect(tasks[0].title).to.eq('parent task')
+		expect(tasks[1].title).to.eq('sub task one')
+		expect(tasks[1].parent).to.eq('parent task')
+		expect(tasks[2].title).to.eq('sub task two')
+		expect(tasks[2].parent).to.eq('parent task')
+	})
+	it('Should work with multiple indention levels', () => {
+		const tasks = parseSubtasksViaIndention(`parent task
+  sub task
+    sub sub task`)
+
+		expect(tasks).to.have.length(3)
+		expect(tasks[0].parent).toBeNull()
+		expect(tasks[0].title).to.eq('parent task')
+		expect(tasks[1].title).to.eq('sub task')
+		expect(tasks[1].parent).to.eq('parent task')
+		expect(tasks[2].title).to.eq('sub sub task')
+		expect(tasks[2].parent).to.eq('sub task')
+	})
+	it('Should work with multiple indention levels and multiple tasks', () => {
+		const tasks = parseSubtasksViaIndention(`parent task
+  sub task
+    sub sub task one
+    sub sub task two`)
+
+		expect(tasks).to.have.length(4)
+		expect(tasks[0].parent).toBeNull()
+		expect(tasks[0].title).to.eq('parent task')
+		expect(tasks[1].title).to.eq('sub task')
+		expect(tasks[1].parent).to.eq('parent task')
+		expect(tasks[2].title).to.eq('sub sub task one')
+		expect(tasks[2].parent).to.eq('sub task')
+		expect(tasks[3].title).to.eq('sub sub task two')
+		expect(tasks[3].parent).to.eq('sub task')
+	})
+	it('Should work with multiple indention levels and multiple tasks', () => {
+		const tasks = parseSubtasksViaIndention(`parent task
+  sub task
+    sub sub task one
+      sub sub sub task
+    sub sub task two`)
+
+		expect(tasks).to.have.length(5)
+		expect(tasks[0].parent).toBeNull()
+		expect(tasks[0].title).to.eq('parent task')
+		expect(tasks[1].title).to.eq('sub task')
+		expect(tasks[1].parent).to.eq('parent task')
+		expect(tasks[2].title).to.eq('sub sub task one')
+		expect(tasks[2].parent).to.eq('sub task')
+		expect(tasks[3].title).to.eq('sub sub sub task')
+		expect(tasks[3].parent).to.eq('sub sub task one')
+		expect(tasks[4].title).to.eq('sub sub task two')
+		expect(tasks[4].parent).to.eq('sub task')
+	})
+	it('Should return a parent for multiple subtasks with special stuff', () => {
+		const tasks = parseSubtasksViaIndention(`* parent task
+  * sub task one
+  sub task two`)
+
+		expect(tasks).to.have.length(3)
+		expect(tasks[0].parent).toBeNull()
+		expect(tasks[0].title).to.eq('parent task')
+		expect(tasks[1].title).to.eq('sub task one')
+		expect(tasks[1].parent).to.eq('parent task')
+		expect(tasks[2].title).to.eq('sub task two')
+		expect(tasks[2].parent).to.eq('parent task')
+	})
+	it('Should not break when the first line is indented', () => {
+		const tasks = parseSubtasksViaIndention('  single task')
+
+		expect(tasks).to.have.length(1)
+		expect(tasks[0].parent).toBeNull()
+	})
+})
diff --git a/src/helpers/parseSubtasksViaIndention.ts b/src/helpers/parseSubtasksViaIndention.ts
new file mode 100644
index 000000000..614d3b0ce
--- /dev/null
+++ b/src/helpers/parseSubtasksViaIndention.ts
@@ -0,0 +1,42 @@
+export interface TaskWithParent {
+	title: string,
+	parent: string | null,
+}
+
+function cleanupTitle(title: string) {
+	return title.replace(/^((\* |\+ |- )(\[ \] )?)/g, '')
+}
+
+const spaceRegex = /^ */
+
+// taskTitles should be multiple lines of task tiles with indention to declare their parent/subtask 
+// relation between each other.
+export function parseSubtasksViaIndention(taskTitles: string): TaskWithParent[] {
+	const titles = taskTitles.split(/[\r\n]+/)
+
+	return titles.map((t, i) => {
+		const task: TaskWithParent = {
+			title: cleanupTitle(t),
+			parent: null,
+		}
+
+		const matched = spaceRegex.exec(t)
+		const matchedSpaces = matched ? matched[0].length : 0
+
+		if (matchedSpaces > 0 && i > 0) {
+			// Go up the tree to find the first task with less indention than the current one
+			let pi = 1
+			let parentSpaces = 0
+			do {
+				task.parent = cleanupTitle(titles[i - pi])
+				pi++
+				const parentMatched = spaceRegex.exec(task.parent)
+				parentSpaces = parentMatched ? parentMatched[0].length : 0
+			} while (parentSpaces >= matchedSpaces)
+			task.title = cleanupTitle(t.replace(spaceRegex, ''))
+			task.parent = task.parent.replace(spaceRegex, '')
+		}
+
+		return task
+	})
+}

From 3970d0fd315488427df0c4a37447eb52dca322b4 Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Thu, 29 Sep 2022 18:03:23 +0200
Subject: [PATCH 2/6] chore: spread title

---
 src/components/tasks/add-task.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/tasks/add-task.vue b/src/components/tasks/add-task.vue
index 88d1f0cf0..318a6ec62 100644
--- a/src/components/tasks/add-task.vue
+++ b/src/components/tasks/add-task.vue
@@ -164,13 +164,13 @@ async function addTask() {
 	const taskTitleBackup = newTaskTitle.value
 	const createdTasks: ITask[] = []
 	const tasksToCreate = parseSubtasksViaIndention(newTaskTitle.value)
-	const newTasks = tasksToCreate.map(async t => {
-		if (t.title === '') {
+	const newTasks = tasksToCreate.map(async ({title}) => {
+		if (title === '') {
 			return
 		}
 
 		const task = await taskStore.createNewTask({
-			title: t.title,
+			title,
 			listId: authStore.settings.defaultListId,
 			position: props.defaultPosition,
 		})

From 5f5ed410df1a2fe73e821d7dee7ebd4c0b918069 Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Thu, 29 Sep 2022 18:05:25 +0200
Subject: [PATCH 3/6] fix: don't emit a possible null task

---
 src/components/tasks/add-task.vue | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/components/tasks/add-task.vue b/src/components/tasks/add-task.vue
index 318a6ec62..c5decc1a5 100644
--- a/src/components/tasks/add-task.vue
+++ b/src/components/tasks/add-task.vue
@@ -181,15 +181,19 @@ async function addTask() {
 	try {
 		newTaskTitle.value = ''
 		await Promise.all(newTasks)
-		
+
 		const taskRelationService = new TaskRelationService()
 		const relations = tasksToCreate.map(async t => {
 			const createdTask = createdTasks.find(ct => ct.title === t.title)
+			if (typeof createdTask === 'undefined') {
+				return
+			}
+
 			if (t.parent === null) {
 				emit('taskAdded', createdTask)
 				return
 			}
-			
+
 			const createdParentTask = createdTasks.find(ct => ct.title === t.parent)
 			if (typeof createdTask === 'undefined' || typeof createdParentTask === 'undefined') {
 				return
@@ -200,11 +204,11 @@ async function addTask() {
 				otherTaskId: createdParentTask.id,
 				relationKind: RELATION_KIND.PARENTTASK,
 			}))
-			
+
 			createdTask.relatedTasks[RELATION_KIND.PARENTTASK] = [createdParentTask]
 			// we're only emitting here so that the relation shows up in the task list
 			emit('taskAdded', createdTask)
-			
+
 			return rel
 		})
 		await Promise.all(relations)

From 8ce242bb6595ef12442a6ba0fb37eb66c65dd71b Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Thu, 29 Sep 2022 18:08:05 +0200
Subject: [PATCH 4/6] chore: use better variable names

---
 src/helpers/parseSubtasksViaIndention.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/helpers/parseSubtasksViaIndention.ts b/src/helpers/parseSubtasksViaIndention.ts
index 614d3b0ce..e2900b098 100644
--- a/src/helpers/parseSubtasksViaIndention.ts
+++ b/src/helpers/parseSubtasksViaIndention.ts
@@ -14,26 +14,26 @@ const spaceRegex = /^ */
 export function parseSubtasksViaIndention(taskTitles: string): TaskWithParent[] {
 	const titles = taskTitles.split(/[\r\n]+/)
 
-	return titles.map((t, i) => {
+	return titles.map((title, index) => {
 		const task: TaskWithParent = {
-			title: cleanupTitle(t),
+			title: cleanupTitle(title),
 			parent: null,
 		}
 
-		const matched = spaceRegex.exec(t)
+		const matched = spaceRegex.exec(title)
 		const matchedSpaces = matched ? matched[0].length : 0
 
-		if (matchedSpaces > 0 && i > 0) {
+		if (matchedSpaces > 0 && index > 0) {
 			// Go up the tree to find the first task with less indention than the current one
 			let pi = 1
 			let parentSpaces = 0
 			do {
-				task.parent = cleanupTitle(titles[i - pi])
+				task.parent = cleanupTitle(titles[index - pi])
 				pi++
 				const parentMatched = spaceRegex.exec(task.parent)
 				parentSpaces = parentMatched ? parentMatched[0].length : 0
 			} while (parentSpaces >= matchedSpaces)
-			task.title = cleanupTitle(t.replace(spaceRegex, ''))
+			task.title = cleanupTitle(title.replace(spaceRegex, ''))
 			task.parent = task.parent.replace(spaceRegex, '')
 		}
 

From d58f8b4ba1d873abb0fc8dc4c2cec64a33b55ab8 Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Thu, 29 Sep 2022 18:09:35 +0200
Subject: [PATCH 5/6] chore: break earlier if index === 0

---
 src/helpers/parseSubtasksViaIndention.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/helpers/parseSubtasksViaIndention.ts b/src/helpers/parseSubtasksViaIndention.ts
index e2900b098..5c9589b78 100644
--- a/src/helpers/parseSubtasksViaIndention.ts
+++ b/src/helpers/parseSubtasksViaIndention.ts
@@ -20,10 +20,14 @@ export function parseSubtasksViaIndention(taskTitles: string): TaskWithParent[]
 			parent: null,
 		}
 
+		if (index === 0) {
+			return task
+		}
+
 		const matched = spaceRegex.exec(title)
 		const matchedSpaces = matched ? matched[0].length : 0
 
-		if (matchedSpaces > 0 && index > 0) {
+		if (matchedSpaces > 0) {
 			// Go up the tree to find the first task with less indention than the current one
 			let pi = 1
 			let parentSpaces = 0

From 5bd7c77b68f08ab4771f3d80d5191def9d634204 Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Fri, 30 Sep 2022 13:36:57 +0200
Subject: [PATCH 6/6] chore: use jsDoc to explain param

---
 src/helpers/parseSubtasksViaIndention.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/helpers/parseSubtasksViaIndention.ts b/src/helpers/parseSubtasksViaIndention.ts
index 5c9589b78..8a451bdd1 100644
--- a/src/helpers/parseSubtasksViaIndention.ts
+++ b/src/helpers/parseSubtasksViaIndention.ts
@@ -9,8 +9,10 @@ function cleanupTitle(title: string) {
 
 const spaceRegex = /^ */
 
-// taskTitles should be multiple lines of task tiles with indention to declare their parent/subtask 
-// relation between each other.
+/**
+ * @param taskTitles should be multiple lines of task tiles with indention to declare their parent/subtask
+ * relation between each other.
+ */
 export function parseSubtasksViaIndention(taskTitles: string): TaskWithParent[] {
 	const titles = taskTitles.split(/[\r\n]+/)