Add task metadata and reindex all command

Author: blacksmithgu

datacore.api.md

@@ -366,6 +366,7 @@ export class Datacore extends Component {
     //
     // @internal
     reads: EmbedQueue;
+    reindex(): Promise<void>;
     reload(file: TFile): Promise<Indexable>;
     get revision(): number;
     // Warning: (ae-incompatible-release-tags) The symbol "settings" is marked as @public, but its signature references "Settings" which is marked as @internal

src/index/datacore.ts

@@ -110,6 +110,16 @@ export class Datacore extends Component {
         this.index();
     }
 
+    /** Clears all current state and caches and reindexes the entire vault from scratch. */
+    async reindex() {
+        this.initialized = false;
+        this.datastore.clear();
+
+        await this.persister.recreate();
+
+        await this.index();
+    }
+
     /** Indexes all documents in the vault. Wait on this if you want to wait for the whole index to be ready. */
     async index() {
         // Asynchronously initialize actual content in the background using a lifecycle-respecting object.

src/index/import/inline-field.ts

@@ -201,7 +201,7 @@ export function parseInlineValue(value: string): Literal {
  * - Look for any wrappers ('[' and '(') in the line, trying to parse whatever comes after it as an inline key::.
  * - If successful, scan until you find a matching end bracket, and parse whatever remains as an inline value.
  */
-export function extractInlineFields(line: string, includeTaskFields: boolean = false): LocalInlineField[] {
+export function extractInlineFields(line: string): LocalInlineField[] {
     let fields: LocalInlineField[] = [];
     for (let wrapper of Object.keys(INLINE_FIELD_WRAPPERS)) {
         let foundIndex = line.indexOf(wrapper);
@@ -217,8 +217,6 @@ export function extractInlineFields(line: string, includeTaskFields: boolean = f
         }
     }
 
-    if (includeTaskFields) fields = fields.concat(extractSpecialTaskFields(line));
-
     fields.sort((a, b) => a.start - b.start);
 
     let filteredFields: LocalInlineField[] = [];
@@ -267,6 +265,7 @@ export const DONE_DATE_REGEX = /\u{2705}\s*(\d{4}-\d{2}-\d{2})/u;
 export const SCHEDULED_DATE_REGEX = /[\u{23F3}\u{231B}]\s*(\d{4}-\d{2}-\d{2})/u;
 export const START_DATE_REGEX = /\u{1F6EB}\s*(\d{4}-\d{2}-\d{2})/u;
 
+/** All supported emoji metadata fields for a task. */
 export const EMOJI_REGEXES = [
     { regex: CREATED_DATE_REGEX, key: "created" },
     { regex: START_DATE_REGEX, key: "start" },
@@ -276,7 +275,7 @@ export const EMOJI_REGEXES = [
 ];
 
 /** Parse special completed/due/done task fields which are marked via emoji. */
-function extractSpecialTaskFields(line: string): LocalInlineField[] {
+export function extractSpecialTaskFields(line: string): LocalInlineField[] {
     let results: LocalInlineField[] = [];
 
     for (let { regex, key } of EMOJI_REGEXES) {
@@ -319,8 +318,9 @@ export function setInlineField(source: string, key: string, value?: string): str
     return source;
 }
 
+/** Updates a task item line with the 'completion' date emoji on being checked. */
 export function setEmojiShorthandCompletionField(source: string, value?: string): string {
-    const existing = extractInlineFields(source, true);
+    const existing = extractInlineFields(source);
     const existingKeys = existing.filter((f) => f.key === "completion" && f.wrapping === "emoji-shorthand");
 
     // Don't do anything if there are duplicate keys OR the key already doesn't exist.

src/index/import/markdown.ts

@@ -9,6 +9,7 @@ import {
     asInlineField,
     extractFullLineField,
     extractInlineFields,
+    extractSpecialTaskFields,
     jsonInlineField,
 } from "./inline-field";
 import {
@@ -184,7 +185,7 @@ export function markdownSourceImport(
     // In the second list pass, actually construct the list heirarchy.
     for (const item of listItems.values()) {
         if (item.parentLine < 0) {
-            const listBlock = blocks.getPairOrNextHigher(-item.parentLine)![1];
+            const listBlock = blocks.getPairOrNextHigher(-item.parentLine - 1)![1];
             if (!listBlock || !(listBlock.type === "list")) continue;
 
             (listBlock as ListBlockData).items.push(item);
@@ -243,6 +244,7 @@ export function markdownSourceImport(
     // Inline Fields //
     ///////////////////
 
+    // All generic inline fields.
     for (const field of iterateInlineFields(lines)) {
         const line = field.position.line;
         markdownMetadata.inlineField(field);
@@ -251,6 +253,16 @@ export function markdownSourceImport(
         lookup(line, blocks)?.metadata.inlineField(field);
         lookup(line, listItems)?.metadata.inlineField(field);
     }
+
+    for (const item of listItems.values()) {
+        for (let lineno = item.start; lineno < item.end; lineno++) {
+            const taskInlineFields = extractSpecialTaskFields(lines[lineno]);
+            for (const field of taskInlineFields) {
+                item.metadata.inlineField(asInlineField(field, lineno));
+            }
+        }
+    }
+
     sectionArray.push(...sections.values());
     return {
         lines,

src/main.ts

@@ -47,6 +47,17 @@ export default class DatacorePlugin extends Plugin {
             -100
         );
 
+        // Useful debug and non-debug commands.
+        // Drops the current index and reindexes all items.
+        this.addCommand({
+            id: "datacore-reindex-vault",
+            name: "Reindex entire vault",
+            callback: async () => {
+                console.log("Datacore: dropping the datastore and reindexing all items.");
+                await this.core.reindex();
+            },
+        });
+
         // Register JS highlighting for codeblocks.
         this.register(this.registerCodeblockHighlighting());