@karmaniverous/jeeves-watcher 0.9.5 → 0.9.7

package/config.schema.json

@@ -807,7 +807,7 @@
           "items": {
             "$ref": "#/definitions/__schema66"
           },
-          "description": "Keys to extract from context and include as YAML frontmatter."
+          "description": "Keys or glob patterns to include as YAML frontmatter. Supports picomatch globs (e.g. \"*\") and \"!\"-prefixed exclusion patterns (e.g. \"!_*\"). Explicit names preserve declaration order; glob-matched keys are sorted alphabetically."
         },
         "body": {
           "type": "array",

package/dist/cli/jeeves-watcher/index.js

@@ -1057,6 +1057,72 @@ function rebaseHeadings(markdown, baseHeading) {
     return rebased.join('\n');
 }
 
+/**
+ * @module templates/resolveFrontmatterKeys
+ * Resolves frontmatter key patterns (with glob/negation support) against
+ * available context keys. Patterns prefixed with `!` are exclusions.
+ * Supports picomatch glob syntax (e.g. `*`, `_*`, `chunk_*`).
+ */
+/**
+ * Resolve frontmatter patterns against available keys.
+ *
+ * @param patterns - Array of key names or glob patterns. `!`-prefixed patterns exclude.
+ * @param allKeys - All available keys from the rendering context.
+ * @returns Ordered array of resolved keys: explicit names in declaration order,
+ *   then glob-matched names sorted alphabetically, minus exclusions.
+ */
+function resolveFrontmatterKeys(patterns, allKeys) {
+    const includes = [];
+    const excludePatterns = [];
+    for (const p of patterns) {
+        if (p.startsWith('!')) {
+            excludePatterns.push(p.slice(1));
+        }
+        else {
+            includes.push(p);
+        }
+    }
+    const isExcluded = excludePatterns.length
+        ? picomatch(excludePatterns)
+        : () => false;
+    // Collect keys: explicit names first (in order), then glob-expanded (sorted).
+    const result = [];
+    const seen = new Set();
+    // Pass 1: explicit (non-glob) names — preserved in declaration order.
+    const explicitNames = [];
+    const globPatterns = [];
+    for (const p of includes) {
+        if (isGlob(p)) {
+            globPatterns.push(p);
+        }
+        else {
+            explicitNames.push(p);
+        }
+    }
+    for (const name of explicitNames) {
+        if (!isExcluded(name) && allKeys.includes(name) && !seen.has(name)) {
+            result.push(name);
+            seen.add(name);
+        }
+    }
+    // Pass 2: glob patterns — matched keys sorted alphabetically.
+    if (globPatterns.length) {
+        const isIncluded = picomatch(globPatterns);
+        const matched = allKeys.filter((k) => isIncluded(k)).sort();
+        for (const key of matched) {
+            if (!isExcluded(key) && !seen.has(key)) {
+                result.push(key);
+                seen.add(key);
+            }
+        }
+    }
+    return result;
+}
+/** Check whether a pattern contains glob characters. */
+function isGlob(pattern) {
+    return /[*?[\]{}]/.test(pattern);
+}
+
 /**
  * @module templates/renderDoc
  * Declarative renderer for YAML frontmatter + structured Markdown body.
@@ -1085,8 +1151,11 @@ function renderValueAsMarkdown(hbs, section, value) {
         const md = callFormatHelper(hbs, section.format, value, section.formatArgs);
         return rebaseHeadings(md, section.heading);
     }
-    const strValue = typeof value === 'string' ? value : JSON.stringify(value, null, 2);
-    return hbs.Utils.escapeExpression(strValue);
+    // Return string values as-is — renderDoc produces markdown, not HTML.
+    // HTML escaping (if needed) happens downstream when the markdown is rendered.
+    if (typeof value === 'string')
+        return value;
+    return JSON.stringify(value, null, 2);
 }
 function renderEach(hbs, section, value) {
     if (!Array.isArray(value))
@@ -1127,9 +1196,10 @@ function renderEach(hbs, section, value) {
  */
 function renderDoc(context, config, hbs) {
     const parts = [];
-    // Frontmatter
+    // Frontmatter — resolve patterns (globs, negations) against context keys.
+    const resolvedKeys = resolveFrontmatterKeys(config.frontmatter, Object.keys(context));
     const fmObj = {};
-    for (const key of config.frontmatter) {
+    for (const key of resolvedKeys) {
         const v = get(context, key);
         if (v !== undefined) {
             fmObj[key] = v;
@@ -1923,10 +1993,12 @@ const renderBodySectionSchema = z.object({
 });
 /** Render config: YAML frontmatter + ordered body sections. */
 const renderConfigSchema = z.object({
-    /** Keys to extract from context and include as YAML frontmatter. */
+    /** Keys or glob patterns to extract from context and include as YAML frontmatter. */
     frontmatter: z
         .array(z.string().min(1))
-        .describe('Keys to extract from context and include as YAML frontmatter.'),
+        .describe('Keys or glob patterns to include as YAML frontmatter. ' +
+        'Supports picomatch globs (e.g. "*") and "!"-prefixed exclusion patterns (e.g. "!_*"). ' +
+        'Explicit names preserve declaration order; glob-matched keys are sorted alphabetically.'),
     /** Ordered markdown body sections. */
     body: z
         .array(renderBodySectionSchema)

package/dist/index.js

@@ -12,9 +12,9 @@ import { capitalize, title, camel, snake, dash, isEqual, get, parallel, omit } f
 import rehypeParse from 'rehype-parse';
 import { unified } from 'unified';
 import yaml from 'js-yaml';
+import picomatch from 'picomatch';
 import Ajv from 'ajv';
 import addFormats from 'ajv-formats';
-import picomatch from 'picomatch';
 import { readdir, stat, writeFile, rm, readFile, mkdir } from 'node:fs/promises';
 import { z, ZodError } from 'zod';
 import { JSONPath } from 'jsonpath-plus';
@@ -374,6 +374,72 @@ function rebaseHeadings(markdown, baseHeading) {
     return rebased.join('\n');
 }
 
+/**
+ * @module templates/resolveFrontmatterKeys
+ * Resolves frontmatter key patterns (with glob/negation support) against
+ * available context keys. Patterns prefixed with `!` are exclusions.
+ * Supports picomatch glob syntax (e.g. `*`, `_*`, `chunk_*`).
+ */
+/**
+ * Resolve frontmatter patterns against available keys.
+ *
+ * @param patterns - Array of key names or glob patterns. `!`-prefixed patterns exclude.
+ * @param allKeys - All available keys from the rendering context.
+ * @returns Ordered array of resolved keys: explicit names in declaration order,
+ *   then glob-matched names sorted alphabetically, minus exclusions.
+ */
+function resolveFrontmatterKeys(patterns, allKeys) {
+    const includes = [];
+    const excludePatterns = [];
+    for (const p of patterns) {
+        if (p.startsWith('!')) {
+            excludePatterns.push(p.slice(1));
+        }
+        else {
+            includes.push(p);
+        }
+    }
+    const isExcluded = excludePatterns.length
+        ? picomatch(excludePatterns)
+        : () => false;
+    // Collect keys: explicit names first (in order), then glob-expanded (sorted).
+    const result = [];
+    const seen = new Set();
+    // Pass 1: explicit (non-glob) names — preserved in declaration order.
+    const explicitNames = [];
+    const globPatterns = [];
+    for (const p of includes) {
+        if (isGlob(p)) {
+            globPatterns.push(p);
+        }
+        else {
+            explicitNames.push(p);
+        }
+    }
+    for (const name of explicitNames) {
+        if (!isExcluded(name) && allKeys.includes(name) && !seen.has(name)) {
+            result.push(name);
+            seen.add(name);
+        }
+    }
+    // Pass 2: glob patterns — matched keys sorted alphabetically.
+    if (globPatterns.length) {
+        const isIncluded = picomatch(globPatterns);
+        const matched = allKeys.filter((k) => isIncluded(k)).sort();
+        for (const key of matched) {
+            if (!isExcluded(key) && !seen.has(key)) {
+                result.push(key);
+                seen.add(key);
+            }
+        }
+    }
+    return result;
+}
+/** Check whether a pattern contains glob characters. */
+function isGlob(pattern) {
+    return /[*?[\]{}]/.test(pattern);
+}
+
 /**
  * @module templates/renderDoc
  * Declarative renderer for YAML frontmatter + structured Markdown body.
@@ -402,8 +468,11 @@ function renderValueAsMarkdown(hbs, section, value) {
         const md = callFormatHelper(hbs, section.format, value, section.formatArgs);
         return rebaseHeadings(md, section.heading);
     }
-    const strValue = typeof value === 'string' ? value : JSON.stringify(value, null, 2);
-    return hbs.Utils.escapeExpression(strValue);
+    // Return string values as-is — renderDoc produces markdown, not HTML.
+    // HTML escaping (if needed) happens downstream when the markdown is rendered.
+    if (typeof value === 'string')
+        return value;
+    return JSON.stringify(value, null, 2);
 }
 function renderEach(hbs, section, value) {
     if (!Array.isArray(value))
@@ -444,9 +513,10 @@ function renderEach(hbs, section, value) {
  */
 function renderDoc(context, config, hbs) {
     const parts = [];
-    // Frontmatter
+    // Frontmatter — resolve patterns (globs, negations) against context keys.
+    const resolvedKeys = resolveFrontmatterKeys(config.frontmatter, Object.keys(context));
     const fmObj = {};
-    for (const key of config.frontmatter) {
+    for (const key of resolvedKeys) {
         const v = get(context, key);
         if (v !== undefined) {
             fmObj[key] = v;
@@ -1609,10 +1679,12 @@ const renderBodySectionSchema = z.object({
 });
 /** Render config: YAML frontmatter + ordered body sections. */
 const renderConfigSchema = z.object({
-    /** Keys to extract from context and include as YAML frontmatter. */
+    /** Keys or glob patterns to extract from context and include as YAML frontmatter. */
     frontmatter: z
         .array(z.string().min(1))
-        .describe('Keys to extract from context and include as YAML frontmatter.'),
+        .describe('Keys or glob patterns to include as YAML frontmatter. ' +
+        'Supports picomatch globs (e.g. "*") and "!"-prefixed exclusion patterns (e.g. "!_*"). ' +
+        'Explicit names preserve declaration order; glob-matched keys are sorted alphabetically.'),
     /** Ordered markdown body sections. */
     body: z
         .array(renderBodySectionSchema)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@karmaniverous/jeeves-watcher",
-  "version": "0.9.5",
+  "version": "0.9.7",
   "author": "Jason Williscroft",
   "description": "Filesystem watcher that keeps a Qdrant vector store in sync with document changes",
   "license": "BSD-3-Clause",