Merge pull request #8 from chhoumann/v1.3.0

.autorc

@@ -0,0 +1,9 @@
+{
+  "plugins": [
+    ["obsidian", { "dir": "./dist", "zip": true }]
+  ],
+  "owner": "chhoumann",
+  "repo": "MetaEdit",
+  "name": "Christian B. B. Houmann",
+  "email": "christian@bagerbach.com"
+}

.gitignore

@@ -1,3 +1,5 @@
+.env
+
 # Intellij
 *.iml
 .idea
@@ -7,7 +9,7 @@ node_modules
 package-lock.json
 
 # build
-main.js
+dist/main.js
 *.js.map
 
 # obsidian

manifest.json

@@ -1,7 +1,7 @@
 {
 	"id": "MetaEdit",
 	"name": "MetaEdit",
-	"version": "1.2.0",
+	"version": "1.3.0",
 	"minAppVersion": "0.12.0",
 	"description": "MetaEdit helps you manage your metadata.",
 	"author": "Christian B. B. Houmann",

package.json

@@ -1,11 +1,12 @@
 {
   "name": "metaedit",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "MetaEdit helps you manage your metadata.",
-  "main": "main.js",
+  "main": "dist/main.js",
   "scripts": {
     "dev": "rollup --config rollup.config.js -w",
-    "build": "rollup --config rollup.config.js --environment BUILD:production"
+    "build": "rollup --config rollup.config.js --environment BUILD:production",
+    "release": "auto shipit"
   },
   "keywords": [],
   "author": "Christian B. B. Houmann",
@@ -14,16 +15,18 @@
     "@rollup/plugin-commonjs": "^18.0.0",
     "@rollup/plugin-node-resolve": "^11.2.1",
     "@rollup/plugin-typescript": "^8.2.1",
+    "@tsconfig/svelte": "1.0.10",
     "@types/node": "^14.14.37",
+    "auto": "10.28.0",
+    "auto-plugin-obsidian": "0.1.4",
     "obsidian": "^0.12.0",
     "rollup": "^2.32.1",
-    "tslib": "^2.2.0",
-    "typescript": "^4.2.4",
     "rollup-plugin-svelte": "^7.1.0",
     "svelte": "^3.37.0",
     "svelte-check": "^1.3.0",
     "svelte-preprocess": "^4.7.0",
-    "@tsconfig/svelte": "1.0.10"
+    "tslib": "^2.2.0",
+    "typescript": "^4.2.4"
   },
   "dependencies": {
     "@popperjs/core": "^2.9.2"

rollup.config.js

@@ -6,7 +6,7 @@ import autoPreprocess from "svelte-preprocess";
 export default {
   input: 'src/main.ts',
   output: {
-    dir: '.',
+    dir: './dist',
     format: 'cjs',
     exports: 'default',
   },

src/Modals/LinkMenu.ts

@@ -0,0 +1,31 @@
+import type MetaEdit from "../main";
+import {Menu, TFile} from "obsidian";
+
+export class LinkMenu {
+    private targetFile: TFile;
+
+    constructor(private plugin: MetaEdit) {
+        this.registerEvent();
+    }
+
+    registerEvent(): void {
+        this.plugin.registerEvent(
+            this.plugin.app.workspace.on('file-menu', (menu, file, source) => {
+                if (source === "link-context-menu" && file instanceof TFile) {
+                    this.targetFile = file;
+                    this.addOptions(menu);
+                }
+            })
+        )
+    }
+
+    private addOptions(menu: Menu) {
+        menu.addItem(item => {
+            item.setIcon('pencil');
+            item.setTitle("Edit Meta");
+            item.onClick(async evt => {
+                await this.plugin.runMetaEditForFile(this.targetFile);
+            })
+        })
+    }
+}

src/main.ts

@@ -1,9 +1,10 @@
-import {debounce, Notice, Plugin, TAbstractFile, TFile} from 'obsidian';
+import {debounce, Notice, Plugin, TAbstractFile, TFile, TFolder} from 'obsidian';
 import {MetaEditSettingsTab} from "./Settings/metaEditSettingsTab";
 import MEMainSuggester from "./Modals/metaEditSuggester";
 import MetaController from "./metaController";
 import type {MetaEditSettings} from "./Settings/metaEditSettings";
 import {DEFAULT_SETTINGS} from "./Settings/defaultSettings";
+import {LinkMenu} from "./Modals/LinkMenu";
 
 export default class MetaEdit extends Plugin {
     public settings: MetaEditSettings;
@@ -45,17 +46,22 @@ export default class MetaEdit extends Plugin {
             callback: async () => {
                 const file: TFile = this.getCurrentFile();
                 if (!file) return;
-                const data = await this.controller.getPropertiesInFile(file);
-                if (!data) return;
-
-                const suggester: MEMainSuggester = new MEMainSuggester(this.app, this, data, file, this.controller);
-                suggester.open();
+                await this.runMetaEditForFile(file);
             }
         });
 
         this.onModifyCallbackToggle(true);
 
         this.addSettingTab(new MetaEditSettingsTab(this.app, this));
+        new LinkMenu(this);
+    }
+
+    public async runMetaEditForFile(file: TFile) {
+        const data = await this.controller.getPropertiesInFile(file);
+        if (!data) return;
+
+        const suggester: MEMainSuggester = new MEMainSuggester(this.app, this, data, file, this.controller);
+        suggester.open();
     }
 
     onunload() {

src/metaController.ts

@@ -21,14 +21,14 @@ export default class MetaController {
         this.plugin = plugin;
     }
 
-    public async getPropertiesInFile(file: TFile) {
+    public async getPropertiesInFile(file: TFile): Promise<{}> {
         const yaml = await this.parser.parseFrontmatter(file);
         const inlineFields = await this.parser.parseInlineFields(file);
 
         return {...yaml, ...inlineFields};
     }
 
-    public async addYamlProp(propName: string, propValue: string, file: TFile) {
+    public async addYamlProp(propName: string, propValue: string, file: TFile): Promise<void> {
         const fileContent: string = await this.app.vault.read(file);
         const frontmatter: FrontMatterCache = this.app.metadataCache.getFileCache(file).frontmatter;
         const isYamlEmpty: boolean = (frontmatter === undefined && !fileContent.match(/^-{3}\s*\n*\r*-{3}/));
@@ -53,7 +53,7 @@ export default class MetaController {
         await this.app.vault.modify(file, newFileContent);
     }
 
-    public async addDataviewField(propName: string, propValue: string, file: TFile) {
+    public async addDataviewField(propName: string, propValue: string, file: TFile): Promise<void> {
         const fileContent: string = await this.app.vault.read(file);
         let lines = fileContent.split("\n").reduce((obj: {[key: string]: string}, line: string, idx: number) => {
             obj[idx] = !!line ? line : "";
@@ -72,7 +72,7 @@ export default class MetaController {
         await this.app.vault.modify(file, newFileContent);
     }
 
-    public async editMetaElement(toEdit: string, meta: SuggestData, file: TFile) {
+    public async editMetaElement(toEdit: string, meta: SuggestData, file: TFile): Promise<void> {
         const mode: EditMode = this.plugin.settings.EditMode.mode;
 
         if (mode === EditMode.AllMulti || mode === EditMode.SomeMulti)
@@ -81,7 +81,7 @@ export default class MetaController {
             await this.standardMode(toEdit, file);
     }
 
-    public async handleProgressProps(meta: SuggestData, file: TFile) {
+    public async handleProgressProps(meta: SuggestData, file: TFile): Promise<void> {
         try {
             const {enabled, properties} = this.plugin.settings.ProgressProperties;
             if (!enabled) return;
@@ -265,8 +265,8 @@ export default class MetaController {
         return null;
     }
 
-    public async updatePropertyInFile(property: string, newValue: string, file: TFile) {
-        const propertyIsYaml = this.propertyIsYaml(property, file);
+    public async updatePropertyInFile(property: string, newValue: string, file: TFile): Promise<void> {
+        const propertyIsYaml = await this.propertyIsYaml(property, file);
         const fileContent = await this.app.vault.read(file);
 
         const newFileContent = fileContent.split("\n").map(line => {
@@ -284,7 +284,7 @@ export default class MetaController {
         await this.app.vault.modify(file, newFileContent);
     }
 
-    private async updateMultipleInFile(props: {[key: string]: string}, file: TFile) {
+    private async updateMultipleInFile(props: {[key: string]: string}, file: TFile): Promise<void> {
         const fileContent = (await this.app.vault.read(file)).split("\n");
 
         for (const prop of Object.keys(props)) {

src/parser.ts

@@ -9,7 +9,7 @@ export default class MetaEditParser {
     }
 
     public async parseFrontmatter(file: TFile): Promise<{ [key: string]: any }> {
-        const frontmatter = this.app.metadataCache.getFileCache(file).frontmatter;
+        const frontmatter = this.app.metadataCache.getFileCache(file)?.frontmatter;
         if (!frontmatter) return {};
         const {position: {start, end}} = frontmatter;
         const filecontent = await this.app.vault.read(file);