@honua/react 0.1.2-beta.0 → 0.1.7-beta.0

package/query-planner/odata-v1.js

@@ -0,0 +1,202 @@
+import { compileQueryFilterToOData } from "../contract/query-filter.js";
+import { buildOdataSpatialFilter, rewriteWhereToOdataFilter } from "../core/odata.js";
+import { canonicalFilterParts, refuseCanonicalFilter } from "./canonical-filter.js";
+import { HonuaQueryPlanningError } from "./types.js";
+/** Compile canonical query IR to a deterministic OData v4 entity-set request. */
+export function compileOdataQuery(source, query) {
+    if (source.protocol !== "odata") {
+        throw new HonuaQueryPlanningError("unsupported-compiler", `odata-v4-query-v1 does not compile protocol "${source.protocol}"`);
+    }
+    if (!source.entitySet) {
+        throw new HonuaQueryPlanningError("invalid-query", `Source "${source.id}" requires locator.entitySet for OData planning`);
+    }
+    if (query.aggregation) {
+        throw new HonuaQueryPlanningError("unsupported-query", "Canonical OData aggregation is not portable; use the typed $apply escape hatch");
+    }
+    if (query.outSr !== undefined) {
+        throw new HonuaQueryPlanningError("unsupported-query", "OData v4 has no portable output-CRS query option; omit outSr or use the typed OData escape hatch");
+    }
+    const ctx = {
+        protocol: source.protocol,
+        sourceId: source.id,
+        ...(source.geometryProperty !== undefined ? { geometryProperty: source.geometryProperty } : {}),
+    };
+    const parts = canonicalFilterParts(query, ctx);
+    if (parts.protocolTime) {
+        refuseCanonicalFilter("Query.temporalFilter without a field", "OData v4", "the protocol has no time parameter; name the temporal field so the predicate stays exact");
+    }
+    const filterParts = [];
+    try {
+        if (query.where) {
+            assertSupportedWhere(query.where.expression);
+            const rewritten = rewriteWhereToOdataFilter(query.where.expression);
+            if (rewritten)
+                filterParts.push(rewritten);
+        }
+        if (parts.expression) {
+            filterParts.push(compileQueryFilterToOData(parts.expression, ctx, (node) => {
+                if (!source.geometryProperty) {
+                    throw new Error("descriptor schema does not identify the OData geometry column");
+                }
+                if (node.operator !== "intersects" && node.operator !== "bbox-intersects") {
+                    throw new Error(`OData v4 has no standard ${node.operator} geo function`);
+                }
+                return buildOdataSpatialFilter({
+                    geometry: node.geometry.geometry,
+                    geometryType: node.geometry.geometryType,
+                    spatialRel: "esriSpatialRelIntersects",
+                }, { geometryColumn: source.geometryProperty });
+            }));
+        }
+        if (query.spatialFilter) {
+            if (!source.geometryProperty) {
+                throw new Error("descriptor schema does not identify the OData geometry column");
+            }
+            filterParts.push(buildOdataSpatialFilter({
+                geometry: query.spatialFilter.geometry,
+                geometryType: query.spatialFilter.geometryType,
+                ...(query.spatialFilter.spatialRel ? { spatialRel: query.spatialFilter.spatialRel } : {}),
+            }, { geometryColumn: source.geometryProperty }));
+        }
+    }
+    catch (error) {
+        throw new HonuaQueryPlanningError("unsupported-query", `OData query cannot preserve the requested predicate: ${error instanceof Error ? error.message : String(error)}`);
+    }
+    let projection;
+    if (query.outFields && query.outFields.length > 0) {
+        projection = splitProjection(query.outFields, query.returnGeometry === false ? source.geometryProperty : undefined);
+        if (query.returnGeometry !== false &&
+            source.geometryProperty &&
+            !projection.select.includes(source.geometryProperty)) {
+            projection = { ...projection, select: [...projection.select, source.geometryProperty] };
+        }
+    }
+    else if (query.returnGeometry === false) {
+        throw new HonuaQueryPlanningError("unsupported-query", "Metadata-free OData planning requires explicit outFields to prove returnGeometry=false on the wire");
+    }
+    return {
+        compiler: "odata-v4-query-v1",
+        entitySet: source.entitySet,
+        ...(filterParts.length > 0 ? { filter: filterParts.join(" and ") } : {}),
+        ...(projection && projection.select.length > 0 ? { select: projection.select } : {}),
+        ...(projection && projection.expand.length > 0 ? { expand: projection.expand } : {}),
+        ...(query.orderBy && query.orderBy.length > 0
+            ? { orderBy: query.orderBy.map((sort) => `${sort.field}${sort.direction === "desc" ? " desc" : ""}`) }
+            : {}),
+        ...(query.pagination?.offset !== undefined ? { skip: query.pagination.offset } : {}),
+        ...(query.pagination?.limit !== undefined ? { top: query.pagination.limit } : {}),
+    };
+}
+/**
+ * The deterministic compiler hook installed on the first-party OData
+ * ProtocolModule. Planner dispatch and module consumers call this exact
+ * object, while runtime authority remains outside the compiler.
+ */
+export const odataProtocolQueryCompiler = Object.freeze({
+    kind: "odata",
+    compile(input) {
+        return bindOdataProtocolQueryOperation(compileOdataQuery(input.source, input.query), input.operation);
+    },
+});
+/** Bind a legacy wire request to the exact operation authorized to execute it. */
+export function bindOdataProtocolQueryOperation(compiled, operation) {
+    let top = compiled.top;
+    if (operation === "queryAll" && top !== undefined) {
+        if (!Number.isSafeInteger(top) || top < 0 || top >= Number.MAX_SAFE_INTEGER) {
+            throw new HonuaQueryPlanningError("invalid-query", "OData queryAll pagination.limit must leave room for one lookahead row");
+        }
+        top += 1;
+    }
+    return Object.freeze({
+        compiler: "odata-v4-protocol-query-v1",
+        operation,
+        entitySet: compiled.entitySet,
+        ...(compiled.filter !== undefined ? { filter: compiled.filter } : {}),
+        ...(compiled.select !== undefined ? { select: compiled.select } : {}),
+        ...(compiled.expand !== undefined ? { expand: compiled.expand } : {}),
+        ...(compiled.orderBy !== undefined ? { orderBy: compiled.orderBy } : {}),
+        ...(compiled.skip !== undefined ? { skip: compiled.skip } : {}),
+        ...(top !== undefined ? { top } : {}),
+    });
+}
+function assertSupportedWhere(where) {
+    const code = outsideQuotedStrings(where);
+    if (code === undefined)
+        throw new Error("unterminated OData string literal");
+    const unsupported = [
+        { expression: /\bLIKE\b/i, name: "LIKE" },
+        { expression: /\bBETWEEN\b/i, name: "BETWEEN" },
+        { expression: /==/, name: "==" },
+        { expression: /!=/, name: "!=" },
+        { expression: /;/, name: ";" },
+    ];
+    for (const candidate of unsupported) {
+        if (candidate.expression.test(code)) {
+            throw new Error(`operator ${candidate.name} is not translated by the OData compiler`);
+        }
+    }
+}
+/** Return only non-literal spans, or undefined for an unterminated literal. */
+function outsideQuotedStrings(input) {
+    let output = "";
+    let quoted = false;
+    for (let index = 0; index < input.length; index += 1) {
+        const character = input[index];
+        if (character !== "'") {
+            if (!quoted)
+                output += character;
+            continue;
+        }
+        if (quoted && input[index + 1] === "'") {
+            index += 1;
+            continue;
+        }
+        quoted = !quoted;
+    }
+    return quoted ? undefined : output;
+}
+function splitProjection(fields, excludedGeometry) {
+    const root = { select: [], children: new Map() };
+    for (const field of fields) {
+        if (excludedGeometry && field === excludedGeometry)
+            continue;
+        const segments = field.split(".").filter(Boolean);
+        if (segments.length === 0)
+            continue;
+        let cursor = root;
+        for (let index = 0; index < segments.length - 1; index += 1) {
+            const segment = segments[index];
+            if (!segment)
+                continue;
+            let child = cursor.children.get(segment);
+            if (!child) {
+                child = { select: [], children: new Map() };
+                cursor.children.set(segment, child);
+            }
+            cursor = child;
+        }
+        const leaf = segments.at(-1);
+        if (leaf)
+            cursor.select.push(leaf);
+    }
+    const serialize = (node) => {
+        const parts = [];
+        if (node.select.length > 0)
+            parts.push(`$select=${node.select.join(",")}`);
+        if (node.children.size > 0) {
+            const children = [...node.children.entries()].map(([name, child]) => {
+                const inner = serialize(child);
+                return inner ? `${name}(${inner})` : name;
+            });
+            parts.push(`$expand=${children.join(",")}`);
+        }
+        return parts.join(";");
+    };
+    return {
+        select: root.select,
+        expand: [...root.children.entries()].map(([name, child]) => {
+            const inner = serialize(child);
+            return inner ? `${name}(${inner})` : name;
+        }),
+    };
+}

package/query-planner/odata.d.ts

@@ -2,9 +2,6 @@ import type { ExecutableCrsBinding, SourceSchemaV2 } from "../contract/schema.js
 import { type SemanticCompilationResult } from "./semantic-compiler.js";
 import { type SemanticCompilerFieldMapping } from "./semantic-literals.js";
 import type { SemanticQuery, SourceSpatiality } from "./semantic-types.js";
-import type { CanonicalQuery, OdataCompiledQueryV1, QueryIrSourceIdentity } from "./types.js";
-/** Compile canonical query IR to a deterministic OData v4 entity-set request. */
-export declare function compileOdataQuery(source: QueryIrSourceIdentity, query: CanonicalQuery): OdataCompiledQueryV1;
 export type SemanticOdataSpatialFunction = "geo.intersects" | "geo.distance";
 /** Static, credential-free OData endpoint evidence used by the semantic compiler. */
 export interface SemanticOdataSourceIdentity {

package/query-planner/odata.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"odata.d.ts","sourceRoot":"","sources":["../../../src/query-planner/odata.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAGV,oBAAoB,EAOpB,cAAc,EACf,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EAEL,KAAK,yBAAyB,EAO/B,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACL,KAAK,4BAA4B,EAWlC,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAe,aAAa,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACxF,OAAO,KAAK,EAAE,cAAc,EAAE,oBAAoB,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAG9F,iFAAiF;AACjF,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,qBAAqB,EAAE,KAAK,EAAE,cAAc,GAAG,oBAAoB,CAoF5G;AAmFD,MAAM,MAAM,4BAA4B,GAAG,gBAAgB,GAAG,cAAc,CAAC;AAE7E,qFAAqF;AACrF,MAAM,WAAW,2BAA2B;IAC1C,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC;IAChC,6EAA6E;IAC7E,QAAQ,CAAC,yBAAyB,CAAC,EAAE,SAAS,4BAA4B,EAAE,CAAC;CAC9E;AAED,MAAM,WAAW,2BAA2B,CAC1C,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACjC,WAAW,SAAS,gBAAgB,GAAG,gBAAgB;IAEvD,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;IAC7D,QAAQ,CAAC,MAAM,EAAE,cAAc,CAAC;IAChC,QAAQ,CAAC,MAAM,EAAE,2BAA2B,CAAC;CAC9C;AAED,MAAM,WAAW,2BAA2B;IAC1C,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,WAAW,EAAE,WAAW,GAAG,UAAU,CAAC;IAC/C,QAAQ,CAAC,GAAG,EAAE,oBAAoB,CAAC;IACnC,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC;CACvB;AAED,6DAA6D;AAC7D,MAAM,WAAW,4BAA4B;IAC3C,QAAQ,CAAC,QAAQ,EAAE,4BAA4B,CAAC;IAChD,QAAQ,CAAC,OAAO,EAAE,WAAW,CAAC;IAC9B,QAAQ,CAAC,iBAAiB,EAAE,cAAc,CAAC,aAAa,CAAC,CAAC;IAC1D,QAAQ,CAAC,gBAAgB,EAAE,UAAU,MAAM,EAAE,CAAC;IAC9C,QAAQ,CAAC,kBAAkB,EAAE,UAAU,MAAM,EAAE,CAAC;IAChD,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,MAAM,EAAE,SAAS,MAAM,EAAE,CAAC;IACnC,QAAQ,CAAC,OAAO,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACrC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,cAAc,CAAC,EAAE,2BAA2B,CAAC;IACtD,QAAQ,CAAC,aAAa,EAAE,SAAS,4BAA4B,EAAE,CAAC;IAChE,QAAQ,CAAC,gBAAgB,EAAE,OAAO,CAAC;CACpC;AA0BD,+EAA+E;AAC/E,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,WAAW,SAAS,gBAAgB,EACrF,OAAO,EAAE,2BAA2B,CAAC,OAAO,EAAE,WAAW,CAAC,GACzD,yBAAyB,CAAC,4BAA4B,CAAC,CA4CzD"}
+{"version":3,"file":"odata.d.ts","sourceRoot":"","sources":["../../../src/query-planner/odata.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAGV,oBAAoB,EAOpB,cAAc,EACf,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAEL,KAAK,yBAAyB,EAO/B,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACL,KAAK,4BAA4B,EAWlC,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAe,aAAa,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAGxF,MAAM,MAAM,4BAA4B,GAAG,gBAAgB,GAAG,cAAc,CAAC;AAE7E,qFAAqF;AACrF,MAAM,WAAW,2BAA2B;IAC1C,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC;IAChC,6EAA6E;IAC7E,QAAQ,CAAC,yBAAyB,CAAC,EAAE,SAAS,4BAA4B,EAAE,CAAC;CAC9E;AAED,MAAM,WAAW,2BAA2B,CAC1C,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACjC,WAAW,SAAS,gBAAgB,GAAG,gBAAgB;IAEvD,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;IAC7D,QAAQ,CAAC,MAAM,EAAE,cAAc,CAAC;IAChC,QAAQ,CAAC,MAAM,EAAE,2BAA2B,CAAC;CAC9C;AAED,MAAM,WAAW,2BAA2B;IAC1C,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,WAAW,EAAE,WAAW,GAAG,UAAU,CAAC;IAC/C,QAAQ,CAAC,GAAG,EAAE,oBAAoB,CAAC;IACnC,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC;CACvB;AAED,6DAA6D;AAC7D,MAAM,WAAW,4BAA4B;IAC3C,QAAQ,CAAC,QAAQ,EAAE,4BAA4B,CAAC;IAChD,QAAQ,CAAC,OAAO,EAAE,WAAW,CAAC;IAC9B,QAAQ,CAAC,iBAAiB,EAAE,cAAc,CAAC,aAAa,CAAC,CAAC;IAC1D,QAAQ,CAAC,gBAAgB,EAAE,UAAU,MAAM,EAAE,CAAC;IAC9C,QAAQ,CAAC,kBAAkB,EAAE,UAAU,MAAM,EAAE,CAAC;IAChD,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,MAAM,EAAE,SAAS,MAAM,EAAE,CAAC;IACnC,QAAQ,CAAC,OAAO,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACrC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,cAAc,CAAC,EAAE,2BAA2B,CAAC;IACtD,QAAQ,CAAC,aAAa,EAAE,SAAS,4BAA4B,EAAE,CAAC;IAChE,QAAQ,CAAC,gBAAgB,EAAE,OAAO,CAAC;CACpC;AA0BD,+EAA+E;AAC/E,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,WAAW,SAAS,gBAAgB,EACrF,OAAO,EAAE,2BAA2B,CAAC,OAAO,EAAE,WAAW,CAAC,GACzD,yBAAyB,CAAC,4BAA4B,CAAC,CA4CzD"}

package/query-planner/odata.js

@@ -1,151 +1,8 @@
 import { validateExecutableCrsBinding } from "../contract/schema.js";
-import { buildOdataSpatialFilter, rewriteWhereToOdataFilter } from "../core/odata.js";
 import { hashSemanticQuery } from "./semantic-canonical.js";
 import { prepareSemanticCompilerQuery, runSemanticCompiler, sameCrsDefinition, sameExecutableCrs, semanticSchemaField, semanticUnsupported, } from "./semantic-compiler.js";
 import { exactDecimalText, finiteDecimalNumber, odataPropertyPath, quotedSemanticString, recordSemanticFieldMapping, semanticRequestFingerprint, sortSemanticFieldMappings, verifiedSemanticNativeText, verifiedSemanticSourceText, verifiedSemanticSourceVersion, } from "./semantic-literals.js";
 import { HonuaQueryPlanningError } from "./types.js";
-/** Compile canonical query IR to a deterministic OData v4 entity-set request. */
-export function compileOdataQuery(source, query) {
-    if (source.protocol !== "odata") {
-        throw new HonuaQueryPlanningError("unsupported-compiler", `odata-v4-query-v1 does not compile protocol "${source.protocol}"`);
-    }
-    if (!source.entitySet) {
-        throw new HonuaQueryPlanningError("invalid-query", `Source "${source.id}" requires locator.entitySet for OData planning`);
-    }
-    if (query.aggregation) {
-        throw new HonuaQueryPlanningError("unsupported-query", "Canonical OData aggregation is not portable; use the typed $apply escape hatch");
-    }
-    if (query.outSr !== undefined) {
-        throw new HonuaQueryPlanningError("unsupported-query", "OData v4 has no portable output-CRS query option; omit outSr or use the typed OData escape hatch");
-    }
-    const filterParts = [];
-    try {
-        if (query.where) {
-            assertSupportedWhere(query.where.expression);
-            const rewritten = rewriteWhereToOdataFilter(query.where.expression);
-            if (rewritten)
-                filterParts.push(rewritten);
-        }
-        if (query.spatialFilter) {
-            if (!source.geometryProperty) {
-                throw new Error("descriptor schema does not identify the OData geometry column");
-            }
-            filterParts.push(buildOdataSpatialFilter({
-                geometry: query.spatialFilter.geometry,
-                geometryType: query.spatialFilter.geometryType,
-                ...(query.spatialFilter.spatialRel ? { spatialRel: query.spatialFilter.spatialRel } : {}),
-            }, { geometryColumn: source.geometryProperty }));
-        }
-    }
-    catch (error) {
-        throw new HonuaQueryPlanningError("unsupported-query", `OData query cannot preserve the requested predicate: ${error instanceof Error ? error.message : String(error)}`);
-    }
-    let projection;
-    if (query.outFields && query.outFields.length > 0) {
-        projection = splitProjection(query.outFields, query.returnGeometry === false ? source.geometryProperty : undefined);
-        if (query.returnGeometry !== false &&
-            source.geometryProperty &&
-            !projection.select.includes(source.geometryProperty)) {
-            projection = { ...projection, select: [...projection.select, source.geometryProperty] };
-        }
-    }
-    else if (query.returnGeometry === false) {
-        throw new HonuaQueryPlanningError("unsupported-query", "Metadata-free OData planning requires explicit outFields to prove returnGeometry=false on the wire");
-    }
-    return {
-        compiler: "odata-v4-query-v1",
-        entitySet: source.entitySet,
-        ...(filterParts.length > 0 ? { filter: filterParts.join(" and ") } : {}),
-        ...(projection && projection.select.length > 0 ? { select: projection.select } : {}),
-        ...(projection && projection.expand.length > 0 ? { expand: projection.expand } : {}),
-        ...(query.orderBy && query.orderBy.length > 0
-            ? { orderBy: query.orderBy.map((sort) => `${sort.field}${sort.direction === "desc" ? " desc" : ""}`) }
-            : {}),
-        ...(query.pagination?.offset !== undefined ? { skip: query.pagination.offset } : {}),
-        ...(query.pagination?.limit !== undefined ? { top: query.pagination.limit } : {}),
-    };
-}
-function assertSupportedWhere(where) {
-    const code = outsideQuotedStrings(where);
-    if (code === undefined)
-        throw new Error("unterminated OData string literal");
-    const unsupported = [
-        { expression: /\bLIKE\b/i, name: "LIKE" },
-        { expression: /\bBETWEEN\b/i, name: "BETWEEN" },
-        { expression: /==/, name: "==" },
-        { expression: /!=/, name: "!=" },
-        { expression: /;/, name: ";" },
-    ];
-    for (const candidate of unsupported) {
-        if (candidate.expression.test(code)) {
-            throw new Error(`operator ${candidate.name} is not translated by the OData compiler`);
-        }
-    }
-}
-/** Return only non-literal spans, or undefined for an unterminated literal. */
-function outsideQuotedStrings(input) {
-    let output = "";
-    let quoted = false;
-    for (let index = 0; index < input.length; index += 1) {
-        const character = input[index];
-        if (character !== "'") {
-            if (!quoted)
-                output += character;
-            continue;
-        }
-        if (quoted && input[index + 1] === "'") {
-            index += 1;
-            continue;
-        }
-        quoted = !quoted;
-    }
-    return quoted ? undefined : output;
-}
-function splitProjection(fields, excludedGeometry) {
-    const root = { select: [], children: new Map() };
-    for (const field of fields) {
-        if (excludedGeometry && field === excludedGeometry)
-            continue;
-        const segments = field.split(".").filter(Boolean);
-        if (segments.length === 0)
-            continue;
-        let cursor = root;
-        for (let index = 0; index < segments.length - 1; index += 1) {
-            const segment = segments[index];
-            if (!segment)
-                continue;
-            let child = cursor.children.get(segment);
-            if (!child) {
-                child = { select: [], children: new Map() };
-                cursor.children.set(segment, child);
-            }
-            cursor = child;
-        }
-        const leaf = segments.at(-1);
-        if (leaf)
-            cursor.select.push(leaf);
-    }
-    const serialize = (node) => {
-        const parts = [];
-        if (node.select.length > 0)
-            parts.push(`$select=${node.select.join(",")}`);
-        if (node.children.size > 0) {
-            const children = [...node.children.entries()].map(([name, child]) => {
-                const inner = serialize(child);
-                return inner ? `${name}(${inner})` : name;
-            });
-            parts.push(`$expand=${children.join(",")}`);
-        }
-        return parts.join(";");
-    };
-    return {
-        select: root.select,
-        expand: [...root.children.entries()].map(([name, child]) => {
-            const inner = serialize(child);
-            return inner ? `${name}(${inner})` : name;
-        }),
-    };
-}
 const ODATA_COMPARISON_OPERATOR = {
     eq: "eq",
     ne: "ne",

package/query-planner/ogc-features.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ogc-features.d.ts","sourceRoot":"","sources":["../../../src/query-planner/ogc-features.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAA2B,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAqB3G,OAAO,EAEL,KAAK,yBAAyB,EAI/B,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAGV,aAAa,EACb,gBAAgB,EAEjB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,cAAc,EAAE,6BAA6B,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAGvG,MAAM,MAAM,kBAAkB,GAAG,WAAW,GAAG,WAAW,CAAC;AAE3D,6EAA6E;AAC7E,MAAM,WAAW,uCAAuC;IACtD,+EAA+E;IAC/E,QAAQ,CAAC,UAAU,EAAE,SAAS,MAAM,EAAE,CAAC;IACvC,iFAAiF;IACjF,QAAQ,CAAC,kBAAkB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAChD,2EAA2E;IAC3E,QAAQ,CAAC,kBAAkB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;CACjD;AAED,MAAM,WAAW,oCAAoC;IACnD,QAAQ,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAAC;CACxC;AAED,MAAM,WAAW,oCAAoC,CACnD,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACjC,WAAW,SAAS,gBAAgB,GAAG,gBAAgB;IAEvD,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC,OAAO,EAAE,cAAc,EAAE,WAAW,CAAC,CAAC;IACpE,QAAQ,CAAC,MAAM,EAAE,cAAc,CAAC;IAChC,QAAQ,CAAC,MAAM,EAAE,oCAAoC,CAAC;IACtD,QAAQ,CAAC,WAAW,EAAE,uCAAuC,CAAC;IAC9D,yFAAyF;IACzF,QAAQ,CAAC,uBAAuB,CAAC,EAAE,kBAAkB,CAAC;IACtD,2GAA2G;IAC3G,QAAQ,CAAC,eAAe,CAAC,EAAE,oBAAoB,CAAC;CACjD;AAED,yEAAyE;AACzE,MAAM,WAAW,qCAAqC;IACpD,QAAQ,CAAC,QAAQ,EAAE,oCAAoC,CAAC;IACxD,QAAQ,CAAC,OAAO,CAAC,EAAE,kBAAkB,CAAC;IACtC,QAAQ,CAAC,iBAAiB,EAAE,cAAc,CAAC,aAAa,CAAC,CAAC;IAC1D,QAAQ,CAAC,gBAAgB,EAAE,UAAU,MAAM,EAAE,CAAC;IAC9C,QAAQ,CAAC,qBAAqB,EAAE,UAAU,MAAM,EAAE,CAAC;IACnD,QAAQ,CAAC,kBAAkB,EAAE,UAAU,MAAM,EAAE,CAAC;IAChD,QAAQ,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAAC;IACvC,gFAAgF;IAChF,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,UAAU,CAAC,EAAE,kBAAkB,CAAC;IACzC,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,gBAAgB,EAAE,OAAO,CAAC;CACpC;AAuED;;;;GAIG;AACH,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,qBAAqB,EAC7B,KAAK,EAAE,cAAc,GACpB,6BAA6B,CAuC/B;AAED,wFAAwF;AACxF,wBAAgB,kCAAkC,CAAC,OAAO,EAAE,WAAW,SAAS,gBAAgB,EAC9F,OAAO,EAAE,oCAAoC,CAAC,OAAO,EAAE,WAAW,CAAC,GAClE,yBAAyB,CAAC,qCAAqC,CAAC,CAiDlE"}
+{"version":3,"file":"ogc-features.d.ts","sourceRoot":"","sources":["../../../src/query-planner/ogc-features.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,oBAAoB,EAA2B,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAuB3G,OAAO,EAEL,KAAK,yBAAyB,EAI/B,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAGV,aAAa,EACb,gBAAgB,EAEjB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,cAAc,EAAE,6BAA6B,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAGvG,MAAM,MAAM,kBAAkB,GAAG,WAAW,GAAG,WAAW,CAAC;AAE3D,6EAA6E;AAC7E,MAAM,WAAW,uCAAuC;IACtD,+EAA+E;IAC/E,QAAQ,CAAC,UAAU,EAAE,SAAS,MAAM,EAAE,CAAC;IACvC,iFAAiF;IACjF,QAAQ,CAAC,kBAAkB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAChD,2EAA2E;IAC3E,QAAQ,CAAC,kBAAkB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;CACjD;AAED,MAAM,WAAW,oCAAoC;IACnD,QAAQ,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAAC;CACxC;AAED,MAAM,WAAW,oCAAoC,CACnD,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACjC,WAAW,SAAS,gBAAgB,GAAG,gBAAgB;IAEvD,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC,OAAO,EAAE,cAAc,EAAE,WAAW,CAAC,CAAC;IACpE,QAAQ,CAAC,MAAM,EAAE,cAAc,CAAC;IAChC,QAAQ,CAAC,MAAM,EAAE,oCAAoC,CAAC;IACtD,QAAQ,CAAC,WAAW,EAAE,uCAAuC,CAAC;IAC9D,yFAAyF;IACzF,QAAQ,CAAC,uBAAuB,CAAC,EAAE,kBAAkB,CAAC;IACtD,2GAA2G;IAC3G,QAAQ,CAAC,eAAe,CAAC,EAAE,oBAAoB,CAAC;CACjD;AAED,yEAAyE;AACzE,MAAM,WAAW,qCAAqC;IACpD,QAAQ,CAAC,QAAQ,EAAE,oCAAoC,CAAC;IACxD,QAAQ,CAAC,OAAO,CAAC,EAAE,kBAAkB,CAAC;IACtC,QAAQ,CAAC,iBAAiB,EAAE,cAAc,CAAC,aAAa,CAAC,CAAC;IAC1D,QAAQ,CAAC,gBAAgB,EAAE,UAAU,MAAM,EAAE,CAAC;IAC9C,QAAQ,CAAC,qBAAqB,EAAE,UAAU,MAAM,EAAE,CAAC;IACnD,QAAQ,CAAC,kBAAkB,EAAE,UAAU,MAAM,EAAE,CAAC;IAChD,QAAQ,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAAC;IACvC,gFAAgF;IAChF,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,UAAU,CAAC,EAAE,kBAAkB,CAAC;IACzC,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,gBAAgB,EAAE,OAAO,CAAC;CACpC;AAuED;;;;GAIG;AACH,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,qBAAqB,EAC7B,KAAK,EAAE,cAAc,GACpB,6BAA6B,CA4D/B;AAED,wFAAwF;AACxF,wBAAgB,kCAAkC,CAAC,OAAO,EAAE,WAAW,SAAS,gBAAgB,EAC9F,OAAO,EAAE,oCAAoC,CAAC,OAAO,EAAE,WAAW,CAAC,GAClE,yBAAyB,CAAC,qCAAqC,CAAC,CAiDlE"}

package/query-planner/ogc-features.js

@@ -1,3 +1,6 @@
+import { compileQueryFilterToCql2Text, compileTemporalFilterToOgcDatetime, } from "../contract/query-filter.js";
+import { geometryToWkt as esriGeometryToWkt } from "../core/odata.js";
+import { canonicalFilterParts } from "./canonical-filter.js";
 import { canonicalStringify, toJsonValue } from "./canonical.js";
 import { bboxInDefinitionOrder, compiledRequestFingerprint, compilerEvidenceFingerprint, compilerField, cql2FieldName, cql2Identifier, cql2StringLiteral, geometryInDefinitionOrder, geometryToWkt, hasConformanceClass, normalizeConformanceUris, normalizeIdentifierUris, ogcAxisPlan, ogcCrsUri, ogcNumber, sharedFilterCrs, } from "./ogc-compiler.js";
 import { hashSemanticQuery } from "./semantic-canonical.js";
@@ -66,10 +69,29 @@ export function compileOgcApiFeaturesQuery(source, query) {
     if (query.returnGeometry === false) {
         throw new HonuaQueryPlanningError("unsupported-query", "OGC API Features /items has no portable geometry-suppression parameter; omit returnGeometry or select another protocol");
     }
+    const ctx = {
+        protocol: source.protocol,
+        sourceId: source.id,
+        geometryProperty: source.geometryProperty ?? "geometry",
+    };
+    const parts = canonicalFilterParts(query, ctx);
+    const typedFilter = parts.expression
+        ? compileQueryFilterToCql2Text(parts.expression, ctx, esriGeometryToWkt)
+        : undefined;
+    const filterParts = [
+        ...(query.where ? [query.where.expression] : []),
+        ...(typedFilter !== undefined ? [typedFilter] : []),
+    ];
+    const filter = filterParts.length === 0
+        ? undefined
+        : filterParts.length === 1
+            ? filterParts[0]
+            : filterParts.map((part) => `(${part})`).join(" AND ");
     return {
         compiler: "ogc-api-features-query-v1",
         collectionId: source.collectionId,
-        ...(query.where ? { filter: query.where.expression, filterLang: "cql2-text" } : {}),
+        ...(filter !== undefined ? { filter, filterLang: "cql2-text" } : {}),
+        ...(parts.protocolTime ? { datetime: compileTemporalFilterToOgcDatetime(parts.protocolTime, ctx) } : {}),
         ...(query.outFields && query.outFields.length > 0 ? { properties: query.outFields } : {}),
         ...(query.orderBy && query.orderBy.length > 0
             ? { sortby: query.orderBy.map((sort) => `${sort.direction === "desc" ? "-" : ""}${sort.field}`).join(",") }

package/query-planner/planner.d.ts

@@ -6,9 +6,9 @@ export declare function hashQueryPlan(plan: QueryExecutionPlan): `sha256:${strin
 export declare function hashQueryPlanV1(plan: QueryExecutionPlanV1): `sha256:${string}` | undefined;
 /** Internal executor boundary: validate once and continue with an immutable detached snapshot. */
 export declare function validateQueryPlanSnapshot(plan: QueryExecutionPlan): QueryExecutionPlan;
-/** Canonical persistence boundary for accepted v1/v2 query plans. */
+/** Canonical persistence boundary; validated legacy protocol artifacts are upgraded before serialization. */
 export declare function serializeQueryPlan(plan: QueryExecutionPlan): string;
-/** Parse a persisted plan without retaining invalid JSON or credential-bearing v1 locators. */
+/** Parse a persisted plan, upgrading validated legacy protocol artifacts without retaining unsafe input. */
 export declare function parseQueryPlan(serialized: string): QueryExecutionPlan;
 /** Stable cache identity derived only after the plan passes the persistence guard. */
 export declare function queryPlanCacheKey(plan: QueryExecutionPlan): string;

package/query-planner/planner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"planner.d.ts","sourceRoot":"","sources":["../../../src/query-planner/planner.ts"],"names":[],"mappings":"AAwBA,OAAO,EAIL,KAAK,6BAA6B,EAClC,KAAK,mBAAmB,EAUxB,KAAK,kBAAkB,EACvB,KAAK,oBAAoB,EACzB,KAAK,oBAAoB,EAM1B,MAAM,YAAY,CAAC;AAGpB,wBAAgB,YAAY,CAAC,CAAC,EAAE,OAAO,EAAE,6BAA6B,CAAC,CAAC,CAAC,GAAG,oBAAoB,CAAC;AACjG,wBAAgB,YAAY,CAAC,CAAC,EAAE,OAAO,EAAE,mBAAmB,CAAC,CAAC,CAAC,GAAG,oBAAoB,CAAC;AAqMvF,wBAAgB,aAAa,CAAC,IAAI,EAAE,kBAAkB,GAAG,UAAU,MAAM,EAAE,CAE1E;AAED,qGAAqG;AACrG,wBAAgB,eAAe,CAAC,IAAI,EAAE,oBAAoB,GAAG,UAAU,MAAM,EAAE,GAAG,SAAS,CAkB1F;AAED,kGAAkG;AAClG,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,kBAAkB,GAAG,kBAAkB,CAItF;AAED,qEAAqE;AACrE,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,kBAAkB,GAAG,MAAM,CAInE;AAED,+FAA+F;AAC/F,wBAAgB,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,kBAAkB,CAWrE;AAED,sFAAsF;AACtF,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,kBAAkB,GAAG,MAAM,CAIlE;AAED,qFAAqF;AACrF,wBAAgB,4BAA4B,CAC1C,UAAU,EAAE,oBAAoB,EAChC,aAAa,EAAE,OAAO,GACrB,oBAAoB,CAiCtB"}
+{"version":3,"file":"planner.d.ts","sourceRoot":"","sources":["../../../src/query-planner/planner.ts"],"names":[],"mappings":"AAyBA,OAAO,EAIL,KAAK,6BAA6B,EAClC,KAAK,mBAAmB,EASxB,KAAK,kBAAkB,EACvB,KAAK,oBAAoB,EACzB,KAAK,oBAAoB,EAO1B,MAAM,YAAY,CAAC;AAGpB,wBAAgB,YAAY,CAAC,CAAC,EAAE,OAAO,EAAE,6BAA6B,CAAC,CAAC,CAAC,GAAG,oBAAoB,CAAC;AACjG,wBAAgB,YAAY,CAAC,CAAC,EAAE,OAAO,EAAE,mBAAmB,CAAC,CAAC,CAAC,GAAG,oBAAoB,CAAC;AAwNvF,wBAAgB,aAAa,CAAC,IAAI,EAAE,kBAAkB,GAAG,UAAU,MAAM,EAAE,CAE1E;AAED,qGAAqG;AACrG,wBAAgB,eAAe,CAAC,IAAI,EAAE,oBAAoB,GAAG,UAAU,MAAM,EAAE,GAAG,SAAS,CAkB1F;AAED,kGAAkG;AAClG,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,kBAAkB,GAAG,kBAAkB,CAItF;AAED,6GAA6G;AAC7G,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,kBAAkB,GAAG,MAAM,CAInE;AAED,4GAA4G;AAC5G,wBAAgB,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,kBAAkB,CAWrE;AAED,sFAAsF;AACtF,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,kBAAkB,GAAG,MAAM,CAIlE;AAED,qFAAqF;AACrF,wBAAgB,4BAA4B,CAC1C,UAAU,EAAE,oBAAoB,EAChC,aAAa,EAAE,OAAO,GACrB,oBAAoB,CAkCtB"}