@ignfab/geocontext 0.9.5 → 0.9.7

package/dist/helpers/wfs_engine/execution.d.ts

@@ -0,0 +1,72 @@
+/**
+ * Low-level WFS execution helpers for the structured WFS engine.
+ *
+ * This module centralizes:
+ * - feature type lookup from the embedded catalog
+ * - execution of compiled WFS requests
+ * - extraction of response-level metadata such as total hit counts
+ */
+import type { CompiledRequest } from "./request.js";
+export type WfsFeatureResponse = {
+    type?: "Feature";
+    id?: string;
+    geometry?: unknown;
+    geometry_name?: string;
+    properties?: Record<string, unknown>;
+    [key: string]: unknown;
+};
+export type WfsFeatureCollectionResponse = Record<string, unknown> & {
+    features?: WfsFeatureResponse[];
+    totalFeatures?: number;
+    numberMatched?: number | "unknown";
+    numberReturned?: number;
+};
+/**
+ * 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.
+ */
+export declare function 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.
+ */
+export declare function fetchFeatureCollection(request: CompiledRequest): Promise<WfsFeatureCollectionResponse>;
+/**
+ * Extracts a result count from a WFS response using `numberMatched`.
+ * Explicitly rejects responses that do not provide a usable WFS 2 total.
+ *
+ * @param featureCollection Parsed WFS response object.
+ * @returns The total number of matching features.
+ */
+export declare function getMatchedFeatureCount(featureCollection: WfsFeatureCollectionResponse): number;
+/**
+ * Input parameters for multi-typename WFS execution.
+ */
+export type MultiTypenameExecutionInput = {
+    /** Fully qualified WFS type names to query. */
+    typenames: string[];
+    /** Pre-compiled CQL filter string, when one shared filter is intentionally reused for all typenames. */
+    cqlFilter?: string;
+    /** Pre-compiled CQL filters aligned with `typenames` (same length, same order). */
+    cqlFilters?: string[];
+    /** Service label used in error messages. */
+    errorLabel: string;
+};
+/**
+ * Executes a WFS GetFeature request targeting multiple typenames.
+ *
+ * Uses the WFS 2.0.0 multi-typename format expected by GeoServer:
+ * - `typeNames=(type1)(type2)...`
+ * - `cql_filter=filter1;filter2;...` (one filter per typename, same order)
+ *
+ * This helper is used by domain-oriented modules (`src/gpf/*`) that
+ * query several WFS layers at once with a pre-compiled CQL filter.
+ *
+ * @param input Multi-typename execution parameters.
+ * @returns The parsed JSON FeatureCollection returned by the WFS endpoint.
+ */
+export declare function fetchWfsMultiTypename(input: MultiTypenameExecutionInput): Promise<WfsFeatureCollectionResponse>;

package/dist/helpers/wfs_engine/execution.js

@@ -0,0 +1,95 @@
+/**
+ * Low-level WFS execution helpers for the structured WFS engine.
+ *
+ * This module centralizes:
+ * - feature type lookup from the embedded catalog
+ * - execution of compiled WFS requests
+ * - extraction of response-level metadata such as total hit counts
+ */
+import { buildMultiTypenameRequest } from "./request.js";
+import { wfsClient } from "../../gpf/wfs-schema-catalog.js";
+import { fetchJSONPost } from "../http.js";
+import { createRateLimiter } from "../RateLimiter.js";
+/**
+ * Default rate limit for WFS requests, in requests per second.
+ * https://cartes.gouv.fr/aide/fr/guides-utilisateur/utiliser-les-services-de-la-geoplateforme/limites-d-usage/#valeur-de-la-limite-d-usage-pour-chaque-api-concernee
+ *
+ * TODO in #33 : move/call fetchFeatureCollection and fetchWfsMultiTypename in WfsClient to allow rateLimiter as a property?
+ */
+const gpfWfsRateLimit = parseInt(process.env.GPF_WFS_RATE_LIMIT || "30", 10);
+const gpfWfsRateLimiter = createRateLimiter("GPF_WFS", gpfWfsRateLimit, 1);
+// --- Catalog Lookup ---
+/**
+ * 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.
+ */
+export async function getFeatureType(typename) {
+    return wfsClient.getFeatureType(typename);
+}
+// --- Request Execution ---
+/**
+ * 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.
+ */
+export async function fetchFeatureCollection(request) {
+    // Enforce a global rate limit on all WFS requests to the GPF.
+    await gpfWfsRateLimiter.limit();
+    const url = `${request.url}?${new URLSearchParams(request.query).toString()}`;
+    return fetchJSONPost(url, request.body, {
+        "Content-Type": "application/x-www-form-urlencoded",
+        "Accept": "application/json",
+    });
+}
+// --- Response Metadata ---
+/**
+ * Extracts a result count from a WFS response using `numberMatched`.
+ * Explicitly rejects responses that do not provide a usable WFS 2 total.
+ *
+ * @param featureCollection Parsed WFS response object.
+ * @returns The total number of matching features.
+ */
+export function getMatchedFeatureCount(featureCollection) {
+    if (typeof featureCollection.numberMatched === "number") {
+        return featureCollection.numberMatched;
+    }
+    if (featureCollection.numberMatched === "unknown") {
+        throw new Error("Le service WFS a renvoyé un comptage indéterminé (numberMatched=\"unknown\").");
+    }
+    throw new Error("Le service WFS n'a pas retourné de comptage exploitable dans `numberMatched`.");
+}
+/**
+ * Executes a WFS GetFeature request targeting multiple typenames.
+ *
+ * Uses the WFS 2.0.0 multi-typename format expected by GeoServer:
+ * - `typeNames=(type1)(type2)...`
+ * - `cql_filter=filter1;filter2;...` (one filter per typename, same order)
+ *
+ * This helper is used by domain-oriented modules (`src/gpf/*`) that
+ * query several WFS layers at once with a pre-compiled CQL filter.
+ *
+ * @param input Multi-typename execution parameters.
+ * @returns The parsed JSON FeatureCollection returned by the WFS endpoint.
+ */
+export async function fetchWfsMultiTypename(input) {
+    // Enforce a global rate limit on all WFS requests to the GPF.
+    await gpfWfsRateLimiter.limit();
+    const request = buildMultiTypenameRequest({
+        typenames: input.typenames,
+        cqlFilter: input.cqlFilter,
+        cqlFilters: input.cqlFilters,
+    });
+    const url = `${request.url}?${new URLSearchParams(request.query).toString()}`;
+    const featureCollection = await fetchJSONPost(url, request.body, {
+        "Content-Type": "application/x-www-form-urlencoded",
+        "Accept": "application/json",
+    });
+    if (!Array.isArray(featureCollection?.features)) {
+        throw new Error(`Le service ${input.errorLabel} n'a pas retourné de collection d'objets exploitable`);
+    }
+    return featureCollection;
+}
+//# sourceMappingURL=execution.js.map

package/dist/helpers/wfs_engine/execution.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"execution.js","sourceRoot":"","sources":["../../../src/helpers/wfs_engine/execution.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,EAAE,yBAAyB,EAAE,MAAM,cAAc,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAEtD;;;;;GAKG;AACH,MAAM,eAAe,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB,IAAI,IAAI,EAAE,EAAE,CAAC,CAAC;AAC7E,MAAM,iBAAiB,GAAG,iBAAiB,CAAC,SAAS,EAAE,eAAe,EAAE,CAAC,CAAC,CAAC;AAqB3E,yBAAyB;AAEzB;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,QAAgB;IACnD,OAAO,SAAS,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;AAC5C,CAAC;AAED,4BAA4B;AAE5B;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAAC,OAAwB;IACnE,8DAA8D;IAC9D,MAAM,iBAAiB,CAAC,KAAK,EAAE,CAAC;IAEhC,MAAM,GAAG,GAAG,GAAG,OAAO,CAAC,GAAG,IAAI,IAAI,eAAe,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC;IAC9E,OAAO,aAAa,CAAC,GAAG,EAAE,OAAO,CAAC,IAAI,EAAE;QACtC,cAAc,EAAE,mCAAmC;QACnD,QAAQ,EAAE,kBAAkB;KAC7B,CAA0C,CAAC;AAC9C,CAAC;AAED,4BAA4B;AAE5B;;;;;;GAMG;AACH,MAAM,UAAU,sBAAsB,CAAC,iBAA+C;IACpF,IAAI,OAAO,iBAAiB,CAAC,aAAa,KAAK,QAAQ,EAAE,CAAC;QACxD,OAAO,iBAAiB,CAAC,aAAa,CAAC;IACzC,CAAC;IACD,IAAI,iBAAiB,CAAC,aAAa,KAAK,SAAS,EAAE,CAAC;QAClD,MAAM,IAAI,KAAK,CAAC,+EAA+E,CAAC,CAAC;IACnG,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,+EAA+E,CAAC,CAAC;AACnG,CAAC;AAkBD;;;;;;;;;;;;GAYG;AACH,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,KAAkC;IAElC,8DAA8D;IAC9D,MAAM,iBAAiB,CAAC,KAAK,EAAE,CAAC;IAEhC,MAAM,OAAO,GAAG,yBAAyB,CAAC;QACxC,SAAS,EAAE,KAAK,CAAC,SAAS;QAC1B,SAAS,EAAE,KAAK,CAAC,SAAS;QAC1B,UAAU,EAAE,KAAK,CAAC,UAAU;KAC7B,CAAC,CAAC;IAEH,MAAM,GAAG,GAAG,GAAG,OAAO,CAAC,GAAG,IAAI,IAAI,eAAe,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC;IAC9E,MAAM,iBAAiB,GAAG,MAAM,aAAa,CAAC,GAAG,EAAE,OAAO,CAAC,IAAI,EAAE;QAC/D,cAAc,EAAE,mCAAmC;QACnD,QAAQ,EAAE,kBAAkB;KAC7B,CAAiC,CAAC;IAEnC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,iBAAiB,EAAE,QAAQ,CAAC,EAAE,CAAC;QAChD,MAAM,IAAI,KAAK,CACb,cAAc,KAAK,CAAC,UAAU,sDAAsD,CACrF,CAAC;IACJ,CAAC;IAED,OAAO,iBAAiB,CAAC;AAC3B,CAAC"}

package/dist/helpers/wfs_engine/features.d.ts

@@ -0,0 +1,64 @@
+/**
+ * Shared execution helpers for structured WFS feature search.
+ *
+ * This module owns the WFS-side execution flow for `gpf_wfs_get_features`:
+ * request preparation, optional reference-geometry lookup, query execution,
+ * hit counting, and FeatureCollection post-processing.
+ */
+import { type CompiledQuery, type ResolvedFeatureGeometryRef } from "./queryPreparation.js";
+import { type CompiledRequest } from "./request.js";
+import type { GpfWfsGetFeaturesInput } from "./schema.js";
+/**
+ * Prepared request context returned once the `get_features` input has been
+ * validated, compiled, and assembled into a live WFS request.
+ */
+export type PreparedGetFeaturesRequest = {
+    compiled: CompiledQuery;
+    request: CompiledRequest;
+};
+/**
+ * Rejects `intersects_feature` requests that target the same typename.
+ *
+ * In that configuration the predicate may legitimately match multiple
+ * features, so callers must switch to the by-id tool instead.
+ *
+ * @param input Normalized tool input.
+ */
+export declare function ensureIntersectsFeatureTargetsOtherTypename(input: GpfWfsGetFeaturesInput): void;
+/**
+ * Resolves the geometry of a reference feature when `intersects_feature` is used,
+ * then converts it to EWKT for CQL compilation.
+ *
+ * @param input Normalized tool input.
+ * @returns The resolved reference geometry, or `undefined` when no reference feature is needed.
+ */
+export declare function resolveIntersectsFeatureGeometry(input: GpfWfsGetFeaturesInput): Promise<ResolvedFeatureGeometryRef | undefined>;
+/**
+ * Prepares the main WFS request for `gpf_wfs_get_features`.
+ *
+ * This includes upfront validation of unsupported same-typename
+ * `intersects_feature` requests, feature type lookup, optional
+ * reference-geometry resolution, query compilation, and request assembly.
+ *
+ * @param input Normalized tool input.
+ * @returns The compiled query fragments and final WFS request.
+ */
+export declare function prepareGetFeaturesRequest(input: GpfWfsGetFeaturesInput): Promise<PreparedGetFeaturesRequest>;
+/**
+ * Executes the structured WFS search flow for `result_type="results"` and `hits`.
+ *
+ * This function prepares the request, executes it against the live WFS, then
+ * either extracts a hit count or attaches `feature_ref` metadata to the result
+ * FeatureCollection.
+ *
+ * @param input Normalized tool input.
+ * @returns Either a hit-count payload or a transformed FeatureCollection.
+ */
+export declare function executeGetFeatures(input: GpfWfsGetFeaturesInput): Promise<Record<string, unknown> & {
+    features?: (Record<string, unknown> & {
+        feature_ref?: {
+            typename: string | null;
+            feature_id: string;
+        };
+    })[];
+}>;

package/dist/helpers/wfs_engine/features.js

@@ -0,0 +1,138 @@
+/**
+ * Shared execution helpers for structured WFS feature search.
+ *
+ * This module owns the WFS-side execution flow for `gpf_wfs_get_features`:
+ * request preparation, optional reference-geometry lookup, query execution,
+ * hit counting, and FeatureCollection post-processing.
+ */
+import { ServiceResponseError } from "../http.js";
+import logger from "../../logger.js";
+import { fetchFeatureById, requireSingleFeatureById } from "./byId.js";
+import { compileQueryParts, geometryToEwkt, getGeometryProperty, getSpatialFilter, } from "./queryPreparation.js";
+import { fetchFeatureCollection, getFeatureType, getMatchedFeatureCount, } from "./execution.js";
+import { buildMainRequest, } from "./request.js";
+import { attachFeatureRefs } from "./response.js";
+// --- Validation ---
+/**
+ * Rejects `intersects_feature` requests that target the same typename.
+ *
+ * In that configuration the predicate may legitimately match multiple
+ * features, so callers must switch to the by-id tool instead.
+ *
+ * @param input Normalized tool input.
+ */
+export function ensureIntersectsFeatureTargetsOtherTypename(input) {
+    if (input.spatial_operator === "intersects_feature" &&
+        input.intersects_feature_typename !== undefined &&
+        input.typename === input.intersects_feature_typename) {
+        throw new Error("Le filtre `intersects_feature` sur le même `typename` retourne potentiellement plusieurs objets. " +
+            "Utiliser `gpf_wfs_get_feature_by_id` avec `{ typename, feature_id: intersects_feature_id }` pour cibler exactement un objet.");
+    }
+}
+/**
+ * Checks whether a raw value exposes the minimal geometry shape required by
+ * `geometryToEwkt`.
+ *
+ * @param value Unknown feature geometry value.
+ * @returns `true` when the value looks like a GeoJSON geometry object.
+ */
+function isGeometryLike(value) {
+    return (typeof value === "object" &&
+        value !== null &&
+        "type" in value &&
+        typeof value.type === "string" &&
+        "coordinates" in value);
+}
+// --- Reference Geometry ---
+/**
+ * Resolves the geometry of a reference feature when `intersects_feature` is used,
+ * then converts it to EWKT for CQL compilation.
+ *
+ * @param input Normalized tool input.
+ * @returns The resolved reference geometry, or `undefined` when no reference feature is needed.
+ */
+export async function resolveIntersectsFeatureGeometry(input) {
+    const spatialFilter = getSpatialFilter(input);
+    if (!spatialFilter || spatialFilter.operator !== "intersects_feature") {
+        return undefined;
+    }
+    const referenceFeatureType = await getFeatureType(spatialFilter.typename);
+    const referenceGeometryProperty = getGeometryProperty(referenceFeatureType);
+    const featureCollection = await fetchFeatureById({
+        typename: spatialFilter.typename,
+        feature_id: spatialFilter.feature_id,
+        propertyName: referenceGeometryProperty.name,
+    });
+    const referenceFeature = requireSingleFeatureById(featureCollection, {
+        typename: spatialFilter.typename,
+        feature_id: spatialFilter.feature_id,
+    });
+    if (!isGeometryLike(referenceFeature?.geometry)) {
+        throw new Error(`Le feature de référence '${spatialFilter.feature_id}' n'a pas de géométrie exploitable.`);
+    }
+    return {
+        geometry_ewkt: geometryToEwkt(referenceFeature.geometry),
+    };
+}
+// --- Request Preparation ---
+/**
+ * Prepares the main WFS request for `gpf_wfs_get_features`.
+ *
+ * This includes upfront validation of unsupported same-typename
+ * `intersects_feature` requests, feature type lookup, optional
+ * reference-geometry resolution, query compilation, and request assembly.
+ *
+ * @param input Normalized tool input.
+ * @returns The compiled query fragments and final WFS request.
+ */
+export async function prepareGetFeaturesRequest(input) {
+    // TODO: Assess if this guard does not prevent legitimate use cases.
+    ensureIntersectsFeatureTargetsOtherTypename(input);
+    // Get the feature type definition from the embedded catalog to access
+    // property definitions and the geometry column name.
+    const featureType = await getFeatureType(input.typename);
+    // Resolve the reference geometry for `intersects_feature`, when needed by
+    // the selected spatial filter.
+    const resolvedGeometryRef = await resolveIntersectsFeatureGeometry(input);
+    // Compile query fragments from the normalized input, feature type, and
+    // optional resolved reference geometry.
+    const compiled = compileQueryParts(input, featureType, resolvedGeometryRef);
+    // Assemble the final WFS request from the compiled fragments.
+    const request = buildMainRequest(input, compiled);
+    return { compiled, request };
+}
+// --- Execution ---
+/**
+ * Executes the structured WFS search flow for `result_type="results"` and `hits`.
+ *
+ * This function prepares the request, executes it against the live WFS, then
+ * either extracts a hit count or attaches `feature_ref` metadata to the result
+ * FeatureCollection.
+ *
+ * @param input Normalized tool input.
+ * @returns Either a hit-count payload or a transformed FeatureCollection.
+ */
+export async function executeGetFeatures(input) {
+    const { compiled, request } = await prepareGetFeaturesRequest(input);
+    let featureCollection;
+    try {
+        logger.debug(`[gpf_wfs_get_features] POST ${request.url}?${new URLSearchParams(request.query).toString()}`);
+        featureCollection = await fetchFeatureCollection(request);
+    }
+    catch (error) {
+        if (error instanceof ServiceResponseError &&
+            error.serviceCode === "InvalidParameterValue" &&
+            error.serviceDetail === `Illegal property name: ${compiled.geometryProperty.name}`) {
+            throw new Error(`Le champ géométrique '${compiled.geometryProperty.name}' issu du catalogue embarqué est rejeté par le WFS live pour '${input.typename}'. Le catalogue embarqué est probablement désynchronisé. Détail : ${error.message}`);
+        }
+        throw error;
+    }
+    if (input.result_type === "hits") {
+        return {
+            result_type: "hits",
+            totalFeatures: getMatchedFeatureCount(featureCollection),
+        };
+    }
+    return attachFeatureRefs(featureCollection, input.typename);
+}
+//# sourceMappingURL=features.js.map

package/dist/helpers/wfs_engine/features.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"features.js","sourceRoot":"","sources":["../../../src/helpers/wfs_engine/features.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAClD,OAAO,MAAM,MAAM,iBAAiB,CAAC;AACrC,OAAO,EAAE,gBAAgB,EAAE,wBAAwB,EAAE,MAAM,WAAW,CAAC;AACvE,OAAO,EACL,iBAAiB,EACjB,cAAc,EACd,mBAAmB,EACnB,gBAAgB,GAGjB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACL,sBAAsB,EACtB,cAAc,EACd,sBAAsB,GAEvB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,gBAAgB,GAEjB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAmBlD,qBAAqB;AAErB;;;;;;;GAOG;AACH,MAAM,UAAU,2CAA2C,CACzD,KAA6B;IAE7B,IACE,KAAK,CAAC,gBAAgB,KAAK,oBAAoB;QAC/C,KAAK,CAAC,2BAA2B,KAAK,SAAS;QAC/C,KAAK,CAAC,QAAQ,KAAK,KAAK,CAAC,2BAA2B,EACpD,CAAC;QACD,MAAM,IAAI,KAAK,CACb,mGAAmG;YACjG,8HAA8H,CACjI,CAAC;IACJ,CAAC;AACH,CAAC;AAED;;;;;;GAMG;AACH,SAAS,cAAc,CAAC,KAAc;IACpC,OAAO,CACL,OAAO,KAAK,KAAK,QAAQ;QACzB,KAAK,KAAK,IAAI;QACd,MAAM,IAAI,KAAK;QACf,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ;QAC9B,aAAa,IAAI,KAAK,CACvB,CAAC;AACJ,CAAC;AAED,6BAA6B;AAE7B;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,gCAAgC,CACpD,KAA6B;IAE7B,MAAM,aAAa,GAAG,gBAAgB,CAAC,KAAK,CAAC,CAAC;IAC9C,IAAI,CAAC,aAAa,IAAI,aAAa,CAAC,QAAQ,KAAK,oBAAoB,EAAE,CAAC;QACtE,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,oBAAoB,GAAG,MAAM,cAAc,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;IAC1E,MAAM,yBAAyB,GAAG,mBAAmB,CAAC,oBAAoB,CAAC,CAAC;IAC5E,MAAM,iBAAiB,GAAG,MAAM,gBAAgB,CAAC;QAC/C,QAAQ,EAAE,aAAa,CAAC,QAAQ;QAChC,UAAU,EAAE,aAAa,CAAC,UAAU;QACpC,YAAY,EAAE,yBAAyB,CAAC,IAAI;KAC7C,CAAC,CAAC;IACH,MAAM,gBAAgB,GAAG,wBAAwB,CAAC,iBAAiB,EAAE;QACnE,QAAQ,EAAE,aAAa,CAAC,QAAQ;QAChC,UAAU,EAAE,aAAa,CAAC,UAAU;KACrC,CAAC,CAAC;IAEH,IAAI,CAAC,cAAc,CAAC,gBAAgB,EAAE,QAAQ,CAAC,EAAE,CAAC;QAChD,MAAM,IAAI,KAAK,CACb,4BAA4B,aAAa,CAAC,UAAU,qCAAqC,CAC1F,CAAC;IACJ,CAAC;IAED,OAAO;QACL,aAAa,EAAE,cAAc,CAAC,gBAAgB,CAAC,QAAQ,CAAC;KACzD,CAAC;AACJ,CAAC;AAED,8BAA8B;AAE9B;;;;;;;;;GASG;AACH,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAC7C,KAA6B;IAE7B,oEAAoE;IACpE,2CAA2C,CAAC,KAAK,CAAC,CAAC;IACnD,sEAAsE;IACtE,qDAAqD;IACrD,MAAM,WAAW,GAAe,MAAM,cAAc,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IACrE,0EAA0E;IAC1E,+BAA+B;IAC/B,MAAM,mBAAmB,GAAG,MAAM,gCAAgC,CAAC,KAAK,CAAC,CAAC;IAC1E,uEAAuE;IACvE,wCAAwC;IACxC,MAAM,QAAQ,GAAG,iBAAiB,CAAC,KAAK,EAAE,WAAW,EAAE,mBAAmB,CAAC,CAAC;IAC5E,8DAA8D;IAC9D,MAAM,OAAO,GAAG,gBAAgB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IAElD,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC;AAC/B,CAAC;AAED,oBAAoB;AAEpB;;;;;;;;;GASG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,KAA6B;IACpE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,MAAM,yBAAyB,CAAC,KAAK,CAAC,CAAC;IAErE,IAAI,iBAA+C,CAAC;IAEpD,IAAI,CAAC;QACH,MAAM,CAAC,KAAK,CACV,+BAA+B,OAAO,CAAC,GAAG,IAAI,IAAI,eAAe,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE,EAAE,CAC9F,CAAC;QACF,iBAAiB,GAAG,MAAM,sBAAsB,CAAC,OAAO,CAAC,CAAC;IAC5D,CAAC;IAAC,OAAO,KAAc,EAAE,CAAC;QACxB,IACE,KAAK,YAAY,oBAAoB;YACrC,KAAK,CAAC,WAAW,KAAK,uBAAuB;YAC7C,KAAK,CAAC,aAAa,KAAK,0BAA0B,QAAQ,CAAC,gBAAgB,CAAC,IAAI,EAAE,EAClF,CAAC;YACD,MAAM,IAAI,KAAK,CACb,yBAAyB,QAAQ,CAAC,gBAAgB,CAAC,IAAI,iEAAiE,KAAK,CAAC,QAAQ,qEAAqE,KAAK,CAAC,OAAO,EAAE,CAC3N,CAAC;QACJ,CAAC;QACD,MAAM,KAAK,CAAC;IACd,CAAC;IAED,IAAI,KAAK,CAAC,WAAW,KAAK,MAAM,EAAE,CAAC;QACjC,OAAO;YACL,WAAW,EAAE,MAAe;YAC5B,aAAa,EAAE,sBAAsB,CAAC,iBAAiB,CAAC;SACzD,CAAC;IACJ,CAAC;IAED,OAAO,iBAAiB,CAAC,iBAAiB,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;AAC9D,CAAC"}

package/dist/helpers/wfs_engine/geometry.d.ts

@@ -0,0 +1,16 @@
+/**
+ * GeoJSON geometry serialization helpers for the structured WFS engine.
+ *
+ * This module converts GeoJSON-like geometries to EWKT so they can be reused
+ * in spatial CQL predicates such as `intersects_feature`.
+ */
+/**
+ * Serializes a GeoJSON-like geometry object into EWKT for CQL spatial predicates.
+ *
+ * @param geometry Geometry object exposing a GeoJSON `type` and `coordinates`.
+ * @returns The EWKT representation of the geometry.
+ */
+export declare function geometryToEwkt(geometry: {
+    type: string;
+    coordinates: unknown;
+}): string;

package/dist/helpers/wfs_engine/geometry.js

@@ -0,0 +1,44 @@
+/**
+ * GeoJSON geometry serialization helpers for the structured WFS engine.
+ *
+ * This module converts GeoJSON-like geometries to EWKT so they can be reused
+ * in spatial CQL predicates such as `intersects_feature`.
+ */
+// --- Coordinate Serialization ---
+/**
+ * Serializes a single coordinate pair into a WKT position.
+ *
+ * @param position Coordinate pair expressed as `[lon, lat]`.
+ * @returns A WKT position string.
+ */
+function positionToWkt(position) {
+    return `${position[0]} ${position[1]}`;
+}
+// --- Geometry Serialization ---
+/**
+ * Serializes a GeoJSON-like geometry object into EWKT for CQL spatial predicates.
+ *
+ * @param geometry Geometry object exposing a GeoJSON `type` and `coordinates`.
+ * @returns The EWKT representation of the geometry.
+ */
+export function geometryToEwkt(geometry) {
+    switch (geometry.type) {
+        case "Point":
+            return `SRID=4326;POINT(${positionToWkt(geometry.coordinates)})`;
+        case "MultiPoint":
+            return `SRID=4326;MULTIPOINT(${geometry.coordinates
+                .map((position) => `(${positionToWkt(position)})`)
+                .join(",")})`;
+        case "LineString":
+            return `SRID=4326;LINESTRING(${geometry.coordinates.map(positionToWkt).join(",")})`;
+        case "MultiLineString":
+            return `SRID=4326;MULTILINESTRING(${geometry.coordinates.map((line) => `(${line.map(positionToWkt).join(",")})`).join(",")})`;
+        case "Polygon":
+            return `SRID=4326;POLYGON(${geometry.coordinates.map((ring) => `(${ring.map(positionToWkt).join(",")})`).join(",")})`;
+        case "MultiPolygon":
+            return `SRID=4326;MULTIPOLYGON(${geometry.coordinates.map((polygon) => `(${polygon.map((ring) => `(${ring.map(positionToWkt).join(",")})`).join(",")})`).join(",")})`;
+        default:
+            throw new Error(`Le type de géométrie '${geometry.type}' n'est pas supporté pour \`intersects_feature\`.`);
+    }
+}
+//# sourceMappingURL=geometry.js.map

package/dist/helpers/wfs_engine/geometry.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"geometry.js","sourceRoot":"","sources":["../../../src/helpers/wfs_engine/geometry.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,mCAAmC;AAEnC;;;;;GAKG;AACH,SAAS,aAAa,CAAC,QAA0B;IAC/C,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC,IAAI,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;AACzC,CAAC;AAED,iCAAiC;AAEjC;;;;;GAKG;AACH,MAAM,UAAU,cAAc,CAAC,QAAgD;IAC7E,QAAQ,QAAQ,CAAC,IAAI,EAAE,CAAC;QACtB,KAAK,OAAO;YACV,OAAO,mBAAmB,aAAa,CAAC,QAAQ,CAAC,WAA+B,CAAC,GAAG,CAAC;QACvF,KAAK,YAAY;YACf,OAAO,wBAAyB,QAAQ,CAAC,WAAkC;iBACxE,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,aAAa,CAAC,QAAQ,CAAC,GAAG,CAAC;iBACjD,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;QAClB,KAAK,YAAY;YACf,OAAO,wBAAyB,QAAQ,CAAC,WAAkC,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;QAC9G,KAAK,iBAAiB;YACpB,OAAO,6BAA8B,QAAQ,CAAC,WAAoC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;QAC1J,KAAK,SAAS;YACZ,OAAO,qBAAsB,QAAQ,CAAC,WAAoC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;QAClJ,KAAK,cAAc;YACjB,OAAO,0BAA2B,QAAQ,CAAC,WAAsC,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;QACpM;YACE,MAAM,IAAI,KAAK,CAAC,yBAAyB,QAAQ,CAAC,IAAI,mDAAmD,CAAC,CAAC;IAC/G,CAAC;AACH,CAAC"}

package/dist/helpers/wfs_engine/properties.d.ts

@@ -0,0 +1,51 @@
+/**
+ * Property resolution and validation helpers for the structured WFS query compiler.
+ *
+ * This module centralizes:
+ * - geometry property lookup
+ * - property existence checks
+ * - non-geometry validation for select/order/filter compilation
+ */
+import type { Collection, CollectionProperty } from "@ignfab/gpf-schema-store";
+import type { GpfWfsGetFeaturesInput } from "./schema.js";
+/**
+ * Resolves the single geometry property expected by the query compiler.
+ *
+ * @param featureType Feature type definition loaded from the embedded catalog.
+ * @returns The unique geometry property for the feature type.
+ */
+export declare function getGeometryProperty(featureType: Collection): any;
+/**
+ * Resolves a property by exact name and ensures it is not the geometry column
+ * of the feature type.
+ *
+ * @param featureType Feature type definition loaded from the embedded catalog.
+ * @param geometryProperty Geometry property already resolved for the feature type.
+ * @param propertyName Exact property name requested by the caller.
+ * @param message Error message template used when the property is geometric.
+ * @returns The matching non-geometric property metadata.
+ */
+export declare function resolveNonGeometryProperty(featureType: Collection, geometryProperty: CollectionProperty, propertyName: string, message: string): any;
+/**
+ * Validates a selected property name and returns the exact property name to expose.
+ *
+ * @param featureType Feature type definition loaded from the embedded catalog.
+ * @param geometryProperty Geometry property already resolved for the feature type.
+ * @param propertyName Raw selected property name.
+ * @returns The validated non-geometric property name.
+ */
+export declare function validateSelectProperty(featureType: Collection, geometryProperty: CollectionProperty, propertyName: string): any;
+/**
+ * Builds the list of property names to return according to `select` and `result_type`.
+ *
+ * Note that:
+ * - when `select` is omitted and `result_type` is `results`, every non-geometric property is returned
+ * - when `select` is provided, each property is validated against the embedded catalog
+ * - when `result_type` is `request`, the geometry column is appended to the requested selection
+ *
+ * @param featureType Feature type definition loaded from the embedded catalog.
+ * @param geometryProperty Geometry property already resolved for the feature type.
+ * @param input Normalized tool input.
+ * @returns The list of property names to expose in the WFS `propertyName` parameter.
+ */
+export declare function buildSelectList(featureType: Collection, geometryProperty: CollectionProperty, input: GpfWfsGetFeaturesInput): any;

package/dist/helpers/wfs_engine/properties.js

@@ -0,0 +1,128 @@
+/**
+ * Property resolution and validation helpers for the structured WFS query compiler.
+ *
+ * This module centralizes:
+ * - geometry property lookup
+ * - property existence checks
+ * - non-geometry validation for select/order/filter compilation
+ */
+// --- Property Listing ---
+/**
+ * Lists available property names for a feature type, mainly for error reporting.
+ *
+ * @param featureType Feature type definition loaded from the embedded catalog.
+ * @returns A comma-separated list of property names.
+ */
+function getPropertyList(featureType) {
+    return featureType.properties.map((property) => property.name).join(", ");
+}
+// --- Geometry Resolution ---
+/**
+ * Returns every geometry-like property exposed by a feature type.
+ *
+ * @param featureType Feature type definition loaded from the embedded catalog.
+ * @returns The list of properties carrying a `defaultCrs`.
+ */
+function getGeometryProperties(featureType) {
+    return featureType.properties.filter((property) => property.defaultCrs);
+}
+/**
+ * Resolves the single geometry property expected by the query compiler.
+ *
+ * @param featureType Feature type definition loaded from the embedded catalog.
+ * @returns The unique geometry property for the feature type.
+ */
+export function getGeometryProperty(featureType) {
+    const geometryProperties = getGeometryProperties(featureType);
+    if (geometryProperties.length === 0) {
+        throw new Error(`Le type '${featureType.id}' n'expose aucune propriété géométrique exploitable dans le catalogue embarqué.`);
+    }
+    if (geometryProperties.length > 1) {
+        throw new Error(`Le type '${featureType.id}' expose plusieurs propriétés géométriques dans le catalogue embarqué : ${geometryProperties.map((property) => property.name).join(", ")}.`);
+    }
+    return geometryProperties[0];
+}
+// --- Generic Property Resolution ---
+/**
+ * Loads a property by exact name and throws a descriptive error when it does not exist.
+ *
+ * @param featureType Feature type definition loaded from the embedded catalog.
+ * @param propertyName Exact property name requested by the caller.
+ * @returns The matching property metadata.
+ */
+function getPropertyOrThrow(featureType, propertyName) {
+    const property = featureType.properties.find((candidate) => candidate.name === propertyName);
+    if (!property) {
+        throw new Error(`La propriété '${propertyName}' n'existe pas pour '${featureType.id}'. ` +
+            `Appelle \`gpf_wfs_describe_type\` pour obtenir la liste des propriétés disponibles.`);
+    }
+    return property;
+}
+// --- Non-Geometry Validation ---
+/**
+ * Resolves a property by exact name and ensures it is not the geometry column
+ * of the feature type.
+ *
+ * @param featureType Feature type definition loaded from the embedded catalog.
+ * @param geometryProperty Geometry property already resolved for the feature type.
+ * @param propertyName Exact property name requested by the caller.
+ * @param message Error message template used when the property is geometric.
+ * @returns The matching non-geometric property metadata.
+ */
+export function resolveNonGeometryProperty(featureType, geometryProperty, propertyName, message) {
+    const property = getPropertyOrThrow(featureType, propertyName);
+    if (property.name === geometryProperty.name || property.defaultCrs) {
+        throw new Error(message.replace("{property}", property.name));
+    }
+    return property;
+}
+// --- Select Validation ---
+/**
+ * Validates a selected property name and returns the exact property name to expose.
+ *
+ * @param featureType Feature type definition loaded from the embedded catalog.
+ * @param geometryProperty Geometry property already resolved for the feature type.
+ * @param propertyName Raw selected property name.
+ * @returns The validated non-geometric property name.
+ */
+export function validateSelectProperty(featureType, geometryProperty, propertyName) {
+    return resolveNonGeometryProperty(featureType, geometryProperty, propertyName, "La propriété '{property}' est géométrique. `select` accepte uniquement des propriétés non géométriques.").name;
+}
+// --- Property Selection ---
+/**
+ * Builds the list of property names to return according to `select` and `result_type`.
+ *
+ * Note that:
+ * - when `select` is omitted and `result_type` is `results`, every non-geometric property is returned
+ * - when `select` is provided, each property is validated against the embedded catalog
+ * - when `result_type` is `request`, the geometry column is appended to the requested selection
+ *
+ * @param featureType Feature type definition loaded from the embedded catalog.
+ * @param geometryProperty Geometry property already resolved for the feature type.
+ * @param input Normalized tool input.
+ * @returns The list of property names to expose in the WFS `propertyName` parameter.
+ */
+export function buildSelectList(featureType, geometryProperty, input) {
+    // If `select` is specified, only the requested properties are returned
+    // after validation against the embedded catalog.
+    if (input.select && input.select.length > 0) {
+        const selectedProperties = input.select.map((propertyName) => validateSelectProperty(featureType, geometryProperty, propertyName));
+        // For `result_type="request"`, also include the geometry column so the
+        // compiled request stays directly usable for mapping/debugging.
+        if (input.result_type === "request") {
+            return [...selectedProperties, geometryProperty.name];
+        }
+        return selectedProperties;
+    }
+    // If `select` is omitted and `result_type="results"`, return every
+    // non-geometric property from the feature type.
+    if (input.result_type === "results") {
+        return featureType.properties
+            .filter((property) => !property.defaultCrs)
+            .map((property) => property.name);
+    }
+    // If `select` is omitted and `result_type` is `hits` or `request`,
+    // do not send any `propertyName` selection.
+    return [];
+}
+//# sourceMappingURL=properties.js.map

package/dist/helpers/wfs_engine/properties.js.map

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