@ignfab/geocontext 0.9.0 → 0.9.2

package/dist/gpf/wfs.js

@@ -2,22 +2,28 @@
 import { getCollectionCatalog, MiniSearchCollectionSearchEngine, } from '@ignfab/gpf-schema-store';
 // --- Constants ---
 export const GPF_WFS_URL = "https://data.geopf.fr/wfs";
-// Environment variable used to inject search engine options at runtime (JSON string).
-const GPF_WFS_SEARCH_OPTIONS_ENV = "GPF_WFS_SEARCH_OPTIONS";
+// Environment variable used to inject MiniSearch options at runtime (JSON string).
+const GPF_WFS_MINISEARCH_OPTIONS_ENV = "GPF_WFS_MINISEARCH_OPTIONS";
 // Keys accepted at the top level of the search options object.
-const TOP_LEVEL_SEARCH_OPTION_KEYS = ["fuzzy", "boost"];
-// Keys accepted inside the nested `boost` object.
-const BOOST_SEARCH_OPTION_KEYS = [
+const TOP_LEVEL_MINISEARCH_OPTION_KEYS = ["fields", "combineWith", "fuzzy", "boost"];
+// Shared keys used by both `fields` and `boost` in MiniSearchCollectionSearchOptions.
+const MINISEARCH_INDEXED_OPTION_KEYS = [
     "namespace",
     "name",
     "title",
     "description",
     "properties",
+    "enums",
+    "identifierTokens",
 ];
+const MINISEARCH_FIELD_OPTION_KEYS = MINISEARCH_INDEXED_OPTION_KEYS;
+const MINISEARCH_COMBINE_WITH_VALUES = ["AND", "OR"];
+const MINISEARCH_BOOST_OPTION_KEYS = MINISEARCH_INDEXED_OPTION_KEYS;
 // --- Errors ---
 export class FeatureTypeNotFoundError extends Error {
     constructor(name) {
-        super(`Type '${name}' not found`);
+        super(`Le type '${name}' est introuvable`);
+        this.name = "FeatureTypeNotFoundError";
     }
 }
 // --- Helpers ---
@@ -28,21 +34,47 @@ function isFiniteNumber(value) {
     return typeof value === "number" && Number.isFinite(value);
 }
 function invalidSearchOptionsError(reason) {
-    return new Error(`Invalid ${GPF_WFS_SEARCH_OPTIONS_ENV}: ${reason}`);
+    return new Error(`Invalid ${GPF_WFS_MINISEARCH_OPTIONS_ENV}: ${reason}`);
 }
 // --- Search options parsing ---
-// Parses and validates a plain-object value into MiniSearchCollectionSearchEngineOptions.
+// Parses and validates a plain-object value into MiniSearchCollectionSearchOptions.
 // Throws a descriptive error if the value has unexpected keys or wrong value types.
-function parseSearchOptions(value) {
+function parseMiniSearchOptions(value) {
     if (!isPlainObject(value)) {
         throw invalidSearchOptionsError("expected a JSON object");
     }
     for (const key of Object.keys(value)) {
-        if (!TOP_LEVEL_SEARCH_OPTION_KEYS.includes(key)) {
+        if (!TOP_LEVEL_MINISEARCH_OPTION_KEYS.includes(key)) {
             throw invalidSearchOptionsError(`unexpected key '${key}'`);
         }
     }
     const options = {};
+    if (value.fields !== undefined) {
+        if (!Array.isArray(value.fields)) {
+            throw invalidSearchOptionsError("expected 'fields' to be an array");
+        }
+        const fields = [];
+        for (const field of value.fields) {
+            if (typeof field !== "string") {
+                throw invalidSearchOptionsError("expected every 'fields' item to be a string");
+            }
+            if (!MINISEARCH_FIELD_OPTION_KEYS.includes(field)) {
+                throw invalidSearchOptionsError(`unexpected value 'fields.${field}'`);
+            }
+            fields.push(field);
+        }
+        options.fields = fields;
+    }
+    if (value.combineWith !== undefined) {
+        if (typeof value.combineWith !== "string") {
+            throw invalidSearchOptionsError("expected 'combineWith' to be a string");
+        }
+        const combineWith = value.combineWith;
+        if (!MINISEARCH_COMBINE_WITH_VALUES.includes(combineWith)) {
+            throw invalidSearchOptionsError("expected 'combineWith' to be 'AND' or 'OR'");
+        }
+        options.combineWith = combineWith;
+    }
     if (value.fuzzy !== undefined) {
         if (!isFiniteNumber(value.fuzzy)) {
             throw invalidSearchOptionsError("expected 'fuzzy' to be a finite number");
@@ -55,7 +87,7 @@ function parseSearchOptions(value) {
         }
         const boost = {};
         for (const key of Object.keys(value.boost)) {
-            if (!BOOST_SEARCH_OPTION_KEYS.includes(key)) {
+            if (!MINISEARCH_BOOST_OPTION_KEYS.includes(key)) {
                 throw invalidSearchOptionsError(`unexpected key 'boost.${key}'`);
             }
             const rawScore = value.boost[key];
@@ -68,10 +100,18 @@ function parseSearchOptions(value) {
     }
     return options;
 }
-// Reads search options from the GPF_WFS_SEARCH_OPTIONS environment variable.
+function createMiniSearchEngineOptions(miniSearch) {
+    if (!miniSearch) {
+        return undefined;
+    }
+    return {
+        defaultSearchOptions: miniSearch,
+    };
+}
+// Reads MiniSearch options from the GPF_WFS_MINISEARCH_OPTIONS environment variable.
 // Returns undefined when the variable is absent or empty.
-export function loadSearchOptionsFromEnv() {
-    const rawValue = process.env[GPF_WFS_SEARCH_OPTIONS_ENV];
+export function loadMiniSearchOptionsFromEnv() {
+    const rawValue = process.env[GPF_WFS_MINISEARCH_OPTIONS_ENV];
     if (!rawValue || rawValue.trim() === "") {
         return undefined;
     }
@@ -83,7 +123,7 @@ export function loadSearchOptionsFromEnv() {
         const reason = error instanceof Error ? error.message : "unknown JSON parse error";
         throw invalidSearchOptionsError(`expected valid JSON (${reason})`);
     }
-    return parseSearchOptions(parsedValue);
+    return parseMiniSearchOptions(parsedValue);
 }
 // --- WFS client ---
 export class WfsClient {
@@ -91,8 +131,9 @@ export class WfsClient {
     catalog;
     constructor(baseUrl = GPF_WFS_URL, options = {}) {
         this.baseUrl = baseUrl;
+        const searchEngineOptions = createMiniSearchEngineOptions(options.miniSearch);
         this.catalog = getCollectionCatalog({
-            engineFactory: (items) => new MiniSearchCollectionSearchEngine(items, options.search),
+            engineFactory: (items) => new MiniSearchCollectionSearchEngine(items, searchEngineOptions),
         });
     }
     async getFeatureTypes() {
@@ -101,7 +142,6 @@ export class WfsClient {
     async searchFeatureTypes(query, maxResults = 20) {
         return this.catalog.search(query, {
             limit: maxResults,
-            combineWith: 'AND',
         });
     }
     async getFeatureType(name) {
@@ -113,8 +153,8 @@ export class WfsClient {
     }
 }
 // --- Default singleton ---
-// Pre-configured client using the default GPF endpoint and optional env-based search options.
+// Pre-configured client using the default GPF endpoint and optional env-based MiniSearch options.
 export const wfsClient = new WfsClient(undefined, {
-    search: loadSearchOptionsFromEnv(),
+    miniSearch: loadMiniSearchOptionsFromEnv(),
 });
 //# sourceMappingURL=wfs.js.map

package/dist/gpf/wfs.js.map

@@ -1 +1 @@
-{"version":3,"file":"wfs.js","sourceRoot":"","sources":["../../src/gpf/wfs.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"wfs.js","sourceRoot":"","sources":["../../src/gpf/wfs.ts"],"names":[],"mappings":"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"}

package/dist/index.js

@@ -18,6 +18,7 @@ const TRANSPORTS = {
     'http': {
         type: "http-stream",
         options: {
+            host: process.env.HTTP_HOST,
             port: 3000,
             cors: {
                 allowOrigin: "*"

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE1C,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AACrC,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,MAAM,IAAI,CAAC;AAElC,2DAA2D;AAC3D,MAAM,SAAS,GAAG,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAE1D,gCAAgC;AAChC,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,SAAS,EAAE,iBAAiB,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;AAC1F,MAAM,OAAO,GAAG,WAAW,CAAC,OAAO,CAAC;AAEpC;;GAEG;AACH,MAAM,UAAU,GAAwB;IACtC,OAAO,EAAE;QACP,IAAI,EAAE,OAAO;KACd;IACD,MAAM,EAAE;QACN,IAAI,EAAE,aAAa;QACnB,OAAO,EAAE;YACP,IAAI,EAAE,IAAI;YACV,IAAI,EAAE;gBACJ,WAAW,EAAE,GAAG;aACjB;SACF;KACF;CACF,CAAA;AAGD,KAAK,UAAU,IAAI;IACjB,+CAA+C;IAC/C,MAAM,cAAc,GAAG,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,OAAO,CAAC;IAC7D,IAAI,cAAc,KAAK,OAAO,IAAI,cAAc,KAAK,MAAM,EAAE,CAAC;QAC5D,MAAM,IAAI,KAAK,CAAC,2BAA2B,cAAc,EAAE,CAAC,CAAC;IAC/D,CAAC;IAED,mBAAmB;IACnB,MAAM,SAAS,GAAG,IAAI,SAAS,CAAC;QAC9B,IAAI,EAAE,YAAY;QAClB,OAAO,EAAE,OAAO;QAChB,QAAQ,EAAE,SAAS;QACnB,SAAS,EAAE,UAAU,CAAC,cAAc,CAAC;KACtC,CAAC,CAAC;IACH,MAAM,SAAS,CAAC,KAAK,EAAE,CAAC;AAC1B,CAAC;AAED,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;IACrB,OAAO,CAAC,KAAK,CAAC,wBAAwB,EAAE,KAAK,CAAC,CAAC;IAC/C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE1C,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AACrC,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,MAAM,IAAI,CAAC;AAElC,2DAA2D;AAC3D,MAAM,SAAS,GAAG,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAE1D,gCAAgC;AAChC,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,SAAS,EAAE,iBAAiB,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;AAC1F,MAAM,OAAO,GAAG,WAAW,CAAC,OAAO,CAAC;AAEpC;;GAEG;AACH,MAAM,UAAU,GAAwB;IACtC,OAAO,EAAE;QACP,IAAI,EAAE,OAAO;KACd;IACD,MAAM,EAAE;QACN,IAAI,EAAE,aAAa;QACnB,OAAO,EAAE;YACP,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS;YAC3B,IAAI,EAAE,IAAI;YACV,IAAI,EAAE;gBACJ,WAAW,EAAE,GAAG;aACjB;SACF;KACF;CACF,CAAA;AAGD,KAAK,UAAU,IAAI;IACjB,+CAA+C;IAC/C,MAAM,cAAc,GAAG,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,OAAO,CAAC;IAC7D,IAAI,cAAc,KAAK,OAAO,IAAI,cAAc,KAAK,MAAM,EAAE,CAAC;QAC5D,MAAM,IAAI,KAAK,CAAC,2BAA2B,cAAc,EAAE,CAAC,CAAC;IAC/D,CAAC;IAED,mBAAmB;IACnB,MAAM,SAAS,GAAG,IAAI,SAAS,CAAC;QAC9B,IAAI,EAAE,YAAY;QAClB,OAAO,EAAE,OAAO;QAChB,QAAQ,EAAE,SAAS;QACnB,SAAS,EAAE,UAAU,CAAC,cAAc,CAAC;KACtC,CAAC,CAAC;IACH,MAAM,SAAS,CAAC,KAAK,EAAE,CAAC;AAC1B,CAAC;AAED,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;IACrB,OAAO,CAAC,KAAK,CAAC,wBAAwB,EAAE,KAAK,CAAC,CAAC;IAC/C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC,CAAC,CAAC"}

package/dist/logger.js.map

@@ -1 +1 @@
-{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.js"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAEnE,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC;AAE1E,MAAM,OAAO,GAAG;IACZ,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE;IACnB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE;CAC1B,CAAC;AACF,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC;AAC9E,IAAK,CAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;IAC/C,MAAM,IAAI,KAAK,CAAC,cAAc,UAAU,aAAa,CAAC,CAAC;AAC3D,CAAC;AAED,MAAM,MAAM,GAAG,YAAY,CAAC;IACxB,KAAK,EAAE,SAAS;IAChB,MAAM,EAAE,OAAO,CAAC,UAAU,CAAC;IAC3B,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,MAAM,CAAC,CAAC,CAAC;QACzC;;;WAGG;QACH,IAAI,UAAU,CAAC,OAAO,CAAC;YACnB,YAAY,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC;SAC/C,CAAC;KACL,CAAC,CAAC,CAAC;QACA,IAAI,UAAU,CAAC,IAAI,CAAC;YAChB,QAAQ,EAAE,gBAAgB;YAC1B,KAAK,EAAE,OAAO;SACjB,CAAC;KACL;CACJ,CAAC,CAAC;AAEH,eAAe,MAAM,CAAC"}
+{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.js"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAEnE,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC;AAE1E,MAAM,OAAO,GAAG;IACZ,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE;IACnB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE;CAC1B,CAAC;AAEF,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC;AAC9E,IAAK,CAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;IAC/C,MAAM,IAAI,KAAK,CAAC,cAAc,UAAU,aAAa,CAAC,CAAC;AAC3D,CAAC;AAED,MAAM,MAAM,GAAG,YAAY,CAAC;IACxB,KAAK,EAAE,SAAS;IAChB,MAAM,EAAE,OAAO,CAAC,UAAU,CAAC;IAC3B,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,MAAM,CAAC,CAAC,CAAC;QACzC;;;WAGG;QACH,IAAI,UAAU,CAAC,OAAO,CAAC;YACnB,YAAY,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC;SAC/C,CAAC;KACL,CAAC,CAAC,CAAC;QACA,IAAI,UAAU,CAAC,IAAI,CAAC;YAChB,QAAQ,EAAE,gBAAgB;YAC1B,KAAK,EAAE,OAAO;SACjB,CAAC;KACL;CACJ,CAAC,CAAC;AAEH,eAAe,MAAM,CAAC"}

package/dist/resources/WfsCqlFilterResource.d.ts

@@ -0,0 +1,10 @@
+import { MCPResource, ResourceContent } from "mcp-framework";
+declare class WfsCqlFilterResource extends MCPResource {
+    uri: string;
+    name: string;
+    description: string;
+    mimeType: string;
+    protected title: string;
+    read(): Promise<ResourceContent[]>;
+}
+export default WfsCqlFilterResource;

package/dist/resources/WfsCqlFilterResource.js

@@ -0,0 +1,21 @@
+import { MCPResource } from "mcp-framework";
+import { readMarkdownResource } from "./readMarkdownResource.js";
+class WfsCqlFilterResource extends MCPResource {
+    uri = "geocontext://wfs-cql-filter";
+    name = "geocontext-wfs-cql-filter";
+    description = "Aide-mémoire pour construire des cql_filter GeoServer utilisables avec les tools WFS.";
+    mimeType = "text/markdown";
+    title = "Cheatsheet cql_filter";
+    async read() {
+        const text = await readMarkdownResource(import.meta.url, "wfs-cql-filter.md");
+        return [
+            {
+                uri: this.uri,
+                mimeType: this.mimeType,
+                text,
+            },
+        ];
+    }
+}
+export default WfsCqlFilterResource;
+//# sourceMappingURL=WfsCqlFilterResource.js.map

package/dist/resources/WfsCqlFilterResource.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"WfsCqlFilterResource.js","sourceRoot":"","sources":["../../src/resources/WfsCqlFilterResource.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAmB,MAAM,eAAe,CAAC;AAC7D,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE,MAAM,oBAAqB,SAAQ,WAAW;IAC5C,GAAG,GAAG,6BAA6B,CAAC;IACpC,IAAI,GAAG,2BAA2B,CAAC;IACnC,WAAW,GAAG,uFAAuF,CAAC;IACtG,QAAQ,GAAG,eAAe,CAAC;IACjB,KAAK,GAAG,uBAAuB,CAAC;IAE1C,KAAK,CAAC,IAAI;QACR,MAAM,IAAI,GAAG,MAAM,oBAAoB,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,mBAAmB,CAAC,CAAC;QAE9E,OAAO;YACL;gBACE,GAAG,EAAE,IAAI,CAAC,GAAG;gBACb,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACvB,IAAI;aACL;SACF,CAAC;IACJ,CAAC;CACF;AAED,eAAe,oBAAoB,CAAC"}

package/dist/resources/readMarkdownResource.d.ts

@@ -0,0 +1 @@
+export declare function readMarkdownResource(importMetaUrl: string, filename: string): Promise<string>;

package/dist/resources/readMarkdownResource.js

@@ -0,0 +1,21 @@
+import { readFile } from "fs/promises";
+import { dirname, join } from "path";
+import { fileURLToPath } from "url";
+export async function readMarkdownResource(importMetaUrl, filename) {
+    const currentDir = dirname(fileURLToPath(importMetaUrl));
+    const candidates = [
+        join(currentDir, "content", filename),
+        join(currentDir, "../../src/resources/content", filename),
+    ];
+    let lastError;
+    for (const candidate of candidates) {
+        try {
+            return await readFile(candidate, "utf-8");
+        }
+        catch (error) {
+            lastError = error;
+        }
+    }
+    throw lastError;
+}
+//# sourceMappingURL=readMarkdownResource.js.map

package/dist/resources/readMarkdownResource.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"readMarkdownResource.js","sourceRoot":"","sources":["../../src/resources/readMarkdownResource.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AACrC,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AAEpC,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,aAAqB,EAAE,QAAgB;IAChF,MAAM,UAAU,GAAG,OAAO,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC,CAAC;IACzD,MAAM,UAAU,GAAG;QACjB,IAAI,CAAC,UAAU,EAAE,SAAS,EAAE,QAAQ,CAAC;QACrC,IAAI,CAAC,UAAU,EAAE,6BAA6B,EAAE,QAAQ,CAAC;KAC1D,CAAC;IAEF,IAAI,SAAkB,CAAC;IACvB,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACnC,IAAI,CAAC;YACH,OAAO,MAAM,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC5C,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,SAAS,GAAG,KAAK,CAAC;QACpB,CAAC;IACH,CAAC;IAED,MAAM,SAAS,CAAC;AAClB,CAAC"}

package/dist/tools/AdminexpressTool.d.ts

@@ -1,22 +1,65 @@
 import { MCPTool } from "mcp-framework";
 import { z } from "zod";
-interface AdminexpressInput {
-    lon: number;
-    lat: number;
-}
+declare const adminexpressInputSchema: z.ZodObject<{
+    lon: z.ZodNumber;
+    lat: z.ZodNumber;
+}, "strip", z.ZodTypeAny, {
+    lon?: number;
+    lat?: number;
+}, {
+    lon?: number;
+    lat?: number;
+}>;
+type AdminexpressInput = z.infer<typeof adminexpressInputSchema>;
 declare class AdminexpressTool extends MCPTool<AdminexpressInput> {
     name: string;
-    description: string;
-    schema: {
-        lon: {
-            type: z.ZodNumber;
-            description: string;
-        };
-        lat: {
-            type: z.ZodNumber;
-            description: string;
-        };
+    title: string;
+    annotations: {
+        readonly readOnlyHint: true;
+        readonly destructiveHint: false;
+        readonly idempotentHint: true;
+        readonly openWorldHint: true;
     };
-    execute(input: AdminexpressInput): Promise<object[]>;
+    description: string;
+    protected outputSchemaShape: z.ZodObject<{
+        results: z.ZodArray<z.ZodObject<{
+            type: z.ZodString;
+            id: z.ZodString;
+            bbox: z.ZodOptional<z.ZodArray<z.ZodNumber, "many">>;
+        }, "strip", z.ZodUnknown, z.objectOutputType<{
+            type: z.ZodString;
+            id: z.ZodString;
+            bbox: z.ZodOptional<z.ZodArray<z.ZodNumber, "many">>;
+        }, z.ZodUnknown, "strip">, z.objectInputType<{
+            type: z.ZodString;
+            id: z.ZodString;
+            bbox: z.ZodOptional<z.ZodArray<z.ZodNumber, "many">>;
+        }, z.ZodUnknown, "strip">>, "many">;
+    }, "strip", z.ZodTypeAny, {
+        results?: z.objectOutputType<{
+            type: z.ZodString;
+            id: z.ZodString;
+            bbox: z.ZodOptional<z.ZodArray<z.ZodNumber, "many">>;
+        }, z.ZodUnknown, "strip">[];
+    }, {
+        results?: z.objectInputType<{
+            type: z.ZodString;
+            id: z.ZodString;
+            bbox: z.ZodOptional<z.ZodArray<z.ZodNumber, "many">>;
+        }, z.ZodUnknown, "strip">[];
+    }>;
+    schema: z.ZodObject<{
+        lon: z.ZodNumber;
+        lat: z.ZodNumber;
+    }, "strip", z.ZodTypeAny, {
+        lon?: number;
+        lat?: number;
+    }, {
+        lon?: number;
+        lat?: number;
+    }>;
+    execute(input: AdminexpressInput): Promise<{
+        results: object[];
+    }>;
 }
 export default AdminexpressTool;

package/dist/tools/AdminexpressTool.js

@@ -1,22 +1,42 @@
-import { logger, MCPTool } from "mcp-framework";
+import { MCPTool } from "mcp-framework";
 import { z } from "zod";
 import { getAdminUnits, ADMINEXPRESS_TYPES, ADMINEXPRESS_SOURCE } from "../gpf/adminexpress.js";
+import logger from "../logger.js";
+import { READ_ONLY_OPEN_WORLD_TOOL_ANNOTATIONS } from "./toolAnnotations.js";
+const adminexpressInputSchema = z.object({
+    lon: z
+        .number()
+        .min(-180)
+        .max(180)
+        .describe("La longitude du point."),
+    lat: z
+        .number()
+        .min(-90)
+        .max(90)
+        .describe("La latitude du point."),
+});
+const adminexpressResultSchema = z
+    .object({
+    type: z.string().describe(`Le type d'unité administrative (${ADMINEXPRESS_TYPES.join(", ")}).`),
+    id: z.string().describe("L'identifiant de l'unité administrative."),
+    bbox: z.array(z.number()).describe("La boîte englobante de l'unité administrative.").optional(),
+})
+    .catchall(z.unknown());
+const adminexpressOutputSchema = z.object({
+    results: z.array(adminexpressResultSchema).describe("La liste des unités administratives couvrant le point demandé."),
+});
 class AdminexpressTool extends MCPTool {
     name = "adminexpress";
-    description = `Renvoie les unités administratives (${ADMINEXPRESS_TYPES.join(', ')}) pour une position donnée par sa longitude et sa latitude (source : ${ADMINEXPRESS_SOURCE}).`;
-    schema = {
-        lon: {
-            type: z.number(),
-            description: "La longitude du point",
-        },
-        lat: {
-            type: z.number(),
-            description: "La latitude du point",
-        },
-    };
+    title = "Unités administratives";
+    annotations = READ_ONLY_OPEN_WORLD_TOOL_ANNOTATIONS;
+    description = `Renvoie, pour un point donné par sa longitude et sa latitude, la liste des unités administratives (${ADMINEXPRESS_TYPES.join(', ')}) qui le couvrent, sous forme d'objets typés contenant leurs propriétés administratives. (source : ${ADMINEXPRESS_SOURCE}).`;
+    outputSchemaShape = adminexpressOutputSchema;
+    schema = adminexpressInputSchema;
     async execute(input) {
         logger.info(`adminexpress(${input.lon},${input.lat})...`);
-        return getAdminUnits(input.lon, input.lat);
+        return {
+            results: await getAdminUnits(input.lon, input.lat),
+        };
     }
 }
 export default AdminexpressTool;

package/dist/tools/AdminexpressTool.js.map

@@ -1 +1 @@
-{"version":3,"file":"AdminexpressTool.js","sourceRoot":"","sources":["../../src/tools/AdminexpressTool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAOhG,MAAM,gBAAiB,SAAQ,OAA0B;IACvD,IAAI,GAAG,cAAc,CAAC;IACtB,WAAW,GAAG,uCAAuC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,wEAAwE,mBAAmB,IAAI,CAAC;IAElL,MAAM,GAAG;QACP,GAAG,EAAE;YACH,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;YAChB,WAAW,EAAE,uBAAuB;SACrC;QACD,GAAG,EAAE;YACH,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;YAChB,WAAW,EAAE,sBAAsB;SACpC;KACF,CAAC;IAEF,KAAK,CAAC,OAAO,CAAC,KAAwB;QACpC,MAAM,CAAC,IAAI,CAAC,gBAAgB,KAAK,CAAC,GAAG,IAAI,KAAK,CAAC,GAAG,MAAM,CAAC,CAAC;QAC1D,OAAO,aAAa,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IAC7C,CAAC;CACF;AAED,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"AdminexpressTool.js","sourceRoot":"","sources":["../../src/tools/AdminexpressTool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAChG,OAAO,MAAM,MAAM,cAAc,CAAC;AAClC,OAAO,EAAE,qCAAqC,EAAE,MAAM,sBAAsB,CAAC;AAE7E,MAAM,uBAAuB,GAAG,CAAC,CAAC,MAAM,CAAC;IACvC,GAAG,EAAE,CAAC;SACH,MAAM,EAAE;SACR,GAAG,CAAC,CAAC,GAAG,CAAC;SACT,GAAG,CAAC,GAAG,CAAC;SACR,QAAQ,CAAC,wBAAwB,CAAC;IACrC,GAAG,EAAE,CAAC;SACH,MAAM,EAAE;SACR,GAAG,CAAC,CAAC,EAAE,CAAC;SACR,GAAG,CAAC,EAAE,CAAC;SACP,QAAQ,CAAC,uBAAuB,CAAC;CACrC,CAAC,CAAC;AAIH,MAAM,wBAAwB,GAAG,CAAC;KAC/B,MAAM,CAAC;IACN,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,mCAAmC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;IAC/F,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,0CAA0C,CAAC;IACnE,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,CAAC,gDAAgD,CAAC,CAAC,QAAQ,EAAE;CAChG,CAAC;KACD,QAAQ,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;AAEzB,MAAM,wBAAwB,GAAG,CAAC,CAAC,MAAM,CAAC;IACxC,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC,QAAQ,CAAC,gEAAgE,CAAC;CACtH,CAAC,CAAC;AAEH,MAAM,gBAAiB,SAAQ,OAA0B;IACvD,IAAI,GAAG,cAAc,CAAC;IACtB,KAAK,GAAG,wBAAwB,CAAC;IACjC,WAAW,GAAG,qCAAqC,CAAC;IACpD,WAAW,GAAG,sGAAsG,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,sGAAsG,mBAAmB,IAAI,CAAC;IACrQ,iBAAiB,GAAG,wBAAwB,CAAC;IAEvD,MAAM,GAAG,uBAAuB,CAAC;IAEjC,KAAK,CAAC,OAAO,CAAC,KAAwB;QACpC,MAAM,CAAC,IAAI,CAAC,gBAAgB,KAAK,CAAC,GAAG,IAAI,KAAK,CAAC,GAAG,MAAM,CAAC,CAAC;QAC1D,OAAO;YACL,OAAO,EAAE,MAAM,aAAa,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC;SACnD,CAAC;IACJ,CAAC;CACF;AAED,eAAe,gBAAgB,CAAC"}

package/dist/tools/AltitudeTool.d.ts

@@ -1,27 +1,75 @@
 import { MCPTool } from "mcp-framework";
 import { z } from "zod";
-interface AltitudeInput {
-    lon: number;
-    lat: number;
-}
+declare const altitudeInputSchema: z.ZodObject<{
+    lon: z.ZodNumber;
+    lat: z.ZodNumber;
+}, "strip", z.ZodTypeAny, {
+    lon?: number;
+    lat?: number;
+}, {
+    lon?: number;
+    lat?: number;
+}>;
+type AltitudeInput = z.infer<typeof altitudeInputSchema>;
 declare class AltitudeTool extends MCPTool<AltitudeInput> {
     name: string;
+    title: string;
+    annotations: {
+        readonly readOnlyHint: true;
+        readonly destructiveHint: false;
+        readonly idempotentHint: true;
+        readonly openWorldHint: true;
+    };
     description: string;
-    schema: {
-        lon: {
-            type: z.ZodNumber;
-            description: string;
+    protected outputSchemaShape: z.ZodObject<{
+        result: z.ZodObject<{
+            lon: z.ZodNumber;
+            lat: z.ZodNumber;
+            altitude: z.ZodNumber;
+            accuracy: z.ZodString;
+        }, "strip", z.ZodTypeAny, {
+            lon?: number;
+            lat?: number;
+            altitude?: number;
+            accuracy?: string;
+        }, {
+            lon?: number;
+            lat?: number;
+            altitude?: number;
+            accuracy?: string;
+        }>;
+    }, "strip", z.ZodTypeAny, {
+        result?: {
+            lon?: number;
+            lat?: number;
+            altitude?: number;
+            accuracy?: string;
         };
-        lat: {
-            type: z.ZodNumber;
-            description: string;
+    }, {
+        result?: {
+            lon?: number;
+            lat?: number;
+            altitude?: number;
+            accuracy?: string;
         };
-    };
+    }>;
+    schema: z.ZodObject<{
+        lon: z.ZodNumber;
+        lat: z.ZodNumber;
+    }, "strip", z.ZodTypeAny, {
+        lon?: number;
+        lat?: number;
+    }, {
+        lon?: number;
+        lat?: number;
+    }>;
     execute(input: AltitudeInput): Promise<{
-        lon: number;
-        lat: number;
-        altitude: any;
-        accuracy: any;
+        result: {
+            lon: number;
+            lat: number;
+            altitude: any;
+            accuracy: any;
+        };
     }>;
 }
 export default AltitudeTool;

package/dist/tools/AltitudeTool.js

@@ -2,22 +2,40 @@ import { MCPTool } from "mcp-framework";
 import { z } from "zod";
 import { ALTITUDE_SOURCE, getAltitudeByLocation } from "../gpf/altitude.js";
 import logger from "../logger.js";
+import { READ_ONLY_OPEN_WORLD_TOOL_ANNOTATIONS } from "./toolAnnotations.js";
+const altitudeInputSchema = z.object({
+    lon: z
+        .number()
+        .min(-180)
+        .max(180)
+        .describe("La longitude du point."),
+    lat: z
+        .number()
+        .min(-90)
+        .max(90)
+        .describe("La latitude du point."),
+});
+const altitudeResultSchema = z.object({
+    lon: z.number().describe("La longitude du point."),
+    lat: z.number().describe("La latitude du point."),
+    altitude: z.number().describe("L'altitude du point."),
+    accuracy: z.string().describe("L'information de précision associée à l'altitude."),
+});
+const altitudeOutputSchema = z.object({
+    result: altitudeResultSchema.describe("Le résultat altimétrique pour la position demandée."),
+});
 class AltitudeTool extends MCPTool {
     name = "altitude";
-    description = `Renvoie l'altitude pour une position donnée par sa longitude et sa latitude (source : ${ALTITUDE_SOURCE}).`;
-    schema = {
-        lon: {
-            type: z.number(),
-            description: "La longitude du point",
-        },
-        lat: {
-            type: z.number(),
-            description: "La latitude du point",
-        },
-    };
+    title = "Altitude d’une position";
+    annotations = READ_ONLY_OPEN_WORLD_TOOL_ANNOTATIONS;
+    description = `Renvoie l'altitude (en mètres) et la précision de la mesure (accuracy) d'un point géographique à partir de sa longitude et de sa latitude. (source : ${ALTITUDE_SOURCE}).`;
+    outputSchemaShape = altitudeOutputSchema;
+    schema = altitudeInputSchema;
     async execute(input) {
         logger.info(`altitude(${input.lon},${input.lat})...`);
-        return getAltitudeByLocation(input.lon, input.lat);
+        return {
+            result: await getAltitudeByLocation(input.lon, input.lat),
+        };
     }
 }
 export default AltitudeTool;

package/dist/tools/AltitudeTool.js.map

@@ -1 +1 @@
-{"version":3,"file":"AltitudeTool.js","sourceRoot":"","sources":["../../src/tools/AltitudeTool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,eAAe,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAC5E,OAAO,MAAM,MAAM,cAAc,CAAC;AAOlC,MAAM,YAAa,SAAQ,OAAsB;IAC/C,IAAI,GAAG,UAAU,CAAC;IAClB,WAAW,GAAG,yFAAyF,eAAe,IAAI,CAAC;IAE3H,MAAM,GAAG;QACP,GAAG,EAAE;YACH,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;YAChB,WAAW,EAAE,uBAAuB;SACrC;QACD,GAAG,EAAE;YACH,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;YAChB,WAAW,EAAE,sBAAsB;SACpC;KACF,CAAC;IAEF,KAAK,CAAC,OAAO,CAAC,KAAoB;QAChC,MAAM,CAAC,IAAI,CAAC,YAAY,KAAK,CAAC,GAAG,IAAI,KAAK,CAAC,GAAG,MAAM,CAAC,CAAC;QACtD,OAAO,qBAAqB,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IACrD,CAAC;CACF;AAED,eAAe,YAAY,CAAC"}
+{"version":3,"file":"AltitudeTool.js","sourceRoot":"","sources":["../../src/tools/AltitudeTool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,eAAe,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAC5E,OAAO,MAAM,MAAM,cAAc,CAAC;AAClC,OAAO,EAAE,qCAAqC,EAAE,MAAM,sBAAsB,CAAC;AAE7E,MAAM,mBAAmB,GAAG,CAAC,CAAC,MAAM,CAAC;IACnC,GAAG,EAAE,CAAC;SACH,MAAM,EAAE;SACR,GAAG,CAAC,CAAC,GAAG,CAAC;SACT,GAAG,CAAC,GAAG,CAAC;SACR,QAAQ,CAAC,wBAAwB,CAAC;IACrC,GAAG,EAAE,CAAC;SACH,MAAM,EAAE;SACR,GAAG,CAAC,CAAC,EAAE,CAAC;SACR,GAAG,CAAC,EAAE,CAAC;SACP,QAAQ,CAAC,uBAAuB,CAAC;CACrC,CAAC,CAAC;AAIH,MAAM,oBAAoB,GAAG,CAAC,CAAC,MAAM,CAAC;IACpC,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,wBAAwB,CAAC;IAClD,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,uBAAuB,CAAC;IACjD,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,sBAAsB,CAAC;IACrD,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,mDAAmD,CAAC;CACnF,CAAC,CAAC;AAEH,MAAM,oBAAoB,GAAG,CAAC,CAAC,MAAM,CAAC;IACpC,MAAM,EAAE,oBAAoB,CAAC,QAAQ,CAAC,qDAAqD,CAAC;CAC7F,CAAC,CAAC;AAEH,MAAM,YAAa,SAAQ,OAAsB;IAC/C,IAAI,GAAG,UAAU,CAAC;IAClB,KAAK,GAAG,yBAAyB,CAAC;IAClC,WAAW,GAAG,qCAAqC,CAAC;IACpD,WAAW,GAAG,wJAAwJ,eAAe,IAAI,CAAC;IAChL,iBAAiB,GAAG,oBAAoB,CAAC;IAEnD,MAAM,GAAG,mBAAmB,CAAC;IAE7B,KAAK,CAAC,OAAO,CAAC,KAAoB;QAChC,MAAM,CAAC,IAAI,CAAC,YAAY,KAAK,CAAC,GAAG,IAAI,KAAK,CAAC,GAAG,MAAM,CAAC,CAAC;QACtD,OAAO;YACL,MAAM,EAAE,MAAM,qBAAqB,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC;SAC1D,CAAC;IACJ,CAAC;CACF;AAED,eAAe,YAAY,CAAC"}