@osdk/client 2.5.2 → 2.6.0-beta.10

package/build/browser/internal/conversions/modernToLegacyWhereClause.js

@@ -14,86 +14,69 @@
  * limitations under the License.
  */
 
-import { DistanceUnitMapping } from "@osdk/api";
 import invariant from "tiny-invariant";
-export function extractNamespace(fqApiName) {
-  const last = fqApiName.lastIndexOf(".");
-  if (last === -1) return [undefined, fqApiName];
-  return [fqApiName.slice(0, last), fqApiName.slice(last + 1)];
+import { fullyQualifyPropName } from "./fullyQualifyPropName.js";
+import { makeGeoFilterIntersects } from "./makeGeoFilterIntersects.js";
+import { makeGeoFilterWithin } from "./makeGeoFilterWithin.js";
+function isAndClause(whereClause) {
+  return "$and" in whereClause && whereClause.$and !== undefined;
+}
+function isOrClause(whereClause) {
+  return "$or" in whereClause && whereClause.$or !== undefined;
+}
+function isNotClause(whereClause) {
+  return "$not" in whereClause && whereClause.$not !== undefined;
+}
+
+/** @internal */
+export function modernToLegacyWhereClause(whereClause, objectOrInterface, rdpNames) {
+  const parts = Object.entries(whereClause).map(([key, value]) => ({
+    [key]: value
+  }));
+  if (parts.length === 1) {
+    return modernToLegacyWhereClauseInner(whereClause, objectOrInterface, rdpNames);
+  }
+  return {
+    type: "and",
+    value: parts.map(v => modernToLegacyWhereClauseInner(v, objectOrInterface, rdpNames))
+  };
 }
 
 /** @internal */
-export function modernToLegacyWhereClause(whereClause, objectOrInterface) {
-  if ("$and" in whereClause) {
+export function modernToLegacyWhereClauseInner(whereClause, objectOrInterface, rdpNames) {
+  const parts = Object.entries(whereClause);
+  !(parts.length === 1) ? process.env.NODE_ENV !== "production" ? invariant(false, "Invalid where clause provided.") : invariant(false) : void 0;
+  if (isAndClause(whereClause)) {
     return {
       type: "and",
-      value: whereClause.$and.map(clause => modernToLegacyWhereClause(clause, objectOrInterface))
+      value: whereClause.$and.map(clause => modernToLegacyWhereClause(clause, objectOrInterface, rdpNames))
     };
-  } else if ("$or" in whereClause) {
+  } else if (isOrClause(whereClause)) {
     return {
       type: "or",
-      value: whereClause.$or.map(clause => modernToLegacyWhereClause(clause, objectOrInterface))
+      value: whereClause.$or.map(clause => modernToLegacyWhereClause(clause, objectOrInterface, rdpNames))
     };
-  } else if ("$not" in whereClause) {
+  } else if (isNotClause(whereClause)) {
     return {
       type: "not",
-      value: modernToLegacyWhereClause(whereClause.$not, objectOrInterface)
+      value: modernToLegacyWhereClause(whereClause.$not, objectOrInterface, rdpNames)
     };
   }
-  const parts = Object.entries(whereClause);
-  if (parts.length === 1) {
-    return handleWherePair(parts[0], objectOrInterface);
-  }
-  return {
-    type: "and",
-    value: parts.map(v => handleWherePair(v, objectOrInterface))
-  };
-}
-function makeGeoFilterBbox(bbox, filterType, propertyIdentifier, field) {
-  return {
-    type: filterType === "$within" ? "withinBoundingBox" : "intersectsBoundingBox",
-    /**
-     * This is a bit ugly, but did this so that propertyIdentifier only shows up in the return object if its defined,
-     * this makes it so we don't need to go update our entire test bed either to include a field which may change in near future.
-     * Once we solidify that this is the way forward, I can remove field and clean this up
-     */
-    ...(propertyIdentifier != null && {
-      propertyIdentifier
-    }),
-    field,
-    value: {
-      topLeft: {
-        type: "Point",
-        coordinates: [bbox[0], bbox[3]]
-      },
-      bottomRight: {
-        type: "Point",
-        coordinates: [bbox[2], bbox[1]]
-      }
-    }
-  };
-}
-function makeGeoFilterPolygon(coordinates, filterType, propertyIdentifier, field) {
-  return {
-    type: filterType,
-    ...(propertyIdentifier != null && {
-      propertyIdentifier
-    }),
-    field,
-    value: {
-      type: "Polygon",
-      coordinates
-    }
-  };
+  return handleWherePair(parts[0], objectOrInterface, undefined, rdpNames);
 }
-function handleWherePair([fieldName, filter], objectOrInterface, structFieldSelector) {
+function handleWherePair([fieldName, filter], objectOrInterface, structFieldSelector, rdpNames) {
   !(filter != null) ? process.env.NODE_ENV !== "production" ? invariant(false, "Defined key values are only allowed when they are not undefined.") : invariant(false) : void 0;
-  const propertyIdentifier = structFieldSelector != null ? {
+  const isRdp = !structFieldSelector && rdpNames?.has(fieldName);
+  const propertyIdentifier = isRdp ? {
+    type: "property",
+    apiName: fieldName
+  } : structFieldSelector != null ? {
     type: "structField",
     ...structFieldSelector,
     propertyApiName: fullyQualifyPropName(structFieldSelector.propertyApiName, objectOrInterface)
   } : undefined;
-  const field = structFieldSelector == null ? fullyQualifyPropName(fieldName, objectOrInterface) : undefined;
+  const field = !isRdp && structFieldSelector == null ? fullyQualifyPropName(fieldName, objectOrInterface) : undefined;
+  !(field == null || propertyIdentifier == null && (field != null || isRdp != null)) ? process.env.NODE_ENV !== "production" ? invariant(false, "Encountered error constructing where clause: field and propertyIdentifier cannot both be defined") : invariant(false) : void 0;
   if (typeof filter === "string" || typeof filter === "number" || typeof filter === "boolean") {
     return {
       type: "eq",
@@ -110,6 +93,8 @@ function handleWherePair([fieldName, filter], objectOrInterface, structFieldSele
   // e.g. `where({ name: { $eq: "foo", $ne: "bar" } })` is invalid currently
   const hasDollarSign = keysOfFilter.some(key => key.startsWith("$"));
   !(!hasDollarSign || keysOfFilter.length === 1) ? process.env.NODE_ENV !== "production" ? invariant(false, "A WhereClause Filter with multiple clauses/fields is not allowed. Instead, use an 'or'/'and' clause to combine multiple filters.") : invariant(false) : void 0;
+
+  // Struct
   if (!hasDollarSign) {
     const structFilter = Object.entries(filter);
     !(structFilter.length === 1) ? process.env.NODE_ENV !== "production" ? invariant(false, "Cannot filter on more than one struct field in the same clause, need to use an and clause") : invariant(false) : void 0;
@@ -117,10 +102,21 @@ function handleWherePair([fieldName, filter], objectOrInterface, structFieldSele
     return handleWherePair(Object.entries(filter)[0], objectOrInterface, {
       propertyApiName: fieldName,
       structFieldApiName
-    });
+    }, rdpNames);
   }
   const firstKey = keysOfFilter[0];
   !(filter[firstKey] != null) ? process.env.NODE_ENV !== "production" ? invariant(false) : invariant(false) : void 0;
+
+  // Struct array
+  if (firstKey === "$contains" && filter[firstKey] instanceof Object) {
+    const structFilter = Object.entries(filter[firstKey]);
+    !(structFilter.length === 1) ? process.env.NODE_ENV !== "production" ? invariant(false, "Cannot filter on more than one struct field in the same clause, need to use an and clause") : invariant(false) : void 0;
+    const structFieldApiName = structFilter[0][0];
+    return handleWherePair(structFilter[0], objectOrInterface, {
+      propertyApiName: fieldName,
+      structFieldApiName
+    });
+  }
   if (firstKey === "$ne") {
     return {
       type: "not",
@@ -135,44 +131,10 @@ function handleWherePair([fieldName, filter], objectOrInterface, structFieldSele
     };
   }
   if (firstKey === "$within") {
-    const withinBody = filter[firstKey];
-    if (Array.isArray(withinBody)) {
-      return makeGeoFilterBbox(withinBody, firstKey, propertyIdentifier, field);
-    } else if ("$bbox" in withinBody && withinBody.$bbox != null) {
-      return makeGeoFilterBbox(withinBody.$bbox, firstKey, propertyIdentifier, field);
-    } else if ("$distance" in withinBody && "$of" in withinBody && withinBody.$distance != null && withinBody.$of != null) {
-      return {
-        type: "withinDistanceOf",
-        ...(propertyIdentifier != null && {
-          propertyIdentifier
-        }),
-        field,
-        value: {
-          center: Array.isArray(withinBody.$of) ? {
-            type: "Point",
-            coordinates: withinBody.$of
-          } : withinBody.$of,
-          distance: {
-            value: withinBody.$distance[0],
-            unit: DistanceUnitMapping[withinBody.$distance[1]]
-          }
-        }
-      };
-    } else {
-      const coordinates = "$polygon" in withinBody ? withinBody.$polygon : withinBody.coordinates;
-      return makeGeoFilterPolygon(coordinates, "withinPolygon", propertyIdentifier, fieldName);
-    }
+    return makeGeoFilterWithin(filter[firstKey], propertyIdentifier, field);
   }
   if (firstKey === "$intersects") {
-    const intersectsBody = filter[firstKey];
-    if (Array.isArray(intersectsBody)) {
-      return makeGeoFilterBbox(intersectsBody, firstKey, propertyIdentifier, field);
-    } else if ("$bbox" in intersectsBody && intersectsBody.$bbox != null) {
-      return makeGeoFilterBbox(intersectsBody.$bbox, firstKey, propertyIdentifier, field);
-    } else {
-      const coordinates = "$polygon" in intersectsBody ? intersectsBody.$polygon : intersectsBody.coordinates;
-      return makeGeoFilterPolygon(coordinates, "intersectsPolygon", propertyIdentifier, field);
-    }
+    return makeGeoFilterIntersects(filter[firstKey], propertyIdentifier, field);
   }
   if (firstKey === "$containsAllTerms" || firstKey === "$containsAnyTerm") {
     return {
@@ -194,12 +156,4 @@ function handleWherePair([fieldName, filter], objectOrInterface, structFieldSele
     value: filter[firstKey]
   };
 }
-function fullyQualifyPropName(fieldName, objectOrInterface) {
-  if (objectOrInterface.type === "interface") {
-    const [objApiNamespace] = extractNamespace(objectOrInterface.apiName);
-    const [fieldApiNamespace, fieldShortName] = extractNamespace(fieldName);
-    return fieldApiNamespace == null && objApiNamespace != null ? `${objApiNamespace}.${fieldShortName}` : fieldName;
-  }
-  return fieldName;
-}
 //# sourceMappingURL=modernToLegacyWhereClause.js.map

package/build/browser/internal/conversions/modernToLegacyWhereClause.js.map

@@ -1 +1 @@
-{"version":3,"file":"modernToLegacyWhereClause.js","names":["DistanceUnitMapping","invariant","extractNamespace","fqApiName","last","lastIndexOf","undefined","slice","modernToLegacyWhereClause","whereClause","objectOrInterface","type","value","$and","map","clause","$or","$not","parts","Object","entries","length","handleWherePair","v","makeGeoFilterBbox","bbox","filterType","propertyIdentifier","field","topLeft","coordinates","bottomRight","makeGeoFilterPolygon","fieldName","filter","structFieldSelector","process","env","NODE_ENV","propertyApiName","fullyQualifyPropName","keysOfFilter","keys","hasDollarSign","some","key","startsWith","structFilter","structFieldApiName","firstKey","withinBody","Array","isArray","$bbox","$distance","$of","center","distance","unit","$polygon","intersectsBody","substring","fuzzy","objApiNamespace","apiName","fieldApiNamespace","fieldShortName"],"sources":["modernToLegacyWhereClause.ts"],"sourcesContent":["/*\n * Copyright 2023 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport type {\n  GeoFilterOptions,\n  ObjectOrInterfaceDefinition,\n  PossibleWhereClauseFilters,\n  WhereClause,\n} from \"@osdk/api\";\nimport { DistanceUnitMapping } from \"@osdk/api\";\n\nimport type {\n  PropertyIdentifier,\n  SearchJsonQueryV2,\n} from \"@osdk/foundry.ontologies\";\nimport type { BBox, Position } from \"geojson\";\nimport invariant from \"tiny-invariant\";\n\nexport function extractNamespace(\n  fqApiName: string,\n): [string | undefined, string] {\n  const last = fqApiName.lastIndexOf(\".\");\n  if (last === -1) return [undefined, fqApiName];\n  return [fqApiName.slice(0, last), fqApiName.slice(last + 1)];\n}\n\n/** @internal */\nexport function modernToLegacyWhereClause<\n  T extends ObjectOrInterfaceDefinition,\n>(\n  whereClause: WhereClause<T>,\n  objectOrInterface: T,\n): SearchJsonQueryV2 {\n  if (\"$and\" in whereClause) {\n    return {\n      type: \"and\",\n      value: (whereClause.$and as WhereClause<T>[]).map(\n        (clause) => modernToLegacyWhereClause(clause, objectOrInterface),\n      ),\n    };\n  } else if (\"$or\" in whereClause) {\n    return {\n      type: \"or\",\n      value: (whereClause.$or as WhereClause<T>[]).map(\n        (clause) => modernToLegacyWhereClause(clause, objectOrInterface),\n      ),\n    };\n  } else if (\"$not\" in whereClause) {\n    return {\n      type: \"not\",\n      value: modernToLegacyWhereClause(\n        whereClause.$not as WhereClause<T>,\n        objectOrInterface,\n      ),\n    };\n  }\n\n  const parts = Object.entries(whereClause);\n\n  if (parts.length === 1) {\n    return handleWherePair(parts[0], objectOrInterface);\n  }\n\n  return {\n    type: \"and\",\n    value: parts.map<SearchJsonQueryV2>(\n      v => handleWherePair(v, objectOrInterface),\n    ),\n  };\n}\n\nfunction makeGeoFilterBbox(\n  bbox: BBox,\n  filterType: \"$within\" | \"$intersects\",\n  propertyIdentifier?: PropertyIdentifier,\n  field?: string,\n): SearchJsonQueryV2 {\n  return {\n    type: filterType === \"$within\"\n      ? \"withinBoundingBox\"\n      : \"intersectsBoundingBox\",\n    /**\n     * This is a bit ugly, but did this so that propertyIdentifier only shows up in the return object if its defined,\n     * this makes it so we don't need to go update our entire test bed either to include a field which may change in near future.\n     * Once we solidify that this is the way forward, I can remove field and clean this up\n     */\n    ...(propertyIdentifier != null && { propertyIdentifier }),\n    field,\n    value: {\n      topLeft: {\n        type: \"Point\",\n        coordinates: [bbox[0], bbox[3]],\n      },\n      bottomRight: {\n        type: \"Point\",\n        coordinates: [bbox[2], bbox[1]],\n      },\n    },\n  };\n}\n\nfunction makeGeoFilterPolygon(\n  coordinates: Position[][],\n  filterType: \"intersectsPolygon\" | \"withinPolygon\",\n  propertyIdentifier?: PropertyIdentifier,\n  field?: string,\n): SearchJsonQueryV2 {\n  return {\n    type: filterType,\n    ...(propertyIdentifier != null && { propertyIdentifier }),\n    field,\n    value: {\n      type: \"Polygon\",\n      coordinates,\n    },\n  };\n}\n\nfunction handleWherePair(\n  [fieldName, filter]: [string, any],\n  objectOrInterface: ObjectOrInterfaceDefinition,\n  structFieldSelector?: { propertyApiName: string; structFieldApiName: string },\n): SearchJsonQueryV2 {\n  invariant(\n    filter != null,\n    \"Defined key values are only allowed when they are not undefined.\",\n  );\n\n  const propertyIdentifier: PropertyIdentifier | undefined =\n    structFieldSelector != null\n      ? {\n        type: \"structField\",\n        ...structFieldSelector,\n        propertyApiName: fullyQualifyPropName(\n          structFieldSelector.propertyApiName,\n          objectOrInterface,\n        ),\n      }\n      : undefined;\n  const field = structFieldSelector == null\n    ? fullyQualifyPropName(fieldName, objectOrInterface)\n    : undefined;\n\n  if (\n    typeof filter === \"string\" || typeof filter === \"number\"\n    || typeof filter === \"boolean\"\n  ) {\n    propertyIdentifier;\n    return {\n      type: \"eq\",\n      ...(propertyIdentifier != null\n        && { propertyIdentifier }),\n      field,\n      value: filter,\n    };\n  }\n\n  const keysOfFilter = Object.keys(filter);\n\n  // If any of the keys start with `$` then they must be the only one.\n  // e.g. `where({ name: { $eq: \"foo\", $ne: \"bar\" } })` is invalid currently\n  const hasDollarSign = keysOfFilter.some((key) => key.startsWith(\"$\"));\n  invariant(\n    !hasDollarSign\n      || keysOfFilter.length === 1,\n    \"A WhereClause Filter with multiple clauses/fields is not allowed. Instead, use an 'or'/'and' clause to combine multiple filters.\",\n  );\n\n  if (!hasDollarSign) {\n    const structFilter = Object.entries(filter);\n    invariant(\n      structFilter.length === 1,\n      \"Cannot filter on more than one struct field in the same clause, need to use an and clause\",\n    );\n    const structFieldApiName = keysOfFilter[0];\n    return handleWherePair(Object.entries(filter)[0], objectOrInterface, {\n      propertyApiName: fieldName,\n      structFieldApiName,\n    });\n  }\n\n  const firstKey = keysOfFilter[0] as PossibleWhereClauseFilters;\n  invariant(filter[firstKey] != null);\n\n  if (firstKey === \"$ne\") {\n    return {\n      type: \"not\",\n      value: {\n        type: \"eq\",\n        ...(propertyIdentifier != null && { propertyIdentifier }),\n        field,\n        value: filter[firstKey],\n      },\n    };\n  }\n\n  if (firstKey === \"$within\") {\n    const withinBody = filter[firstKey] as GeoFilterOptions[\"$within\"];\n\n    if (Array.isArray(withinBody)) {\n      return makeGeoFilterBbox(withinBody, firstKey, propertyIdentifier, field);\n    } else if (\"$bbox\" in withinBody && withinBody.$bbox != null) {\n      return makeGeoFilterBbox(\n        withinBody.$bbox,\n        firstKey,\n        propertyIdentifier,\n        field,\n      );\n    } else if (\n      (\"$distance\" in withinBody && \"$of\" in withinBody)\n      && withinBody.$distance != null\n      && withinBody.$of != null\n    ) {\n      return {\n        type: \"withinDistanceOf\",\n        ...(propertyIdentifier != null && { propertyIdentifier }),\n        field,\n        value: {\n          center: Array.isArray(withinBody.$of)\n            ? {\n              type: \"Point\",\n              coordinates: withinBody.$of,\n            }\n            : withinBody.$of,\n          distance: {\n            value: withinBody.$distance[0],\n            unit: DistanceUnitMapping[withinBody.$distance[1]],\n          },\n        },\n      };\n    } else {\n      const coordinates = (\"$polygon\" in withinBody)\n        ? withinBody.$polygon\n        : withinBody.coordinates;\n      return makeGeoFilterPolygon(\n        coordinates,\n        \"withinPolygon\",\n        propertyIdentifier,\n        fieldName,\n      );\n    }\n  }\n  if (firstKey === \"$intersects\") {\n    const intersectsBody = filter[firstKey] as GeoFilterOptions[\"$intersects\"];\n    if (Array.isArray(intersectsBody)) {\n      return makeGeoFilterBbox(\n        intersectsBody,\n        firstKey,\n        propertyIdentifier,\n        field,\n      );\n    } else if (\"$bbox\" in intersectsBody && intersectsBody.$bbox != null) {\n      return makeGeoFilterBbox(\n        intersectsBody.$bbox,\n        firstKey,\n        propertyIdentifier,\n        field,\n      );\n    } else {\n      const coordinates = (\"$polygon\" in intersectsBody)\n        ? intersectsBody.$polygon\n        : intersectsBody.coordinates;\n      return makeGeoFilterPolygon(\n        coordinates,\n        \"intersectsPolygon\",\n        propertyIdentifier,\n        field,\n      );\n    }\n  }\n\n  if (firstKey === \"$containsAllTerms\" || firstKey === \"$containsAnyTerm\") {\n    return {\n      type: firstKey.substring(1) as DropDollarSign<typeof firstKey>,\n      ...(propertyIdentifier != null && { propertyIdentifier }),\n      field,\n      value: typeof filter[firstKey] === \"string\"\n        ? filter[firstKey]\n        : filter[firstKey][\"term\"],\n      fuzzy: typeof filter[firstKey] === \"string\"\n        ? false\n        : filter[firstKey][\"fuzzySearch\"] ?? false,\n    };\n  }\n\n  return {\n    type: firstKey.substring(1) as DropDollarSign<typeof firstKey>,\n    ...(propertyIdentifier != null && { propertyIdentifier }),\n    field,\n    value: filter[firstKey] as any,\n  };\n}\n\ntype DropDollarSign<T extends `$${string}`> = T extends `$${infer U}` ? U\n  : never;\n\nfunction fullyQualifyPropName(\n  fieldName: string,\n  objectOrInterface: ObjectOrInterfaceDefinition,\n) {\n  if (objectOrInterface.type === \"interface\") {\n    const [objApiNamespace] = extractNamespace(objectOrInterface.apiName);\n    const [fieldApiNamespace, fieldShortName] = extractNamespace(fieldName);\n    return (fieldApiNamespace == null && objApiNamespace != null)\n      ? `${objApiNamespace}.${fieldShortName}`\n      : fieldName;\n  }\n  return fieldName;\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"modernToLegacyWhereClause.js","names":["invariant","fullyQualifyPropName","makeGeoFilterIntersects","makeGeoFilterWithin","isAndClause","whereClause","$and","undefined","isOrClause","$or","isNotClause","$not","modernToLegacyWhereClause","objectOrInterface","rdpNames","parts","Object","entries","map","key","value","length","modernToLegacyWhereClauseInner","type","v","process","env","NODE_ENV","clause","handleWherePair","fieldName","filter","structFieldSelector","isRdp","has","propertyIdentifier","apiName","propertyApiName","field","keysOfFilter","keys","hasDollarSign","some","startsWith","structFilter","structFieldApiName","firstKey","substring","fuzzy"],"sources":["modernToLegacyWhereClause.ts"],"sourcesContent":["/*\n * Copyright 2023 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport type {\n  AndWhereClause,\n  NotWhereClause,\n  ObjectOrInterfaceDefinition,\n  OrWhereClause,\n  PossibleWhereClauseFilters,\n  SimplePropertyDef,\n  WhereClause,\n} from \"@osdk/api\";\n\nimport type {\n  PropertyIdentifier,\n  SearchJsonQueryV2,\n} from \"@osdk/foundry.ontologies\";\nimport invariant from \"tiny-invariant\";\nimport { fullyQualifyPropName } from \"./fullyQualifyPropName.js\";\nimport { makeGeoFilterIntersects } from \"./makeGeoFilterIntersects.js\";\nimport { makeGeoFilterWithin } from \"./makeGeoFilterWithin.js\";\n\ntype DropDollarSign<T extends `$${string}`> = T extends `$${infer U}` ? U\n  : never;\n\nfunction isAndClause<\n  T extends ObjectOrInterfaceDefinition,\n  RDPs extends Record<string, SimplePropertyDef> = {},\n>(\n  whereClause: WhereClause<T, RDPs>,\n): whereClause is AndWhereClause<T, RDPs> {\n  return \"$and\" in whereClause && whereClause.$and !== undefined;\n}\n\nfunction isOrClause<\n  T extends ObjectOrInterfaceDefinition,\n  RDPs extends Record<string, SimplePropertyDef> = {},\n>(\n  whereClause: WhereClause<T, RDPs>,\n): whereClause is OrWhereClause<T, RDPs> {\n  return \"$or\" in whereClause && whereClause.$or !== undefined;\n}\n\nfunction isNotClause<\n  T extends ObjectOrInterfaceDefinition,\n  RDPs extends Record<string, SimplePropertyDef> = {},\n>(\n  whereClause: WhereClause<T, RDPs>,\n): whereClause is NotWhereClause<T, RDPs> {\n  return \"$not\" in whereClause && whereClause.$not !== undefined;\n}\n\n/** @internal */\nexport function modernToLegacyWhereClause<\n  T extends ObjectOrInterfaceDefinition,\n  RDPs extends Record<string, SimplePropertyDef> = {},\n>(\n  whereClause: WhereClause<T, RDPs>,\n  objectOrInterface: T,\n  rdpNames?: Set<string>,\n): SearchJsonQueryV2 {\n  const parts = Object.entries(whereClause).map(([key, value]) => ({\n    [key]: value,\n  })) as WhereClause<T, RDPs>[];\n  if (parts.length === 1) {\n    return modernToLegacyWhereClauseInner(\n      whereClause,\n      objectOrInterface,\n      rdpNames,\n    );\n  }\n  return {\n    type: \"and\",\n    value: parts.map<SearchJsonQueryV2>(\n      v => modernToLegacyWhereClauseInner(v, objectOrInterface, rdpNames),\n    ),\n  };\n}\n\n/** @internal */\nexport function modernToLegacyWhereClauseInner<\n  T extends ObjectOrInterfaceDefinition,\n  RDPs extends Record<string, SimplePropertyDef> = {},\n>(\n  whereClause: WhereClause<T, RDPs>,\n  objectOrInterface: T,\n  rdpNames?: Set<string>,\n): SearchJsonQueryV2 {\n  const parts = Object.entries(whereClause);\n\n  invariant(parts.length === 1, \"Invalid where clause provided.\");\n\n  if (isAndClause(whereClause)) {\n    return {\n      type: \"and\",\n      value: (whereClause.$and as WhereClause<T, RDPs>[]).map(\n        (clause) =>\n          modernToLegacyWhereClause(clause, objectOrInterface, rdpNames),\n      ),\n    };\n  } else if (isOrClause(whereClause)) {\n    return {\n      type: \"or\",\n      value: (whereClause.$or as WhereClause<T, RDPs>[]).map(\n        (clause) =>\n          modernToLegacyWhereClause(clause, objectOrInterface, rdpNames),\n      ),\n    };\n  } else if (isNotClause(whereClause)) {\n    return {\n      type: \"not\",\n      value: modernToLegacyWhereClause(\n        whereClause.$not as WhereClause<T, RDPs>,\n        objectOrInterface,\n        rdpNames,\n      ),\n    };\n  }\n\n  return handleWherePair(parts[0], objectOrInterface, undefined, rdpNames);\n}\n\nfunction handleWherePair(\n  [fieldName, filter]: [string, any],\n  objectOrInterface: ObjectOrInterfaceDefinition,\n  structFieldSelector?: { propertyApiName: string; structFieldApiName: string },\n  rdpNames?: Set<string>,\n): SearchJsonQueryV2 {\n  invariant(\n    filter != null,\n    \"Defined key values are only allowed when they are not undefined.\",\n  );\n\n  const isRdp = !structFieldSelector && rdpNames?.has(fieldName);\n\n  const propertyIdentifier: PropertyIdentifier | undefined = isRdp\n    ? {\n      type: \"property\",\n      apiName: fieldName,\n    }\n    : structFieldSelector != null\n    ? {\n      type: \"structField\",\n      ...structFieldSelector,\n      propertyApiName: fullyQualifyPropName(\n        structFieldSelector.propertyApiName,\n        objectOrInterface,\n      ),\n    }\n    : undefined;\n\n  const field = !isRdp && structFieldSelector == null\n    ? fullyQualifyPropName(fieldName, objectOrInterface)\n    : undefined;\n\n  invariant(\n    field == null\n      || propertyIdentifier == null && (field != null || isRdp != null),\n    \"Encountered error constructing where clause: field and propertyIdentifier cannot both be defined\",\n  );\n\n  if (\n    typeof filter === \"string\" || typeof filter === \"number\"\n    || typeof filter === \"boolean\"\n  ) {\n    return {\n      type: \"eq\",\n      ...(propertyIdentifier != null\n        && { propertyIdentifier }),\n      field,\n      value: filter,\n    };\n  }\n\n  const keysOfFilter = Object.keys(filter);\n\n  // If any of the keys start with `$` then they must be the only one.\n  // e.g. `where({ name: { $eq: \"foo\", $ne: \"bar\" } })` is invalid currently\n  const hasDollarSign = keysOfFilter.some((key) => key.startsWith(\"$\"));\n  invariant(\n    !hasDollarSign\n      || keysOfFilter.length === 1,\n    \"A WhereClause Filter with multiple clauses/fields is not allowed. Instead, use an 'or'/'and' clause to combine multiple filters.\",\n  );\n\n  // Struct\n  if (!hasDollarSign) {\n    const structFilter = Object.entries(filter);\n    invariant(\n      structFilter.length === 1,\n      \"Cannot filter on more than one struct field in the same clause, need to use an and clause\",\n    );\n    const structFieldApiName = keysOfFilter[0];\n    return handleWherePair(Object.entries(filter)[0], objectOrInterface, {\n      propertyApiName: fieldName,\n      structFieldApiName,\n    }, rdpNames);\n  }\n\n  const firstKey = keysOfFilter[0] as PossibleWhereClauseFilters;\n  invariant(filter[firstKey] != null);\n\n  // Struct array\n  if (firstKey === \"$contains\" && filter[firstKey] instanceof Object) {\n    const structFilter: [string, any][] = Object.entries(filter[firstKey]);\n    invariant(\n      structFilter.length === 1,\n      \"Cannot filter on more than one struct field in the same clause, need to use an and clause\",\n    );\n    const structFieldApiName = structFilter[0][0];\n\n    return handleWherePair(structFilter[0], objectOrInterface, {\n      propertyApiName: fieldName,\n      structFieldApiName,\n    });\n  }\n\n  if (firstKey === \"$ne\") {\n    return {\n      type: \"not\",\n      value: {\n        type: \"eq\",\n        ...(propertyIdentifier != null && { propertyIdentifier }),\n        field,\n        value: filter[firstKey],\n      },\n    };\n  }\n\n  if (firstKey === \"$within\") {\n    return makeGeoFilterWithin(filter[firstKey], propertyIdentifier, field);\n  }\n  if (firstKey === \"$intersects\") {\n    return makeGeoFilterIntersects(filter[firstKey], propertyIdentifier, field);\n  }\n\n  if (firstKey === \"$containsAllTerms\" || firstKey === \"$containsAnyTerm\") {\n    return {\n      type: firstKey.substring(1) as DropDollarSign<typeof firstKey>,\n      ...(propertyIdentifier != null && { propertyIdentifier }),\n      field,\n      value: typeof filter[firstKey] === \"string\"\n        ? filter[firstKey]\n        : filter[firstKey][\"term\"],\n      fuzzy: typeof filter[firstKey] === \"string\"\n        ? false\n        : filter[firstKey][\"fuzzySearch\"] ?? false,\n    };\n  }\n\n  return {\n    type: firstKey.substring(1) as DropDollarSign<typeof firstKey>,\n    ...(propertyIdentifier != null && { propertyIdentifier }),\n    field,\n    value: filter[firstKey] as any,\n  };\n}\n"],"mappings":"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","ignoreList":[]}

package/build/browser/internal/conversions/modernToLegacyWhereClause.test.js

@@ -907,6 +907,68 @@ describe(modernToLegacyWhereClause, () => {
       }
     `);
       });
+      it("converts struct arrays correctly", () => {
+        expect(modernToLegacyWhereClause({
+          $and: [{
+            addressArray: {
+              $contains: {
+                zipCode: {
+                  $gte: 10001
+                }
+              }
+            }
+          }, {
+            addressArray: {
+              $contains: {
+                location: {
+                  $within: [1, 2, 3, 4]
+                }
+              }
+            }
+          }]
+        }, BgaoNflPlayer)).toMatchInlineSnapshot(`
+            {
+              "type": "and",
+              "value": [
+                {
+                  "field": undefined,
+                  "propertyIdentifier": {
+                    "propertyApiName": "addressArray",
+                    "structFieldApiName": "zipCode",
+                    "type": "structField",
+                  },
+                  "type": "gte",
+                  "value": 10001,
+                },
+                {
+                  "field": undefined,
+                  "propertyIdentifier": {
+                    "propertyApiName": "addressArray",
+                    "structFieldApiName": "location",
+                    "type": "structField",
+                  },
+                  "type": "withinBoundingBox",
+                  "value": {
+                    "bottomRight": {
+                      "coordinates": [
+                        3,
+                        2,
+                      ],
+                      "type": "Point",
+                    },
+                    "topLeft": {
+                      "coordinates": [
+                        1,
+                        4,
+                      ],
+                      "type": "Point",
+                    },
+                  },
+                },
+              ],
+            }
+          `);
+      });
     });
     describe("multiple checks", () => {
       it("properly handles multiple simple where checks", () => {
@@ -983,5 +1045,252 @@ describe(modernToLegacyWhereClause, () => {
       });
     });
   });
+  describe("mixed $ operators and regular properties", () => {
+    it("should handle $not operator with regular properties at top level", () => {
+      const result = modernToLegacyWhereClause({
+        integer: {
+          $eq: 5
+        },
+        $not: {
+          string: {
+            $in: ["a", "b", "c"]
+          }
+        }
+      }, objectTypeWithAllPropertyTypes);
+      expect(result).toMatchInlineSnapshot(`
+        {
+          "type": "and",
+          "value": [
+            {
+              "field": "integer",
+              "type": "eq",
+              "value": 5,
+            },
+            {
+              "type": "not",
+              "value": {
+                "field": "string",
+                "type": "in",
+                "value": [
+                  "a",
+                  "b",
+                  "c",
+                ],
+              },
+            },
+          ],
+        }
+      `);
+    });
+    it("should handle multiple regular properties with $not at top level", () => {
+      const result = modernToLegacyWhereClause({
+        integer: 5,
+        boolean: true,
+        $not: {
+          string: {
+            $eq: "excluded"
+          }
+        }
+      }, objectTypeWithAllPropertyTypes);
+      expect(result).toMatchInlineSnapshot(`
+        {
+          "type": "and",
+          "value": [
+            {
+              "field": "integer",
+              "type": "eq",
+              "value": 5,
+            },
+            {
+              "field": "boolean",
+              "type": "eq",
+              "value": true,
+            },
+            {
+              "type": "not",
+              "value": {
+                "field": "string",
+                "type": "eq",
+                "value": "excluded",
+              },
+            },
+          ],
+        }
+      `);
+    });
+  });
+  describe("RDP properties", () => {
+    const mockObjectType = {
+      type: "object",
+      apiName: "TestObject",
+      __DefinitionMetadata: {
+        type: "object",
+        apiName: "TestObject",
+        displayName: "Test Object",
+        description: undefined,
+        properties: {
+          department: {
+            type: "string"
+          },
+          status: {
+            type: "string"
+          }
+        },
+        rid: "test-rid",
+        primaryKeyApiName: "id",
+        titleProperty: "department",
+        links: {},
+        primaryKeyType: "string",
+        icon: undefined,
+        visibility: undefined,
+        pluralDisplayName: "Test Objects",
+        status: undefined,
+        interfaceMap: {},
+        inverseInterfaceMap: {}
+      }
+    };
+    it("should handle RDP properties at top level", () => {
+      const rdpNames = new Set(["reportCount", "managerName"]);
+      const result = modernToLegacyWhereClause({
+        department: "Engineering",
+        reportCount: {
+          $gte: 5
+        },
+        managerName: "John"
+      }, mockObjectType, rdpNames);
+      expect(result).toMatchInlineSnapshot(`
+        {
+          "type": "and",
+          "value": [
+            {
+              "field": "department",
+              "type": "eq",
+              "value": "Engineering",
+            },
+            {
+              "field": undefined,
+              "propertyIdentifier": {
+                "apiName": "reportCount",
+                "type": "property",
+              },
+              "type": "gte",
+              "value": 5,
+            },
+            {
+              "field": undefined,
+              "propertyIdentifier": {
+                "apiName": "managerName",
+                "type": "property",
+              },
+              "type": "eq",
+              "value": "John",
+            },
+          ],
+        }
+      `);
+    });
+    it("should handle RDP properties in $and clauses", () => {
+      const rdpNames = new Set(["reportCount"]);
+      const result = modernToLegacyWhereClause({
+        $and: [{
+          department: "Engineering"
+        }, {
+          reportCount: {
+            $gte: 5
+          }
+        }]
+      }, mockObjectType, rdpNames);
+      expect(result).toMatchInlineSnapshot(`
+        {
+          "type": "and",
+          "value": [
+            {
+              "field": "department",
+              "type": "eq",
+              "value": "Engineering",
+            },
+            {
+              "field": undefined,
+              "propertyIdentifier": {
+                "apiName": "reportCount",
+                "type": "property",
+              },
+              "type": "gte",
+              "value": 5,
+            },
+          ],
+        }
+      `);
+    });
+    it("should handle complex nested structures with RDP", () => {
+      const rdpNames = new Set(["reportCount", "managerName"]);
+      const result = modernToLegacyWhereClause({
+        department: "Engineering",
+        $and: [{
+          $or: [{
+            status: "active"
+          }, {
+            reportCount: {
+              $gte: 10
+            }
+          }]
+        }, {
+          managerName: {
+            $ne: "Admin"
+          }
+        }]
+      }, mockObjectType, rdpNames);
+
+      // The actual structure flattens the nested $and differently
+      expect(result).toMatchInlineSnapshot(`
+        {
+          "type": "and",
+          "value": [
+            {
+              "field": "department",
+              "type": "eq",
+              "value": "Engineering",
+            },
+            {
+              "type": "and",
+              "value": [
+                {
+                  "type": "or",
+                  "value": [
+                    {
+                      "field": "status",
+                      "type": "eq",
+                      "value": "active",
+                    },
+                    {
+                      "field": undefined,
+                      "propertyIdentifier": {
+                        "apiName": "reportCount",
+                        "type": "property",
+                      },
+                      "type": "gte",
+                      "value": 10,
+                    },
+                  ],
+                },
+                {
+                  "type": "not",
+                  "value": {
+                    "field": undefined,
+                    "propertyIdentifier": {
+                      "apiName": "managerName",
+                      "type": "property",
+                    },
+                    "type": "eq",
+                    "value": "Admin",
+                  },
+                },
+              ],
+            },
+          ],
+        }
+      `);
+    });
+  });
 });
 //# sourceMappingURL=modernToLegacyWhereClause.test.js.map