@karmaniverous/jeeves-watcher 0.11.1 → 0.13.0

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

@@ -15,7 +15,7 @@ import addFormats from 'ajv-formats';
 import chokidar from 'chokidar';
 import Fastify from 'fastify';
 import { jsonMapMapSchema, JsonMap } from '@karmaniverous/jsonmap';
-import { JSONPath } from 'jsonpath-plus';
+import { createConfigQueryHandler as createConfigQueryHandler$1 } from '@karmaniverous/jeeves';
 import Handlebars from 'handlebars';
 import dayjs from 'dayjs';
 import { toMdast } from 'hast-util-to-mdast';
@@ -2261,36 +2261,40 @@ function resolveReferences(doc, resolveTypes) {
  * @module api/handlers/configQuery
  * Fastify route handler for GET /config. Returns the full resolved merged document,
  * optionally filtered by JSONPath via the `path` query parameter.
+ *
+ * Delegates JSON querying to `createConfigQueryHandler` from `@karmaniverous/jeeves` core.
  */
 /**
  * Create handler for GET /config.
  *
- * Uses direct error handling (returns 400) rather than wrapHandler (which returns 500),
- * because invalid JSONPath expressions are client errors, not server errors.
+ * Uses `createConfigQueryHandler` from core to handle JSONPath querying.
+ * Invalid JSONPath expressions are client errors and return 400.
  *
  * @param deps - Route dependencies.
  */
 function createConfigQueryHandler(deps) {
+    const coreHandler = createConfigQueryHandler$1(() => buildMergedDocument({
+        config: deps.config,
+        valuesManager: deps.valuesManager,
+        issuesManager: deps.issuesManager,
+        helperIntrospection: deps.helperIntrospection,
+        virtualRules: deps.getVirtualRules?.(),
+    }));
     return async (request, reply) => {
         try {
             const { path } = request.query;
-            const doc = buildMergedDocument({
-                config: deps.config,
-                valuesManager: deps.valuesManager,
-                issuesManager: deps.issuesManager,
-                helperIntrospection: deps.helperIntrospection,
-                virtualRules: deps.getVirtualRules?.(),
-            });
-            if (!path) {
-                return doc;
+            const result = await coreHandler({ path });
+            if (result.status >= 400) {
+                return await reply.status(result.status).send(result.body);
             }
-            const result = JSONPath({ path, json: doc });
-            return { result, count: result.length };
+            return result.body;
         }
         catch (error) {
             const err = normalizeError(error);
             deps.logger.error({ err }, 'Config query failed');
-            return reply.status(400).send({ error: err.message || 'Query failed' });
+            return await reply.status(400).send({
+                error: err.message || 'Query failed',
+            });
         }
     };
 }

package/dist/index.js

@@ -9,7 +9,7 @@ import { z, ZodError } from 'zod';
 import { jsonMapMapSchema, JsonMap } from '@karmaniverous/jsonmap';
 import Ajv from 'ajv';
 import addFormats from 'ajv-formats';
-import { JSONPath } from 'jsonpath-plus';
+import { createConfigQueryHandler as createConfigQueryHandler$1 } from '@karmaniverous/jeeves';
 import { pathToFileURL, fileURLToPath } from 'node:url';
 import Handlebars from 'handlebars';
 import dayjs from 'dayjs';
@@ -1883,36 +1883,40 @@ function resolveReferences(doc, resolveTypes) {
  * @module api/handlers/configQuery
  * Fastify route handler for GET /config. Returns the full resolved merged document,
  * optionally filtered by JSONPath via the `path` query parameter.
+ *
+ * Delegates JSON querying to `createConfigQueryHandler` from `@karmaniverous/jeeves` core.
  */
 /**
  * Create handler for GET /config.
  *
- * Uses direct error handling (returns 400) rather than wrapHandler (which returns 500),
- * because invalid JSONPath expressions are client errors, not server errors.
+ * Uses `createConfigQueryHandler` from core to handle JSONPath querying.
+ * Invalid JSONPath expressions are client errors and return 400.
  *
  * @param deps - Route dependencies.
  */
 function createConfigQueryHandler(deps) {
+    const coreHandler = createConfigQueryHandler$1(() => buildMergedDocument({
+        config: deps.config,
+        valuesManager: deps.valuesManager,
+        issuesManager: deps.issuesManager,
+        helperIntrospection: deps.helperIntrospection,
+        virtualRules: deps.getVirtualRules?.(),
+    }));
     return async (request, reply) => {
         try {
             const { path } = request.query;
-            const doc = buildMergedDocument({
-                config: deps.config,
-                valuesManager: deps.valuesManager,
-                issuesManager: deps.issuesManager,
-                helperIntrospection: deps.helperIntrospection,
-                virtualRules: deps.getVirtualRules?.(),
-            });
-            if (!path) {
-                return doc;
+            const result = await coreHandler({ path });
+            if (result.status >= 400) {
+                return await reply.status(result.status).send(result.body);
             }
-            const result = JSONPath({ path, json: doc });
-            return { result, count: result.length };
+            return result.body;
         }
         catch (error) {
             const err = normalizeError(error);
             deps.logger.error({ err }, 'Config query failed');
-            return reply.status(400).send({ error: err.message || 'Query failed' });
+            return await reply.status(400).send({
+                error: err.message || 'Query failed',
+            });
         }
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@karmaniverous/jeeves-watcher",
-  "version": "0.11.1",
+  "version": "0.13.0",
   "author": "Jason Williscroft",
   "description": "Filesystem watcher that keeps a Qdrant vector store in sync with document changes",
   "license": "BSD-3-Clause",
@@ -51,6 +51,7 @@
   },
   "dependencies": {
     "@commander-js/extra-typings": "^14.0.0",
+    "@karmaniverous/jeeves": "^0.3.0",
     "@karmaniverous/jsonmap": "^2.1.1",
     "@langchain/textsplitters": "*",
     "@qdrant/js-client-rest": "*",
@@ -66,7 +67,6 @@
     "hast-util-to-mdast": "^10.1.2",
     "ignore": "^7.0.5",
     "js-yaml": "*",
-    "jsonpath-plus": "^10.4.0",
     "mammoth": "^1.11.0",
     "mdast-util-from-adf": "^2.2.0",
     "mdast-util-to-markdown": "^2.1.2",