0.2.3

manifest.json

@@ -1,7 +1,7 @@
 {
   "id": "dataview",
   "name": "Dataview",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "minAppVersion": "0.10.13",
   "description": "Complex data views for the data-obsessed.",
   "author": "Michael Brenan <[email protected]>",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "obsidian-dataview",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "Advanced data views for Obsidian.md.",
   "main": "main.js",
   "scripts": {

src/eval.ts

@@ -1,5 +1,6 @@
 /** Evaluates fields in the expression language. */
 import { BinaryOp, LiteralType, LiteralField, LiteralFieldRepr, Field, Fields } from 'src/query';
+import { normalizeDuration } from "src/util/normalize";
 
 /////////////////////////////////
 // Core Context Implementation //
@@ -268,14 +269,14 @@ export const BINARY_OPS = BinaryOpHandler.create()
         le: (a, b) => Fields.bool(a.value < b.value)
     })
     // Date Operations.
-    .add("-", 'date', 'date', (a, b) => Fields.literal('duration', b.value.until(a.value).toDuration("seconds")))
+    .add("-", 'date', 'date', (a, b) => Fields.literal('duration', normalizeDuration(b.value.until(a.value).toDuration("seconds"))))
     .addComparison('date', {
         equals: (a, b) => Fields.bool(a.value.equals(b.value)),
         le: (a, b) => Fields.bool(a.value < b.value)
     })
     // Duration operations.
-    .add('+', 'duration', 'duration', (a, b) => Fields.literal('duration', a.value.plus(b.value)))
-    .add('-', 'duration', 'duration', (a, b) => Fields.literal('duration', a.value.minus(b.value)))
+    .add('+', 'duration', 'duration', (a, b) => Fields.literal('duration', normalizeDuration(a.value.plus(b.value))))
+    .add('-', 'duration', 'duration', (a, b) => Fields.literal('duration', normalizeDuration(a.value.minus(b.value))))
     .addComparison('duration', {
         equals: (a, b) => Fields.bool(a.value.equals(b.value)),
         le: (a, b) => Fields.bool(a.value < b.value)
@@ -301,6 +302,11 @@ export const BINARY_OPS = BinaryOpHandler.create()
         }
         return Fields.object(result);
     })
+    // Link operations.
+    .addComparison('link', {
+        equals: (a, b) => Fields.bool(a.value == b.value),
+        le: (a, b) => Fields.bool(a.value < b.value)
+    })
     // Boolean operations.
     .add('&', '*', '*', (a, b) => Fields.literal('boolean', Fields.isTruthy(a) && Fields.isTruthy(b)))
     .add('|', '*', '*', (a, b) => Fields.literal('boolean', Fields.isTruthy(a) || Fields.isTruthy(b)))

src/main.ts

@@ -23,14 +23,12 @@ export default class DataviewPlugin extends Plugin {
 	settings: DataviewSettings;
 	workspace: Workspace;
 
-	index: FullIndex;
-	tasks: TaskCache;
+	index: FullIndex = null;
+	tasks: TaskCache = null;
 
 	async onload() {
 		this.settings = Object.assign(DEFAULT_SETTINGS, await this.loadData());
 		this.workspace = this.app.workspace;
-		this.index = null;
-		this.tasks = null;
 
 		this.addSettingTab(new DataviewSettingsTab(this.app, this));
 
@@ -96,7 +94,7 @@ export default class DataviewPlugin extends Plugin {
 
 	private wrapWithEnsureTaskIndex(ctx: MarkdownPostProcessorContext, container: HTMLElement, success: () => MarkdownRenderChild): EnsurePredicateRenderer {
 		return new EnsurePredicateRenderer(ctx, container,
-			() => (this.index != null) && (this.tasks != null),
+			() => (this.index != null) && (this.tasks != null) && (this.index != undefined) && (this.tasks != undefined),
 			success);
 	}
 }

src/parse.ts

@@ -156,7 +156,7 @@ export const EXPRESSION = P.createLanguage<ExpressionLanguage>({
     identifierDot: q => P.regexp(/[\p{Letter}\p{Emoji_Presentation}][\p{Letter}\p{Emoji_Presentation}\.\w_-]*/u).desc("variable identifier"),
 
     // An Obsidian link of the form [[<link>]].
-    link: q => P.regexp(/\[\[(.*)\]\]/u, 1).desc("file link"),
+    link: q => P.regexp(/\[\[(.*?)\]\]/u, 1).desc("file link"),
 
     // Binary plus or minus operator.
     binaryPlusMinus: q => P.regexp(/\+|-/).map(str => str as BinaryOp).desc("'+' or '-'"),

src/render.ts

@@ -1,5 +1,6 @@
 import { DateTime, Duration } from 'luxon';
 import { Field, LiteralField } from 'src/query';
+import { normalizeDuration } from './util/normalize';
 
 /** Make an Obsidian-friendly internal link. */
 export function createAnchor(text: string, target: string, internal: boolean): HTMLAnchorElement {
@@ -101,7 +102,7 @@ export function renderMinimalDate(time: DateTime): string {
 
 /** Render a duration in a minimal format to save space. */
 export function renderMinimalDuration(dur: Duration): string {
-	dur = dur.shiftTo("years", "months", "weeks", "days", "hours", "minutes", "seconds", "milliseconds").normalize();
+	dur = normalizeDuration(dur);
 
 	let result = "";
 	if (dur.years) result += `${dur.years} years, `;

src/util/normalize.ts

@@ -0,0 +1,6 @@
+import { Duration } from "luxon";
+
+/** Normalize a duration to all of the proper units. */
+export function normalizeDuration(dur: Duration) {
+	return dur.shiftTo("years", "months", "weeks", "days", "hours", "minutes", "seconds", "milliseconds").normalize();
+}

src/util/result.ts

@@ -24,8 +24,18 @@ export class Result<T, E> {
         else return Result.failure<U, E>(this.error);
     }
 
+    public mapErr<U>(func: (err: E) => U): Result<T, U> {
+        if (this.success) return Result.success<T, U>(this.result);
+        else return Result.failure<T, U>(func(this.error));
+    }
+
     public flatMap<U>(func: (res: T) => Result<U, E>): Result<U, E> {
         if (this.success) return func(this.result);
         else return Result.failure<U, E>(this.error);
     }
+
+    public flatMapErr<U>(func: (err: E) => Result<T, U>): Result<T, U> {
+        if (this.success) return Result.success<T, U>(this.result);
+        else return func(this.error);
+    }
 }

versions.json

@@ -14,5 +14,6 @@
   "0.2.0": "0.10.13",
   "": "0.10.13",
   "0.2.1": "0.10.13",
-  "0.2.2": "0.10.13"
+  "0.2.2": "0.10.13",
+  "0.2.3": "0.10.13"
 }