@honua/sdk-esri-compat 0.1.14 → 0.1.16

package/core/client.js

@@ -475,11 +475,11 @@ export class HonuaClient {
         }
     }
     /**
-     * Drive a paginated FeatureServer query as an async generator. Each yielded
-     * chunk is a `HonuaFeature[]` slice; iteration stops when the server stops
-     * advertising `exceededTransferLimit`. Lower-level than
-     * `dataset.source(...).queryAll()` but suitable for streaming pipelines that
-     * want backpressure between pages.
+     * Consume the native gRPC FeatureService server stream. Each yielded chunk
+     * is a `HonuaFeature[]` slice. The server controls batching and may apply a
+     * total result limit, including its default when resultRecordCount is absent.
+     * Use `featureLayer(...).queryFeaturesStream()` or `Source.stream()` to page
+     * through the full match set with a caller-selected per-batch budget.
      *
      * @example
      * ```ts
@@ -817,6 +817,8 @@ export class HonuaClient {
      * `.text()`, or `.arrayBuffer()`. Non-2xx responses still throw the
      * normalized `HonuaHttpError` (and trigger retries) so error handling
      * matches every other client method.
+     * The request deadline and caller cancellation remain active while consuming
+     * the response body. Consume or cancel the body to release that lifecycle.
      */
     async pipelineFetch(method, path, init, callerSignal, options = {}) {
         const request = {
@@ -837,7 +839,8 @@ export class HonuaClient {
             ...(options.redirect ? { redirect: options.redirect } : {}),
             ...(options.beforeAttempt ? { beforeAttempt: options.beforeAttempt } : {}),
             ...(options.beforeReplay ? { beforeReplay: options.beforeReplay } : {}),
-            ...(options.prepareResponse || options.errorBody ? { deadlineThroughFinalize: true } : {}),
+            deadlineThroughFinalize: true,
+            streamResponse: options.prepareResponse === undefined,
             ...(options.errorBody
                 ? { errorBody: options.errorBody }
                 : options.discardErrorBody
@@ -890,6 +893,7 @@ export class HonuaClient {
         };
         return this.executeRequest(request, {
             callerSignal: metadataOptions.signal,
+            deadlineThroughFinalize: true,
             // stale-if-error fallback on a terminal network or HTTP failure.
             onTerminalError: (error) => this.staleMetadataFallback(cached, metadataOptions, error),
             // 304 Not Modified: revalidate the cached entry without re-parsing a body.
@@ -915,8 +919,8 @@ export class HonuaClient {
                     })),
                 };
             },
-            finalize: async (response, durationMs, currentRequest, runAfter) => {
-                const body = await parseResponseBody(this.hasAfterInterceptors() ? response.clone() : response, metadataOptions.maxResponseBytes);
+            finalize: async (response, durationMs, currentRequest, runAfter, deadlineSignal) => {
+                const body = await parseSuccessfulJsonBody(this.hasAfterInterceptors() ? response.clone() : response, metadataOptions.maxResponseBytes, deadlineSignal);
                 // GeoServices reports metadata failures (layer not found, invalid token
                 // => code 499, …) as HTTP 200 with a top-level `{error}` envelope.
                 // Detect it before caching so a transient auth/permission error is never
@@ -1289,7 +1293,7 @@ export class HonuaClient {
             finalize: async (response, _durationMs, _currentRequest, runAfter) => {
                 // Parse the original body directly when no after-interceptor will read
                 // it; only clone when an interceptor needs an independent copy.
-                const body = await parseResponseBody(this.hasAfterInterceptors() ? response.clone() : response);
+                const body = await parseSuccessfulJsonBody(this.hasAfterInterceptors() ? response.clone() : response);
                 // GeoServices/Esri services return HTTP 200 with a top-level `{error}`
                 // envelope on failure (bad WHERE, invalid outFields, edit failures, …).
                 // Surface these through the unified error model instead of handing the
@@ -1321,19 +1325,22 @@ export class HonuaClient {
         };
         return this.executeRequest(request, {
             callerSignal,
-            finalize: async (response, durationMs, currentRequest, runAfter) => {
+            deadlineThroughFinalize: true,
+            finalize: async (response, durationMs, currentRequest, runAfter, deadlineSignal) => {
                 await runAfter();
                 // If the server returned PBF, decode it; on decode failure (including
                 // Z/M geometry the fast path can't handle) retry as f=json.
                 if (isPbfResponse(response)) {
                     try {
-                        const buffer = await response.arrayBuffer();
+                        const buffer = await readBoundedResponseBytes(response, Number.MAX_SAFE_INTEGER, deadlineSignal);
                         return decodePbfQueryResponse(buffer);
                     }
-                    catch {
+                    catch (error) {
+                        if (deadlineSignal?.aborted)
+                            throw error;
                         params.set("f", "json");
                         const jsonPath = `${stripQuery(path)}?${params.toString()}`;
-                        return this.requestJson("GET", jsonPath, undefined, callerSignal ?? currentRequest.init.signal ?? undefined);
+                        return this.requestJson("GET", jsonPath, undefined, deadlineSignal ?? callerSignal ?? currentRequest.init.signal ?? undefined);
                     }
                 }
                 // Server returned JSON despite the PBF request (e.g. error or
@@ -1342,7 +1349,7 @@ export class HonuaClient {
                 // even when f=pbf was requested. Detect the `{error}` envelope here so
                 // preferBinary callers throw a normalized HonuaHttpError exactly like
                 // the JSON path instead of receiving the failure envelope as success.
-                const body = await parseResponseBody(response);
+                const body = await parseSuccessfulJsonBody(response, undefined, deadlineSignal);
                 const envelopeError = toGeoServicesError(response.status, body, response.headers);
                 if (envelopeError) {
                     await this.applyErrorInterceptors({
@@ -1386,11 +1393,11 @@ export class HonuaClient {
         };
         return this.executeRequest(request, {
             callerSignal: options?.signal,
-            deadlineThroughFinalize: options?.maxResponseBytes !== undefined,
+            deadlineThroughFinalize: true,
             errorBody: async (response, deadlineSignal) => {
                 const clone = response.clone();
                 const text = options?.maxResponseBytes === undefined
-                    ? await clone.text()
+                    ? new TextDecoder().decode(await readBoundedResponseBytes(clone, Number.MAX_SAFE_INTEGER, deadlineSignal))
                     : new TextDecoder().decode(await readBoundedResponseBytes(clone, options.maxResponseBytes, deadlineSignal));
                 const contentType = response.headers.get("content-type") ?? acceptHeader;
                 return text ? { raw: text, contentType } : {};
@@ -1398,7 +1405,7 @@ export class HonuaClient {
             finalize: async (response, _durationMs, _request, runAfter, deadlineSignal) => {
                 if (options?.maxResponseBytes === undefined) {
                     await runAfter();
-                    const text = await response.text();
+                    const text = new TextDecoder().decode(await readBoundedResponseBytes(response, Number.MAX_SAFE_INTEGER, deadlineSignal));
                     const contentType = response.headers.get("content-type") ?? acceptHeader;
                     return { text, contentType, status: response.status };
                 }
@@ -1431,10 +1438,10 @@ export class HonuaClient {
         };
         return this.executeRequest(request, {
             callerSignal,
-            finalize: async (response, _durationMs, _request, runAfter) => {
+            deadlineThroughFinalize: true,
+            finalize: async (response, _durationMs, _request, runAfter, deadlineSignal) => {
                 await runAfter();
-                const buffer = await response.arrayBuffer();
-                const bytes = new Uint8Array(buffer);
+                const bytes = await readBoundedResponseBytes(response, Number.MAX_SAFE_INTEGER, deadlineSignal);
                 return {
                     bytes,
                     contentType: response.headers.get("content-type") ?? acceptHeader,
@@ -1517,6 +1524,8 @@ export class HonuaClient {
             }
             const durationMs = performance.now() - startTime;
             const currentRequest = request;
+            let bodyOwnsDeadline = false;
+            let cancelDeadlineResponse;
             let terminalErrorNotification;
             const beginTerminalErrorNotification = (error, errorDurationMs) => {
                 if (terminalErrorNotification) {
@@ -1532,6 +1541,10 @@ export class HonuaClient {
             };
             const awaitDeadlineOwned = async (operation) => {
                 const owned = operation.catch(async (error) => {
+                    // The outer deadline catch decides retry, stale fallback, and the
+                    // normalized terminal error. A discarded attempt must not notify.
+                    if (timeout.signal?.aborted)
+                        throw error;
                     const notification = beginTerminalErrorNotification(error, performance.now() - startTime);
                     if (notification.claimed) {
                         await notification.completion;
@@ -1553,7 +1566,8 @@ export class HonuaClient {
             };
             try {
                 if (options.shortCircuit) {
-                    const shorted = await options.shortCircuit(response, durationMs, currentRequest, runAfter);
+                    const pending = options.shortCircuit(response, durationMs, currentRequest, runAfter);
+                    const shorted = await (options.deadlineThroughFinalize ? awaitDeadlineOwned(pending) : pending);
                     if (shorted)
                         return shorted.value;
                 }
@@ -1595,8 +1609,15 @@ export class HonuaClient {
                     await this.applyErrorInterceptors({ request: cloneRequestContext(request), error: httpError, durationMs });
                     throw httpError;
                 }
-                const finalized = options.finalize(response, durationMs, currentRequest, runAfter, timeout.signal);
-                return await (options.deadlineThroughFinalize ? awaitDeadlineOwned(finalized) : finalized);
+                const ownedResponse = options.streamResponse
+                    ? responseWithDeadline(response, timeout.signal, () => timeout.dispose(), () => (timeout.didTimeout ? new HonuaTimeoutError(this.timeoutMs ?? 0) : new HonuaAbortError()))
+                    : undefined;
+                const preparedResponse = ownedResponse?.response ?? response;
+                cancelDeadlineResponse = ownedResponse?.cancel;
+                const finalized = options.finalize(preparedResponse, durationMs, currentRequest, runAfter, timeout.signal);
+                const result = await (options.deadlineThroughFinalize ? awaitDeadlineOwned(finalized) : finalized);
+                bodyOwnsDeadline = options.streamResponse === true && response.body !== null;
+                return result;
             }
             catch (error) {
                 if (!options.deadlineThroughFinalize || !timeout.signal?.aborted)
@@ -1612,12 +1633,19 @@ export class HonuaClient {
                     await this.sleepBeforeRetry(attempt, undefined, retrySignal);
                     continue;
                 }
+                if (timeout.didTimeout) {
+                    const fallback = options.onTerminalError?.(terminalError);
+                    if (fallback !== undefined)
+                        return fallback;
+                }
                 beginTerminalErrorNotification(terminalError, performance.now() - startTime);
                 throw terminalError;
             }
             finally {
-                if (options.deadlineThroughFinalize)
+                if (options.deadlineThroughFinalize && !bodyOwnsDeadline) {
                     timeout.dispose();
+                    cancelDeadlineResponse?.();
+                }
             }
         }
     }
@@ -1721,7 +1749,7 @@ export class HonuaClient {
  * results or confusing `undefined` access. Returns a normalized
  * {@link HonuaHttpError} when the envelope is present, otherwise `undefined`.
  */
-async function parseResponseBody(response, maxResponseBytes) {
+async function parseResponseBody(response, maxResponseBytes, requireJson = false) {
     const text = maxResponseBytes === undefined
         ? await response.text()
         : new TextDecoder().decode(await readBoundedResponseBytes(response, maxResponseBytes));
@@ -1732,9 +1760,20 @@ async function parseResponseBody(response, maxResponseBytes) {
         return JSON.parse(text);
     }
     catch {
+        if (requireJson) {
+            throw new HonuaHttpError(response.status, "Expected a JSON response", { raw: text }, {
+                responseHeaders: response.headers,
+            });
+        }
         return { raw: text };
     }
 }
+async function parseSuccessfulJsonBody(response, maxResponseBytes, signal) {
+    const prepared = signal
+        ? bufferedResponse(response, await readBoundedResponseBytes(response, maxResponseBytes ?? Number.MAX_SAFE_INTEGER, signal))
+        : response;
+    return parseResponseBody(prepared, maxResponseBytes, true);
+}
 async function readBoundedResponseBytes(response, maximum, signal) {
     if (signal?.aborted) {
         void response.body?.cancel().catch(() => undefined);
@@ -2046,3 +2085,66 @@ function isGrpcAdapterModule(value) {
         typeof value.wrapConnectError === "function" &&
         typeof value.streamProtoPages === "function");
 }
+/** Keep raw response consumption inside the original request deadline without buffering. */
+function responseWithDeadline(response, signal, dispose, abortError) {
+    if (!response.body)
+        return { response, cancel: dispose };
+    const reader = response.body.getReader();
+    let finished = false;
+    let controller;
+    const cleanup = () => {
+        if (finished)
+            return;
+        finished = true;
+        signal?.removeEventListener("abort", abort);
+        dispose();
+    };
+    const abort = () => {
+        if (finished)
+            return;
+        cleanup();
+        controller.error(abortError());
+        void reader.cancel().catch(() => undefined);
+    };
+    const body = new ReadableStream({
+        start(value) {
+            controller = value;
+            signal?.addEventListener("abort", abort, { once: true });
+            if (signal?.aborted)
+                abort();
+        },
+        async pull(value) {
+            if (finished)
+                return;
+            try {
+                const next = await reader.read();
+                if (finished)
+                    return;
+                if (next.done) {
+                    cleanup();
+                    value.close();
+                }
+                else
+                    value.enqueue(next.value);
+            }
+            catch (error) {
+                if (finished)
+                    return;
+                cleanup();
+                value.error(error);
+            }
+        },
+        async cancel(reason) {
+            cleanup();
+            await reader.cancel(reason);
+        },
+    });
+    const prepared = preserveResponseSemantics(new Response(body, {
+        status: response.status,
+        statusText: response.statusText,
+        headers: response.headers,
+    }), response);
+    // Cancel the original reader directly: cancelling one cloned Response branch
+    // alone waits forever when an interceptor leaves the other tee branch unread.
+    return { response: prepared, cancel: abort };
+}

package/core/geoservices.js

@@ -58,7 +58,7 @@ export async function queryFeaturesRest(transport, request, preferBinary) {
     const params = new URLSearchParams();
     params.set("f", preferBinary && (request.method === undefined || request.method === "GET") ? "pbf" : "json");
     params.set("where", request.where ?? "1=1");
-    params.set("outFields", normalizeOutFields(request.outFields));
+    applyOutFields(params, request);
     params.set("returnGeometry", String(request.returnGeometry ?? true));
     serializeQueryParams(params, request);
     appendQueryExtraParams(params, request);
@@ -84,7 +84,7 @@ export async function queryMapLayer(transport, request) {
     const params = new URLSearchParams();
     params.set("f", "json");
     params.set("where", request.where ?? "1=1");
-    params.set("outFields", normalizeOutFields(request.outFields));
+    applyOutFields(params, request);
     params.set("returnGeometry", String(request.returnGeometry ?? true));
     serializeQueryParams(params, request);
     appendQueryExtraParams(params, request);
@@ -348,6 +348,38 @@ function normalizeOutFields(outFields) {
     }
     return outFields;
 }
+/**
+ * Count-only and IDs-only queries must not send `outFields`. Some servers
+ * reject the combination. Flag values follow `parseExtraBoolean` in
+ * `grpc-adapter.ts`: boolean, non-zero numbers, and the strings
+ * `true` / `1` / `yes` (trimmed, case-insensitive).
+ */
+function querySuppressesOutFields(extraParams) {
+    return extraParamIsTrue(extraParams, "returnCountOnly") || extraParamIsTrue(extraParams, "returnIdsOnly");
+}
+function extraParamIsTrue(params, key) {
+    if (params === undefined) {
+        return false;
+    }
+    const value = params[key];
+    if (typeof value === "boolean") {
+        return value;
+    }
+    if (typeof value === "number") {
+        return value !== 0;
+    }
+    if (typeof value !== "string") {
+        return false;
+    }
+    const normalized = value.trim().toLowerCase();
+    return normalized === "true" || normalized === "1" || normalized === "yes";
+}
+function applyOutFields(params, request) {
+    if (querySuppressesOutFields(request.extraParams)) {
+        return;
+    }
+    params.set("outFields", normalizeOutFields(request.outFields));
+}
 function encodeFormValue(value) {
     if (typeof value === "string") {
         return value;
@@ -452,10 +484,14 @@ function appendQueryExtraParams(params, request) {
     if (!request.extraParams) {
         return;
     }
+    const suppressOutFields = querySuppressesOutFields(request.extraParams);
     for (const [key, value] of Object.entries(request.extraParams)) {
         if (request.outSr !== undefined && (key === "outSr" || key === "outSR")) {
             continue;
         }
+        if (suppressOutFields && key === "outFields") {
+            continue;
+        }
         params.set(key, String(value));
     }
 }

package/core/grpc-adapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"grpc-adapter.d.ts","sourceRoot":"","sources":["../../../src/core/grpc-adapter.ts"],"names":[],"mappings":"AACA,OAAO,EAKL,KAAK,WAAW,EAWhB,KAAK,qBAAqB,EAM3B,MAAM,+BAA+B,CAAC;AAGvC,OAAO,KAAK,EACV,kBAAkB,EAClB,mBAAmB,EACnB,YAAY,EAEZ,sBAAsB,EACtB,kBAAkB,EAElB,oBAAoB,EACrB,MAAM,YAAY,CAAC;AA6GpB;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,oBAAoB,6EA6IhE;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,qBAAqB,GAC9B,kBAAkB,GAAG,kBAAkB,GAAG,sBAAsB,GAAG,mBAAmB,CAkDxF;AA0UD;;;;GAIG;AACH,wBAAuB,gBAAgB,CACrC,MAAM,EAAE,aAAa,CAAC,WAAW,CAAC,GACjC,cAAc,CAAC,YAAY,EAAE,EAAE,IAAI,EAAE,SAAS,CAAC,CAiBjD;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,CAiBtD"}
+{"version":3,"file":"grpc-adapter.d.ts","sourceRoot":"","sources":["../../../src/core/grpc-adapter.ts"],"names":[],"mappings":"AACA,OAAO,EAKL,KAAK,WAAW,EAWhB,KAAK,qBAAqB,EAI3B,MAAM,+BAA+B,CAAC;AAGvC,OAAO,KAAK,EACV,kBAAkB,EAClB,mBAAmB,EACnB,YAAY,EAEZ,sBAAsB,EACtB,kBAAkB,EAElB,oBAAoB,EACrB,MAAM,YAAY,CAAC;AAmGpB;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,oBAAoB,6EA0IhE;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,qBAAqB,GAC9B,kBAAkB,GAAG,kBAAkB,GAAG,sBAAsB,GAAG,mBAAmB,CAkDxF;AAyRD;;;;GAIG;AACH,wBAAuB,gBAAgB,CACrC,MAAM,EAAE,aAAa,CAAC,WAAW,CAAC,GACjC,cAAc,CAAC,YAAY,EAAE,EAAE,IAAI,EAAE,SAAS,CAAC,CAsBjD;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,CAiBtD"}

package/core/grpc-adapter.js

@@ -1,6 +1,6 @@
 import { create } from "@bufbuild/protobuf";
-import { CoordinateSchema, CoordinateSequenceSchema, DistanceUnit, FieldType, GeometrySchema, GeometryType, MultiPointGeometrySchema, PointGeometrySchema, PolygonGeometrySchema, PolylineGeometrySchema, QueryFeaturesRequestSchema, SpatialFilterSchema, SpatialReferenceSchema, SpatialRelationship, StatisticDefinitionSchema, StatisticType, } from "../gen/geospatial/v1/index.js";
-import { HonuaGrpcError } from "./errors.js";
+import { CoordinateSchema, CoordinateSequenceSchema, DistanceUnit, FieldType, GeometrySchema, GeometryType, MultiPointGeometrySchema, PointGeometrySchema, PolygonGeometrySchema, PolylineGeometrySchema, QueryFeaturesRequestSchema, SpatialFilterSchema, SpatialReferenceSchema, SpatialRelationship, } from "../gen/geospatial/v1/index.js";
+import { HonuaCapabilityNotSupportedError, HonuaGrpcError } from "./errors.js";
 import { geometryInputSpatialReference } from "./geometry-input-sr.js";
 /**
  * Maps proto FieldType enum values to Esri-style field type strings
@@ -71,15 +71,6 @@ const ESRI_TO_PROTO_DISTANCE_UNIT_MAP = {
     miles: DistanceUnit.MILES,
     mi: DistanceUnit.MILES,
 };
-const STATISTIC_TYPE_MAP = {
-    count: StatisticType.COUNT,
-    sum: StatisticType.SUM,
-    min: StatisticType.MIN,
-    max: StatisticType.MAX,
-    avg: StatisticType.AVG,
-    stddev: StatisticType.STDDEV,
-    var: StatisticType.VAR,
-};
 const MAX_SAFE_INTEGER_BIGINT = BigInt(Number.MAX_SAFE_INTEGER);
 const MIN_SAFE_INTEGER_BIGINT = BigInt(Number.MIN_SAFE_INTEGER);
 const MIN_PROTO_INT64 = -(1n << 63n);
@@ -105,6 +96,12 @@ function toProtoPageInt64(field, value) {
  * Converts a SDK QueryFeaturesRequest into a proto QueryFeaturesRequest message.
  */
 export function toProtoQueryRequest(request) {
+    if (request.outStatistics !== undefined ||
+        request.groupByFieldsForStatistics !== undefined ||
+        request.extraParams?.outStatistics !== undefined ||
+        request.extraParams?.groupByFieldsForStatistics !== undefined) {
+        throw new HonuaCapabilityNotSupportedError("queryAggregate", "grpc", `${request.serviceId}/${request.layerId}`);
+    }
     const msg = create(QueryFeaturesRequestSchema);
     msg.serviceId = request.serviceId;
     msg.layerId = request.layerId;
@@ -148,15 +145,6 @@ export function toProtoQueryRequest(request) {
     if (request.returnDistinctValues !== undefined) {
         msg.returnDistinct = request.returnDistinctValues;
     }
-    if (request.groupByFieldsForStatistics !== undefined) {
-        msg.groupBy = request.groupByFieldsForStatistics
-            .split(",")
-            .map((field) => field.trim())
-            .filter(Boolean);
-    }
-    if (request.outStatistics !== undefined) {
-        msg.outStatistics = toProtoStatistics(request.outStatistics);
-    }
     if (request.geometry !== undefined) {
         const filter = create(SpatialFilterSchema);
         const { geometry, spatialReference } = toProtoGeometry(request.geometry);
@@ -267,7 +255,7 @@ export function fromProtoQueryResponse(response) {
         geometryType: GEOMETRY_TYPE_MAP[response.geometryType] ?? "esriGeometryPoint",
         spatialReference: response.spatialReference ? convertSpatialReference(response.spatialReference) : undefined,
         fields: response.fields.map(convertField),
-        features: response.features.map(convertFeature),
+        features: response.features.map((feature) => convertFeature(feature, response.objectIdFieldName)),
         exceededTransferLimit: response.exceededTransferLimit || undefined,
     };
 }
@@ -320,45 +308,6 @@ function parseExtraString(params, key) {
     }
     return String(value);
 }
-function toProtoStatistics(value) {
-    const raw = typeof value === "string" ? parseStatisticsString(value) : value;
-    return raw.map((item, index) => {
-        const statisticTypeValue = item.statisticType;
-        if (typeof statisticTypeValue !== "string") {
-            throw new Error(`Invalid outStatistics[${index}].statisticType`);
-        }
-        const statisticType = STATISTIC_TYPE_MAP[statisticTypeValue.toLowerCase()];
-        if (!statisticType) {
-            throw new Error(`Unsupported statisticType for gRPC transport: ${statisticTypeValue}`);
-        }
-        const onStatisticFieldValue = item.onStatisticField;
-        if (typeof onStatisticFieldValue !== "string" || onStatisticFieldValue.trim().length === 0) {
-            throw new Error(`Invalid outStatistics[${index}].onStatisticField`);
-        }
-        const outStatisticFieldNameValue = item.outStatisticFieldName;
-        const outStatisticFieldName = typeof outStatisticFieldNameValue === "string" && outStatisticFieldNameValue.trim().length > 0
-            ? outStatisticFieldNameValue.trim()
-            : `${statisticTypeValue}_${onStatisticFieldValue}`;
-        const definition = create(StatisticDefinitionSchema);
-        definition.onStatisticField = onStatisticFieldValue;
-        definition.statisticType = statisticType;
-        definition.outStatisticFieldName = outStatisticFieldName;
-        return definition;
-    });
-}
-function parseStatisticsString(value) {
-    let parsed;
-    try {
-        parsed = JSON.parse(value);
-    }
-    catch {
-        throw new Error("Invalid outStatistics JSON for gRPC transport.");
-    }
-    if (!Array.isArray(parsed)) {
-        throw new Error("outStatistics JSON must be an array for gRPC transport.");
-    }
-    return parsed;
-}
 function toProtoGeometry(geometryValue) {
     const source = parseGeometryValue(geometryValue);
     const geometry = create(GeometrySchema);
@@ -557,12 +506,17 @@ function isPolygon(value) {
  * existing queryFeaturesStream yield type.
  */
 export async function* streamProtoPages(stream) {
+    // Metadata is populated on the first page only; later pages reuse it.
+    let objectIdFieldName = "";
     try {
         for await (const page of stream) {
+            if (page.objectIdFieldName) {
+                objectIdFieldName = page.objectIdFieldName;
+            }
             if (page.features.length === 0 && page.isLastPage) {
                 break;
             }
-            const features = page.features.map(convertFeature);
+            const features = page.features.map((feature) => convertFeature(feature, objectIdFieldName));
             if (features.length > 0) {
                 yield features;
             }
@@ -614,17 +568,32 @@ function convertField(field) {
         nullable: field.nullable,
     };
 }
-function convertFeature(feature) {
+/**
+ * geospatial.v1 carries the object ID in `Feature.id` and the server no
+ * longer repeats it in `Feature.attributes` (honua-server#5330), so it is
+ * restored under the declared `objectIdFieldName` to match `f=json` output.
+ * An `id` of 0 means no object ID (for example distinct projections), and an
+ * attribute already present under that name in any casing (a legacy server
+ * repeating it, or a differing custom public ID) is kept as sent.
+ */
+function convertFeature(feature, objectIdFieldName) {
     const attributes = {};
     for (const [key, attrValue] of Object.entries(feature.attributes)) {
         attributes[key] = convertAttributeValue(attrValue);
     }
+    if (objectIdFieldName.length > 0 && feature.id !== 0n && !hasAttributeIgnoreCase(attributes, objectIdFieldName)) {
+        attributes[objectIdFieldName] = toSafeNumberOrString(feature.id);
+    }
     const result = { attributes };
     if (feature.geometry) {
         result.geometry = convertGeometry(feature.geometry);
     }
     return result;
 }
+function hasAttributeIgnoreCase(attributes, name) {
+    const lowered = name.toLowerCase();
+    return Object.keys(attributes).some((key) => key.toLowerCase() === lowered);
+}
 function convertAttributeValue(attr) {
     switch (attr.value.case) {
         case "stringValue":

package/core/odata.d.ts

@@ -311,6 +311,7 @@ export declare class HonuaOdataEntitySet {
     raw(method: string, path: string, init?: RequestInit): Promise<Response>;
     private entitySetPath;
     private fetchMetadata;
+    private checkNextLink;
     private followNextLink;
     /**
      * Wrap `HonuaClient.pipelineRequestJson` with OData-shaped query
@@ -401,5 +402,7 @@ export declare function buildOdataSpatialFilter(spatialFilter: {
  * text from the same geometry value.
  */
 export declare function geometryToWkt(geometry: Record<string, unknown>, geometryType: string): string;
+/** Group clockwise Esri exteriors and assign counter-clockwise holes by containment, independent of order. */
+export declare function groupEsriPolygonRings(rings: unknown[][][]): unknown[][][][];
 export {};
 //# sourceMappingURL=odata.d.ts.map

package/core/odata.d.ts.map

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