@riebeckite/plugin-dataview 0.0.7 → 0.0.9

package/dist/index.js

@@ -7,6 +7,139 @@ import {
 // src/remark.ts
 import { visit } from "unist-util-visit";
 
+// src/parse-shared.ts
+var DataviewParseError = class extends Error {
+};
+function splitTopLevel(text, separator) {
+  const parts = [];
+  let current = "";
+  let depth = 0;
+  let quote = null;
+  for (const char of text) {
+    if (quote) {
+      current += char;
+      if (char === quote) quote = null;
+      continue;
+    }
+    if (char === '"' || char === "'") {
+      quote = char;
+      current += char;
+      continue;
+    }
+    if (char === "(") depth += 1;
+    if (char === ")") depth = Math.max(0, depth - 1);
+    if (char === separator && depth === 0) {
+      parts.push(current.trim());
+      current = "";
+      continue;
+    }
+    current += char;
+  }
+  parts.push(current.trim());
+  return parts.filter((part) => part.length > 0);
+}
+function unquote(value) {
+  if (value.length >= 2) {
+    const first = value[0];
+    const last = value[value.length - 1];
+    if (first === '"' && last === '"' || first === "'" && last === "'") {
+      return value.slice(1, -1);
+    }
+  }
+  return value;
+}
+
+// src/parse-from.ts
+var FROM_TOKEN_PATTERN = /(\[\[[^\]]*\]\])|(#[^\s()]+)|("(?:[^"\\]|\\.)*")|('(?:[^'\\]|\\.)*')|(\()|(\))|(!|-)|([^\s()]+)/g;
+function parseFrom(text) {
+  const tokens = [];
+  FROM_TOKEN_PATTERN.lastIndex = 0;
+  for (let match = FROM_TOKEN_PATTERN.exec(text); match !== null; match = FROM_TOKEN_PATTERN.exec(text)) {
+    tokens.push(toFromToken(match));
+  }
+  if (tokens.length === 0) {
+    throw new DataviewParseError("the FROM clause is empty.");
+  }
+  const state = { tokens, index: 0 };
+  const node = parseOr(state);
+  if (state.index < tokens.length) {
+    throw new DataviewParseError("unexpected token in FROM.");
+  }
+  return node;
+}
+function toFromToken(match) {
+  const [raw, link, tag, doubleQuoted, singleQuoted, lparen, rparen, negate] = match;
+  if (link !== void 0) {
+    const value = link.slice(2, -2).split("|")[0].split("#")[0].trim();
+    if (value.length === 0) {
+      throw new DataviewParseError("a link source in FROM is empty.");
+    }
+    return { type: "source", source: { kind: "link", value } };
+  }
+  if (tag !== void 0) {
+    return { type: "source", source: { kind: "tag", value: tag.slice(1) } };
+  }
+  if (doubleQuoted !== void 0 || singleQuoted !== void 0) {
+    return {
+      type: "source",
+      source: { kind: "folder", value: unquote(raw.trim()) }
+    };
+  }
+  if (lparen !== void 0) return { type: "lparen" };
+  if (rparen !== void 0) return { type: "rparen" };
+  if (negate !== void 0) return { type: "not" };
+  const word = (raw ?? "").toLowerCase();
+  if (word === "and") return { type: "and" };
+  if (word === "or") return { type: "or" };
+  return { type: "source", source: { kind: "folder", value: raw.trim() } };
+}
+function parseOr(state) {
+  let node = parseAnd(state);
+  while (state.tokens[state.index]?.type === "or") {
+    state.index += 1;
+    node = { kind: "or", left: node, right: parseAnd(state) };
+  }
+  return node;
+}
+function parseAnd(state) {
+  let node = parseUnary(state);
+  for (; ; ) {
+    const token = state.tokens[state.index];
+    if (token?.type === "and") {
+      state.index += 1;
+      node = { kind: "and", left: node, right: parseUnary(state) };
+      continue;
+    }
+    if (token?.type === "source" || token?.type === "lparen" || token?.type === "not") {
+      node = { kind: "and", left: node, right: parseUnary(state) };
+      continue;
+    }
+    return node;
+  }
+}
+function parseUnary(state) {
+  const token = state.tokens[state.index];
+  if (!token) throw new DataviewParseError("unexpected end of FROM.");
+  if (token.type === "not") {
+    state.index += 1;
+    return { kind: "not", child: parseUnary(state) };
+  }
+  if (token.type === "lparen") {
+    state.index += 1;
+    const node = parseOr(state);
+    if (state.tokens[state.index]?.type !== "rparen") {
+      throw new DataviewParseError("unbalanced parentheses in FROM.");
+    }
+    state.index += 1;
+    return node;
+  }
+  if (token.type === "source") {
+    state.index += 1;
+    return { kind: "source", source: token.source };
+  }
+  throw new DataviewParseError("unexpected token in FROM.");
+}
+
 // src/parse.ts
 var QUERY_TYPES = /* @__PURE__ */ new Set([
   "list",
@@ -16,8 +149,6 @@ var QUERY_TYPES = /* @__PURE__ */ new Set([
 ]);
 var CLAUSE_PATTERN = /^(from|where|sort|group\s+by|limit)\b(.*)$/i;
 var FIELD_PATTERN = /^[A-Za-z_$][A-Za-z0-9_$]*(?:\.[A-Za-z_$][A-Za-z0-9_$]*)*$/;
-var DataviewParseError = class extends Error {
-};
 function parseDataview(source) {
   try {
     return { status: "ok", spec: parseSpec(source) };
@@ -160,102 +291,13 @@ function parseField(value, context) {
   }
   return field;
 }
-var FROM_TOKEN_PATTERN = /(\[\[[^\]]*\]\])|(#[^\s()]+)|("(?:[^"\\]|\\.)*")|('(?:[^'\\]|\\.)*')|(\()|(\))|(!|-)|([^\s()]+)/g;
-function parseFrom(text) {
-  const tokens = [];
-  FROM_TOKEN_PATTERN.lastIndex = 0;
-  for (let match = FROM_TOKEN_PATTERN.exec(text); match !== null; match = FROM_TOKEN_PATTERN.exec(text)) {
-    tokens.push(toFromToken(match));
-  }
-  if (tokens.length === 0) {
-    throw new DataviewParseError("the FROM clause is empty.");
-  }
-  const state = { tokens, index: 0 };
-  const node = parseFromOr(state);
-  if (state.index < tokens.length) {
-    throw new DataviewParseError("unexpected token in FROM.");
-  }
-  return node;
-}
-function toFromToken(match) {
-  const [raw, link, tag, doubleQuoted, singleQuoted, lparen, rparen, negate] = match;
-  if (link !== void 0) {
-    const value = link.slice(2, -2).split("|")[0].split("#")[0].trim();
-    if (value.length === 0) {
-      throw new DataviewParseError("a link source in FROM is empty.");
-    }
-    return { type: "source", source: { kind: "link", value } };
-  }
-  if (tag !== void 0) {
-    return { type: "source", source: { kind: "tag", value: tag.slice(1) } };
-  }
-  if (doubleQuoted !== void 0 || singleQuoted !== void 0) {
-    return {
-      type: "source",
-      source: { kind: "folder", value: unquote(raw.trim()) }
-    };
-  }
-  if (lparen !== void 0) return { type: "lparen" };
-  if (rparen !== void 0) return { type: "rparen" };
-  if (negate !== void 0) return { type: "not" };
-  const word = (raw ?? "").toLowerCase();
-  if (word === "and") return { type: "and" };
-  if (word === "or") return { type: "or" };
-  return { type: "source", source: { kind: "folder", value: raw.trim() } };
-}
-function parseFromOr(state) {
-  let node = parseFromAnd(state);
-  while (state.tokens[state.index]?.type === "or") {
-    state.index += 1;
-    node = { kind: "or", left: node, right: parseFromAnd(state) };
-  }
-  return node;
-}
-function parseFromAnd(state) {
-  let node = parseFromUnary(state);
-  for (; ; ) {
-    const token = state.tokens[state.index];
-    if (token?.type === "and") {
-      state.index += 1;
-      node = { kind: "and", left: node, right: parseFromUnary(state) };
-      continue;
-    }
-    if (token?.type === "source" || token?.type === "lparen" || token?.type === "not") {
-      node = { kind: "and", left: node, right: parseFromUnary(state) };
-      continue;
-    }
-    return node;
-  }
-}
-function parseFromUnary(state) {
-  const token = state.tokens[state.index];
-  if (!token) throw new DataviewParseError("unexpected end of FROM.");
-  if (token.type === "not") {
-    state.index += 1;
-    return { kind: "not", child: parseFromUnary(state) };
-  }
-  if (token.type === "lparen") {
-    state.index += 1;
-    const node = parseFromOr(state);
-    if (state.tokens[state.index]?.type !== "rparen") {
-      throw new DataviewParseError("unbalanced parentheses in FROM.");
-    }
-    state.index += 1;
-    return node;
-  }
-  if (token.type === "source") {
-    state.index += 1;
-    return { kind: "source", source: token.source };
-  }
-  throw new DataviewParseError("unexpected token in FROM.");
-}
 function parseExpression(text) {
   const tokens = tokenizeExpression(text);
   if (tokens.length === 0) {
     throw new DataviewParseError("the WHERE clause is empty.");
   }
   const state = { tokens, index: 0 };
-  const node = parseOr(state);
+  const node = parseOr2(state);
   if (state.index < tokens.length) {
     throw new DataviewParseError("unexpected token in the WHERE expression.");
   }
@@ -346,26 +388,26 @@ function readQuoted(text, start) {
   }
   throw new DataviewParseError("unterminated string literal in WHERE.");
 }
-function parseOr(state) {
-  let node = parseAnd(state);
+function parseOr2(state) {
+  let node = parseAnd2(state);
   while (isWord(state.tokens[state.index], "or")) {
     state.index += 1;
-    node = { kind: "or", left: node, right: parseAnd(state) };
+    node = { kind: "or", left: node, right: parseAnd2(state) };
   }
   return node;
 }
-function parseAnd(state) {
-  let node = parseUnary(state);
+function parseAnd2(state) {
+  let node = parseUnary2(state);
   while (isWord(state.tokens[state.index], "and")) {
     state.index += 1;
-    node = { kind: "and", left: node, right: parseUnary(state) };
+    node = { kind: "and", left: node, right: parseUnary2(state) };
   }
   return node;
 }
-function parseUnary(state) {
+function parseUnary2(state) {
   if (state.tokens[state.index]?.type === "not") {
     state.index += 1;
-    return { kind: "not", operand: parseUnary(state) };
+    return { kind: "not", operand: parseUnary2(state) };
   }
   return parseComparison(state);
 }
@@ -388,7 +430,7 @@ function parsePrimary(state) {
   }
   if (token.type === "lparen") {
     state.index += 1;
-    const node = parseOr(state);
+    const node = parseOr2(state);
     if (state.tokens[state.index]?.type !== "rparen") {
       throw new DataviewParseError("unbalanced parentheses in WHERE.");
     }
@@ -421,10 +463,10 @@ function parseCall(state, name) {
   state.index += 2;
   const args = [];
   if (state.tokens[state.index]?.type !== "rparen") {
-    args.push(parseOr(state));
+    args.push(parseOr2(state));
     while (state.tokens[state.index]?.type === "comma") {
       state.index += 1;
-      args.push(parseOr(state));
+      args.push(parseOr2(state));
     }
   }
   if (state.tokens[state.index]?.type !== "rparen") {
@@ -436,44 +478,6 @@ function parseCall(state, name) {
 function isWord(token, value) {
   return token?.type === "word" && token.value.toLowerCase() === value;
 }
-function splitTopLevel(text, separator) {
-  const parts = [];
-  let current = "";
-  let depth = 0;
-  let quote = null;
-  for (const char of text) {
-    if (quote) {
-      current += char;
-      if (char === quote) quote = null;
-      continue;
-    }
-    if (char === '"' || char === "'") {
-      quote = char;
-      current += char;
-      continue;
-    }
-    if (char === "(") depth += 1;
-    if (char === ")") depth = Math.max(0, depth - 1);
-    if (char === separator && depth === 0) {
-      parts.push(current.trim());
-      current = "";
-      continue;
-    }
-    current += char;
-  }
-  parts.push(current.trim());
-  return parts.filter((part) => part.length > 0);
-}
-function unquote(value) {
-  if (value.length >= 2) {
-    const first = value[0];
-    const last = value[value.length - 1];
-    if (first === '"' && last === '"' || first === "'" && last === "'") {
-      return value.slice(1, -1);
-    }
-  }
-  return value;
-}
 
 // src/placeholder.ts
 var DATAVIEW_ATTRIBUTE = "data-rr-dataview";

package/dist/src/parse-from.d.ts

@@ -0,0 +1,2 @@
+import type { DataviewFrom } from "./types.js";
+export declare function parseFrom(text: string): DataviewFrom;

package/dist/src/parse-shared.d.ts

@@ -0,0 +1,4 @@
+export declare class DataviewParseError extends Error {
+}
+export declare function splitTopLevel(text: string, separator: string): string[];
+export declare function unquote(value: string): string;

package/dist/src/parse.d.ts

@@ -1,6 +1,4 @@
 import type { DataviewParseResult } from "./types.js";
-declare class DataviewParseError extends Error {
-}
 /**
  * Parse a declarative `dataview` block body into a {@link DataviewSpec}.
  *
@@ -8,4 +6,4 @@ declare class DataviewParseError extends Error {
  * failed {@link DataviewParseResult} so callers can render a fallback.
  */
 export declare function parseDataview(source: string): DataviewParseResult;
-export { DataviewParseError };
+export { DataviewParseError } from "./parse-shared.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riebeckite/plugin-dataview",
-  "version": "0.0.7",
+  "version": "0.0.9",
   "license": "Apache-2.0",
   "type": "module",
   "main": "./dist/index.js",
@@ -17,7 +17,7 @@
   "dependencies": {
     "@types/mdast": "^4.0.4",
     "unist-util-visit": "^5.1.0",
-    "@riebeckite/core": "0.0.7"
+    "@riebeckite/core": "0.0.9"
   },
   "publishConfig": {
     "access": "public"