@ignfab/geocontext 0.9.6 → 0.9.7

package/dist/tools/GpfWfsDescribeTypeTool.d.ts

@@ -1,15 +1,17 @@
-import { MCPTool } from "mcp-framework";
+/**
+ * MCP tool exposing detailed schema inspection for a single WFS type.
+ */
+import BaseTool from "./BaseTool.js";
 import { z } from "zod";
-import type { Collection } from "@ignfab/gpf-schema-store";
 declare const gpfWfsDescribeTypeInputSchema: z.ZodObject<{
     typename: z.ZodString;
 }, "strict", z.ZodTypeAny, {
-    typename?: string;
+    typename: string;
 }, {
-    typename?: string;
+    typename: string;
 }>;
 type GpfWfsDescribeTypeInput = z.infer<typeof gpfWfsDescribeTypeInputSchema>;
-declare class GpfWfsDescribeTypeTool extends MCPTool<GpfWfsDescribeTypeInput> {
+declare class GpfWfsDescribeTypeTool extends BaseTool<GpfWfsDescribeTypeInput> {
     name: string;
     title: string;
     annotations: {
@@ -20,105 +22,75 @@ declare class GpfWfsDescribeTypeTool extends MCPTool<GpfWfsDescribeTypeInput> {
     };
     description: string;
     protected outputSchemaShape: z.ZodObject<{
-        result: z.ZodObject<{
-            id: z.ZodString;
-            namespace: z.ZodString;
+        id: z.ZodString;
+        namespace: z.ZodString;
+        name: z.ZodString;
+        title: z.ZodString;
+        description: z.ZodString;
+        properties: z.ZodArray<z.ZodObject<{
             name: z.ZodString;
-            title: z.ZodString;
-            description: z.ZodString;
-            properties: z.ZodArray<z.ZodObject<{
-                name: z.ZodString;
-                type: z.ZodString;
-                title: z.ZodOptional<z.ZodString>;
-                description: z.ZodOptional<z.ZodString>;
-                enum: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
-                defaultCrs: z.ZodOptional<z.ZodString>;
-            }, "strip", z.ZodTypeAny, {
-                type?: string;
-                name?: string;
-                title?: string;
-                description?: string;
-                enum?: string[];
-                defaultCrs?: string;
-            }, {
-                type?: string;
-                name?: string;
-                title?: string;
-                description?: string;
-                enum?: string[];
-                defaultCrs?: string;
-            }>, "many">;
+            type: z.ZodString;
+            title: z.ZodOptional<z.ZodString>;
+            description: z.ZodOptional<z.ZodString>;
+            enum: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+            defaultCrs: z.ZodOptional<z.ZodString>;
         }, "strip", z.ZodTypeAny, {
-            id?: string;
-            properties?: {
-                type?: string;
-                name?: string;
-                title?: string;
-                description?: string;
-                enum?: string[];
-                defaultCrs?: string;
-            }[];
-            namespace?: string;
-            name?: string;
-            title?: string;
-            description?: string;
+            name: string;
+            type: string;
+            title?: string | undefined;
+            description?: string | undefined;
+            enum?: string[] | undefined;
+            defaultCrs?: string | undefined;
         }, {
-            id?: string;
-            properties?: {
-                type?: string;
-                name?: string;
-                title?: string;
-                description?: string;
-                enum?: string[];
-                defaultCrs?: string;
-            }[];
-            namespace?: string;
-            name?: string;
-            title?: string;
-            description?: string;
-        }>;
+            name: string;
+            type: string;
+            title?: string | undefined;
+            description?: string | undefined;
+            enum?: string[] | undefined;
+            defaultCrs?: string | undefined;
+        }>, "many">;
     }, "strip", z.ZodTypeAny, {
-        result?: {
-            id?: string;
-            properties?: {
-                type?: string;
-                name?: string;
-                title?: string;
-                description?: string;
-                enum?: string[];
-                defaultCrs?: string;
-            }[];
-            namespace?: string;
-            name?: string;
-            title?: string;
-            description?: string;
-        };
+        name: string;
+        namespace: string;
+        title: string;
+        description: string;
+        properties: {
+            name: string;
+            type: string;
+            title?: string | undefined;
+            description?: string | undefined;
+            enum?: string[] | undefined;
+            defaultCrs?: string | undefined;
+        }[];
+        id: string;
     }, {
-        result?: {
-            id?: string;
-            properties?: {
-                type?: string;
-                name?: string;
-                title?: string;
-                description?: string;
-                enum?: string[];
-                defaultCrs?: string;
-            }[];
-            namespace?: string;
-            name?: string;
-            title?: string;
-            description?: string;
-        };
+        name: string;
+        namespace: string;
+        title: string;
+        description: string;
+        properties: {
+            name: string;
+            type: string;
+            title?: string | undefined;
+            description?: string | undefined;
+            enum?: string[] | undefined;
+            defaultCrs?: string | undefined;
+        }[];
+        id: string;
     }>;
     schema: z.ZodObject<{
         typename: z.ZodString;
     }, "strict", z.ZodTypeAny, {
-        typename?: string;
+        typename: string;
     }, {
-        typename?: string;
-    }>;
-    execute(input: GpfWfsDescribeTypeInput): Promise<{
-        result: Collection;
+        typename: string;
     }>;
+    /**
+     * Loads the detailed schema description for one WFS typename.
+     *
+     * @param input Normalized tool input.
+     * @returns The detailed feature type description from the embedded catalog.
+     */
+    execute(input: GpfWfsDescribeTypeInput): Promise<Collection>;
 }
 export default GpfWfsDescribeTypeTool;

package/dist/tools/GpfWfsDescribeTypeTool.js

@@ -1,7 +1,12 @@
-import { MCPTool } from "mcp-framework";
+/**
+ * MCP tool exposing detailed schema inspection for a single WFS type.
+ */
+import BaseTool from "./BaseTool.js";
 import { z } from "zod";
-import { wfsClient } from "../gpf/wfs.js";
+import { wfsClient } from "../gpf/wfs-schema-catalog.js";
 import { READ_ONLY_OPEN_WORLD_TOOL_ANNOTATIONS } from "../helpers/toolAnnotations.js";
+import logger from "../logger.js";
+// --- Schema ---
 const gpfWfsDescribeTypeInputSchema = z.object({
     typename: z
         .string()
@@ -18,16 +23,15 @@ const gpfWfsPropertySchema = z.object({
     defaultCrs: z.string().describe("Le système de coordonnées par défaut si la propriété est géométrique.").optional(),
 });
 const gpfWfsDescribeTypeOutputSchema = z.object({
-    result: z.object({
-        id: z.string().describe("L'identifiant complet du type WFS."),
-        namespace: z.string().describe("L'espace de nommage du type WFS."),
-        name: z.string().describe("Le nom court du type WFS."),
-        title: z.string().describe("Le titre lisible du type WFS."),
-        description: z.string().describe("La description du type WFS."),
-        properties: z.array(gpfWfsPropertySchema).describe("La liste des propriétés du type WFS."),
-    }).describe("La description détaillée du type WFS."),
+    id: z.string().describe("L'identifiant complet du type WFS."),
+    namespace: z.string().describe("L'espace de nommage du type WFS."),
+    name: z.string().describe("Le nom court du type WFS."),
+    title: z.string().describe("Le titre lisible du type WFS."),
+    description: z.string().describe("La description du type WFS."),
+    properties: z.array(gpfWfsPropertySchema).describe("La liste des propriétés du type WFS."),
 });
-class GpfWfsDescribeTypeTool extends MCPTool {
+// --- Tool ---
+class GpfWfsDescribeTypeTool extends BaseTool {
     name = "gpf_wfs_describe_type";
     title = "Description d’un type WFS";
     annotations = READ_ONLY_OPEN_WORLD_TOOL_ANNOTATIONS;
@@ -39,12 +43,19 @@ class GpfWfsDescribeTypeTool extends MCPTool {
     ].join("\n");
     outputSchemaShape = gpfWfsDescribeTypeOutputSchema;
     schema = gpfWfsDescribeTypeInputSchema;
+    /**
+     * Loads the detailed schema description for one WFS typename.
+     *
+     * @param input Normalized tool input.
+     * @returns The detailed feature type description from the embedded catalog.
+     */
     async execute(input) {
+        logger.info(`[tool] execute ${this.name} ...`, {
+            input: input
+        });
         try {
             const featureType = await wfsClient.getFeatureType(input.typename);
-            return {
-                result: featureType,
-            };
+            return featureType;
         }
         catch (e) {
             const message = e instanceof Error ? e.message : String(e);

package/dist/tools/GpfWfsDescribeTypeTool.js.map

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

package/dist/tools/GpfWfsGetFeatureByIdTool.d.ts

@@ -1,30 +1,13 @@
-import { MCPTool } from "mcp-framework";
-import type { Collection } from "@ignfab/gpf-schema-store";
-import { z } from "zod";
-import { type CompiledRequest } from "../helpers/wfs_internal/request.js";
-declare const gpfWfsGetFeatureByIdInputSchema: z.ZodObject<{
-    typename: z.ZodString;
-    feature_id: z.ZodString;
-    result_type: z.ZodDefault<z.ZodEnum<["results", "request"]>>;
-    select: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
-}, "strict", z.ZodTypeAny, {
-    typename?: string;
-    feature_id?: string;
-    result_type?: "request" | "results";
-    select?: string[];
-}, {
-    typename?: string;
-    feature_id?: string;
-    result_type?: "request" | "results";
-    select?: string[];
-}>;
-type GpfWfsGetFeatureByIdInput = z.infer<typeof gpfWfsGetFeatureByIdInputSchema>;
-type PublishedInputSchema = {
-    type: "object";
-    properties?: Record<string, object>;
-    required?: string[];
-};
-declare class GpfWfsGetFeatureByIdTool extends MCPTool<GpfWfsGetFeatureByIdInput> {
+/**
+ * MCP tool exposing exact WFS feature lookup by `feature_id`.
+ *
+ * The tool keeps MCP-facing concerns such as schema exposure, compact response
+ * formatting, and request-preview output. The `results` execution flow itself
+ * is delegated to the structured WFS engine.
+ */
+import BaseTool from "./BaseTool.js";
+import { type GpfWfsGetFeatureByIdInput } from "../helpers/wfs_engine/schema.js";
+declare class GpfWfsGetFeatureByIdTool extends BaseTool<GpfWfsGetFeatureByIdInput> {
     name: string;
     title: string;
     annotations: {
@@ -34,70 +17,59 @@ declare class GpfWfsGetFeatureByIdTool extends MCPTool<GpfWfsGetFeatureByIdInput
         openWorldHint: boolean;
     };
     description: string;
-    schema: z.ZodObject<{
-        typename: z.ZodString;
-        feature_id: z.ZodString;
-        result_type: z.ZodDefault<z.ZodEnum<["results", "request"]>>;
-        select: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
-    }, "strict", z.ZodTypeAny, {
-        typename?: string;
-        feature_id?: string;
-        result_type?: "request" | "results";
-        select?: string[];
+    schema: import("zod").ZodObject<{
+        typename: import("zod").ZodString;
+        feature_id: import("zod").ZodString;
+        result_type: import("zod").ZodDefault<import("zod").ZodEnum<["results", "request"]>>;
+        select: import("zod").ZodOptional<import("zod").ZodArray<import("zod").ZodString, "many">>;
+    }, "strict", import("zod").ZodTypeAny, {
+        typename: string;
+        feature_id: string;
+        result_type: "request" | "results";
+        select?: string[] | undefined;
     }, {
-        typename?: string;
-        feature_id?: string;
-        result_type?: "request" | "results";
-        select?: string[];
+        typename: string;
+        feature_id: string;
+        result_type?: "request" | "results" | undefined;
+        select?: string[] | undefined;
     }>;
     /**
      * Exposes an input schema variant that stays compatible with most MCP integrations.
      *
      * @returns The published input schema exposed through the MCP tool definition.
      */
-    get inputSchema(): PublishedInputSchema;
+    get inputSchema(): import("../helpers/jsonSchema.js").PublishedInputSchema;
     /**
-     * Formats compact responses (`request`) into `structuredContent`.
+     * Formats compact responses (`request`, `results`) into `structuredContent`.
+     *
+     * We intentionally do not expose a single `outputSchemaShape` for the tool as
+     * a whole: the `results` path returns a generic FeatureCollection whose
+     * feature properties depend on the queried WFS layer, while `request` has a
+     * compact, closed shape that is worth validating explicitly.
      *
      * @param data Raw execution result returned by the tool implementation.
      * @returns An MCP success response, optionally enriched with structured content.
      */
-    protected createSuccessResponse(data: unknown): import("mcp-framework").ToolResponse | {
+    protected createSuccessResponse(data: unknown): {
         content: {
             type: "text";
             text: string;
         }[];
         structuredContent: {
-            body?: string;
-            result_type?: "request";
-            method?: "POST";
-            url?: string;
-            query?: Record<string, string>;
-            get_url?: string;
+            url: string;
+            result_type: "request";
+            method: "POST";
+            query: Record<string, string>;
+            body: string;
+            get_url?: string | null | undefined;
         };
+    } | {
+        content: {
+            type: "text";
+            text: string;
+        }[];
+        structuredContent: Record<string, unknown>;
     };
-    /**
-     * Loads a WFS feature type description from the embedded catalog.
-     *
-     * @param typename Exact WFS typename to load from the embedded schema store.
-     * @returns The matching feature type description.
-     */
-    protected getFeatureType(typename: string): Promise<Collection>;
-    /**
-     * Executes a compiled WFS request as POST and returns the JSON FeatureCollection.
-     *
-     * @param request Compiled request split into query-string parameters and POST body.
-     * @returns The parsed JSON response returned by the WFS endpoint.
-     */
-    protected fetchFeatureCollection(request: CompiledRequest): Promise<any>;
-    /**
-     * Builds the optional `propertyName` request parameter from `select`.
-     *
-     * @param featureType Feature type definition loaded from the embedded catalog.
-     * @param input Normalized tool input.
-     * @returns A comma-separated property list, or `undefined` when all properties should be returned.
-     */
-    protected buildPropertyName(featureType: Collection, input: GpfWfsGetFeatureByIdInput): string;
     /**
      * Orchestrates the by-id execution flow:
      * schema lookup -> request compilation -> optional request output -> WFS execution -> cardinality validation.
@@ -105,6 +77,13 @@ declare class GpfWfsGetFeatureByIdTool extends MCPTool<GpfWfsGetFeatureByIdInput
      * @param input Normalized tool input.
      * @returns Either a compiled request or a transformed FeatureCollection containing one feature.
      */
-    execute(input: GpfWfsGetFeatureByIdInput): Promise<Record<string, unknown>>;
+    execute(input: GpfWfsGetFeatureByIdInput): Promise<import("../helpers/wfs_engine/request.js").WfsRequestPayload | (Record<string, unknown> & {
+        features?: (Record<string, unknown> & {
+            feature_ref?: {
+                typename: string | null;
+                feature_id: string;
+            };
+        })[];
+    })>;
 }
 export default GpfWfsGetFeatureByIdTool;

package/dist/tools/GpfWfsGetFeatureByIdTool.js

@@ -1,36 +1,19 @@
-import { MCPTool } from "mcp-framework";
-import { z } from "zod";
-import { wfsClient } from "../gpf/wfs.js";
-import { fetchJSONPost } from "../helpers/http.js";
+/**
+ * MCP tool exposing exact WFS feature lookup by `feature_id`.
+ *
+ * The tool keeps MCP-facing concerns such as schema exposure, compact response
+ * formatting, and request-preview output. The `results` execution flow itself
+ * is delegated to the structured WFS engine.
+ */
+import BaseTool from "./BaseTool.js";
 import { READ_ONLY_OPEN_WORLD_TOOL_ANNOTATIONS } from "../helpers/toolAnnotations.js";
-import { generatePublishedInputSchema } from "../helpers/jsonSchema.js";
-import { compileSelectProperty, getGeometryProperty } from "../helpers/wfs_internal/compile.js";
-import { buildGetFeatureByIdRequest } from "../helpers/wfs_internal/request.js";
-import { attachFeatureRefs } from "../helpers/wfs_internal/response.js";
-import { gpfWfsGetFeaturesRequestOutputSchema } from "../helpers/wfs_internal/schema.js";
-const gpfWfsGetFeatureByIdInputSchema = z.object({
-    typename: z
-        .string()
-        .trim()
-        .min(1, "le nom du type ne doit pas être vide")
-        .describe("Nom exact du type WFS à interroger, par exemple `ADMINEXPRESS-COG.LATEST:commune`."),
-    feature_id: z
-        .string()
-        .trim()
-        .min(1, "le feature_id ne doit pas être vide")
-        .describe("Identifiant WFS exact de l'objet à récupérer, par exemple `commune.8952`."),
-    result_type: z
-        .enum(["results", "request"])
-        .default("results")
-        .describe("`results` renvoie une FeatureCollection normalisée avec exactement un objet. `request` renvoie la requête WFS compilée (`get_url`) à destination de `create_map` via `geojson_url`, ou pour déboguer."),
-    select: z
-        .array(z.string().trim().min(1))
-        .min(1)
-        .optional()
-        .describe("Liste des propriétés non géométriques à renvoyer. Quand `result_type=\"request\"`, la géométrie est automatiquement ajoutée."),
-}).strict();
-const gpfWfsGetFeatureByIdPublishedInputSchema = generatePublishedInputSchema(gpfWfsGetFeatureByIdInputSchema);
-class GpfWfsGetFeatureByIdTool extends MCPTool {
+import { buildPropertyName, executeGetFeatureById } from "../helpers/wfs_engine/byId.js";
+import { getFeatureType } from "../helpers/wfs_engine/execution.js";
+import { buildGetFeatureByIdRequest, toWfsRequestPayload, } from "../helpers/wfs_engine/request.js";
+import { gpfWfsGetFeatureByIdInputSchema, gpfWfsGetFeatureByIdPublishedInputSchema, gpfWfsGetFeatureByIdRequestOutputSchema, } from "../helpers/wfs_engine/schema.js";
+import logger from "../logger.js";
+// --- Tool ---
+class GpfWfsGetFeatureByIdTool extends BaseTool {
     name = "gpf_wfs_get_feature_by_id";
     title = "Lecture d’un objet WFS par identifiant";
     annotations = READ_ONLY_OPEN_WORLD_TOOL_ANNOTATIONS;
@@ -40,6 +23,8 @@ class GpfWfsGetFeatureByIdTool extends MCPTool {
         "Le contrat garantit une cardinalité stricte : 0 résultat ou plusieurs résultats provoquent une erreur explicite.",
         "Utiliser `result_type=\"request\"` pour récupérer la requête WFS compilée (avec `get_url`) et l'utiliser ou la visualiser ailleurs."
     ].join("\n");
+    // `schema` remains the runtime validation source, while `inputSchema`
+    // publishes the MCP-facing variant expected by clients.
     schema = gpfWfsGetFeatureByIdInputSchema;
     /**
      * Exposes an input schema variant that stays compatible with most MCP integrations.
@@ -50,7 +35,12 @@ class GpfWfsGetFeatureByIdTool extends MCPTool {
         return gpfWfsGetFeatureByIdPublishedInputSchema;
     }
     /**
-     * Formats compact responses (`request`) into `structuredContent`.
+     * Formats compact responses (`request`, `results`) into `structuredContent`.
+     *
+     * We intentionally do not expose a single `outputSchemaShape` for the tool as
+     * a whole: the `results` path returns a generic FeatureCollection whose
+     * feature properties depend on the queried WFS layer, while `request` has a
+     * compact, closed shape that is worth validating explicitly.
      *
      * @param data Raw execution result returned by the tool implementation.
      * @returns An MCP success response, optionally enriched with structured content.
@@ -62,50 +52,19 @@ class GpfWfsGetFeatureByIdTool extends MCPTool {
             data.result_type === "request") {
             return {
                 content: [{ type: "text", text: JSON.stringify(data) }],
-                structuredContent: gpfWfsGetFeaturesRequestOutputSchema.parse(data),
+                structuredContent: gpfWfsGetFeatureByIdRequestOutputSchema.parse(data),
             };
         }
-        return super.createSuccessResponse(data);
-    }
-    /**
-     * Loads a WFS feature type description from the embedded catalog.
-     *
-     * @param typename Exact WFS typename to load from the embedded schema store.
-     * @returns The matching feature type description.
-     */
-    async getFeatureType(typename) {
-        return wfsClient.getFeatureType(typename);
-    }
-    /**
-     * Executes a compiled WFS request as POST and returns the JSON FeatureCollection.
-     *
-     * @param request Compiled request split into query-string parameters and POST body.
-     * @returns The parsed JSON response returned by the WFS endpoint.
-     */
-    async fetchFeatureCollection(request) {
-        const url = `${request.url}?${new URLSearchParams(request.query).toString()}`;
-        return fetchJSONPost(url, request.body, {
-            "Content-Type": "application/x-www-form-urlencoded",
-            "Accept": "application/json",
-        });
-    }
-    /**
-     * Builds the optional `propertyName` request parameter from `select`.
-     *
-     * @param featureType Feature type definition loaded from the embedded catalog.
-     * @param input Normalized tool input.
-     * @returns A comma-separated property list, or `undefined` when all properties should be returned.
-     */
-    buildPropertyName(featureType, input) {
-        if (!input.select || input.select.length === 0) {
-            return undefined;
-        }
-        const geometryProperty = getGeometryProperty(featureType);
-        const selectedProperties = input.select.map((propertyName) => compileSelectProperty(featureType, geometryProperty, propertyName));
-        if (input.result_type === "request") {
-            return [...selectedProperties, geometryProperty.name].join(",");
+        if (typeof data === "object" &&
+            data !== null &&
+            "type" in data &&
+            data.type === "FeatureCollection") {
+            return {
+                content: [{ type: "text", text: JSON.stringify(data) }],
+                structuredContent: data,
+            };
         }
-        return selectedProperties.join(",");
+        throw new Error("Réponse interne inattendue pour gpf_wfs_get_feature_by_id : le résultat devrait être une requête WFS ou une FeatureCollection.");
     }
     /**
      * Orchestrates the by-id execution flow:
@@ -115,41 +74,25 @@ class GpfWfsGetFeatureByIdTool extends MCPTool {
      * @returns Either a compiled request or a transformed FeatureCollection containing one feature.
      */
     async execute(input) {
-        const featureType = await this.getFeatureType(input.typename);
-        const propertyName = this.buildPropertyName(featureType, input);
-        const request = buildGetFeatureByIdRequest(input.typename, input.feature_id, propertyName);
+        logger.info(`[tool] execute ${this.name} ...`, {
+            input: input
+        });
         if (input.result_type === "request") {
-            return {
-                result_type: "request",
-                method: request.method,
-                url: request.url,
-                query: request.query,
-                body: request.body,
-                get_url: request.get_url ?? null,
-            };
-        }
-        const featureCollection = await this.fetchFeatureCollection(request);
-        if (!Array.isArray(featureCollection?.features)) {
-            throw new Error("Le service WFS n'a pas retourné de collection d'objets exploitable.");
-        }
-        if (featureCollection.features.length === 0) {
-            throw new Error(`Le feature '${input.feature_id}' est introuvable dans '${input.typename}'.`);
+            // The `request` mode is handled here because it returns a preview payload,
+            // not the actual by-id WFS result.
+            const featureType = await getFeatureType(input.typename);
+            const propertyName = buildPropertyName(featureType, {
+                includeGeometry: true,
+                select: input.select,
+            });
+            const request = buildGetFeatureByIdRequest(input.typename, input.feature_id, propertyName);
+            return toWfsRequestPayload(request);
         }
-        if (featureCollection.features.length > 1) {
-            throw new Error(`Le feature '${input.feature_id}' dans '${input.typename}' devrait être unique, mais ${featureCollection.features.length} objets ont été retournés.`);
-        }
-        const [firstFeature] = featureCollection.features;
-        if (firstFeature?.id !== input.feature_id) {
-            throw new Error(`Le service WFS a retourné l'identifiant '${String(firstFeature?.id)}' au lieu de '${input.feature_id}'.`);
-        }
-        const singleFeatureCollection = {
-            ...featureCollection,
-            features: [firstFeature],
-            totalFeatures: 1,
-            numberReturned: 1,
-            numberMatched: 1,
-        };
-        return attachFeatureRefs(singleFeatureCollection, input.typename);
+        return executeGetFeatureById({
+            typename: input.typename,
+            feature_id: input.feature_id,
+            select: input.select,
+        });
     }
 }
 export default GpfWfsGetFeatureByIdTool;

package/dist/tools/GpfWfsGetFeatureByIdTool.js.map

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