@osdk/client 2.1.0-beta.9 → 2.1.0

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","field","bbox","filterType","topLeft","coordinates","bottomRight","makeGeoFilterPolygon","filter","process","env","NODE_ENV","objApiNamespace","apiName","fieldApiNamespace","fieldShortName","keysOfFilter","keys","hasDollarSign","some","key","startsWith","Error","JSON","stringify","firstKey","withinBody","Array","isArray","$bbox","$distance","$of","center","distance","unit","$polygon","intersectsBody","substring"],"sources":["modernToLegacyWhereClause.js"],"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 */\nimport { DistanceUnitMapping } from \"@osdk/api\";\nimport invariant from \"tiny-invariant\";\nexport function extractNamespace(fqApiName) {\n    const last = fqApiName.lastIndexOf(\".\");\n    if (last === -1)\n        return [undefined, fqApiName];\n    return [fqApiName.slice(0, last), fqApiName.slice(last + 1)];\n}\n/** @internal */\nexport function modernToLegacyWhereClause(whereClause, objectOrInterface) {\n    if (\"$and\" in whereClause) {\n        return {\n            type: \"and\",\n            value: whereClause.$and.map((clause) => modernToLegacyWhereClause(clause, objectOrInterface)),\n        };\n    }\n    else if (\"$or\" in whereClause) {\n        return {\n            type: \"or\",\n            value: whereClause.$or.map((clause) => modernToLegacyWhereClause(clause, objectOrInterface)),\n        };\n    }\n    else if (\"$not\" in whereClause) {\n        return {\n            type: \"not\",\n            value: modernToLegacyWhereClause(whereClause.$not, objectOrInterface),\n        };\n    }\n    const parts = Object.entries(whereClause);\n    if (parts.length === 1) {\n        return handleWherePair(parts[0], objectOrInterface);\n    }\n    return {\n        type: \"and\",\n        value: parts.map(v => handleWherePair(v, objectOrInterface)),\n    };\n}\nfunction makeGeoFilterBbox(field, bbox, filterType) {\n    return {\n        type: filterType === \"$within\"\n            ? \"withinBoundingBox\"\n            : \"intersectsBoundingBox\",\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}\nfunction makeGeoFilterPolygon(field, coordinates, filterType) {\n    return {\n        type: filterType,\n        field,\n        value: {\n            type: \"Polygon\",\n            coordinates,\n        },\n    };\n}\nfunction handleWherePair([field, filter], objectOrInterface) {\n    invariant(filter != null, \"Defined key values are only allowed when they are not undefined.\");\n    if (typeof filter === \"string\" || typeof filter === \"number\"\n        || typeof filter === \"boolean\") {\n        if (objectOrInterface.type === \"interface\") {\n            const [objApiNamespace] = extractNamespace(objectOrInterface.apiName);\n            const [fieldApiNamespace, fieldShortName] = extractNamespace(field);\n            if (fieldApiNamespace == null && objApiNamespace != null) {\n                field = `${objApiNamespace}.${fieldShortName}`;\n            }\n        }\n        return {\n            type: \"eq\",\n            field,\n            value: filter,\n        };\n    }\n    const keysOfFilter = Object.keys(filter);\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(!hasDollarSign\n        || keysOfFilter.length === 1, \"WhereClause Filter with multiple clauses isn't allowed\");\n    if (!hasDollarSign) {\n        // Future case for structs\n        throw new Error(`Unsupported filter. Did you forget to use a $-prefixed filter? (${JSON.stringify(filter)})`);\n    }\n    const firstKey = keysOfFilter[0];\n    invariant(filter[firstKey] != null);\n    if (firstKey === \"$ne\") {\n        return {\n            type: \"not\",\n            value: {\n                type: \"eq\",\n                field,\n                value: filter[firstKey],\n            },\n        };\n    }\n    if (firstKey === \"$within\") {\n        const withinBody = filter[firstKey];\n        if (Array.isArray(withinBody)) {\n            return makeGeoFilterBbox(field, withinBody, firstKey);\n        }\n        else if (\"$bbox\" in withinBody && withinBody.$bbox != null) {\n            return makeGeoFilterBbox(field, withinBody.$bbox, firstKey);\n        }\n        else if ((\"$distance\" in withinBody && \"$of\" in withinBody)\n            && withinBody.$distance != null\n            && withinBody.$of != null) {\n            return {\n                type: \"withinDistanceOf\",\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        }\n        else {\n            const coordinates = (\"$polygon\" in withinBody)\n                ? withinBody.$polygon\n                : withinBody.coordinates;\n            return makeGeoFilterPolygon(field, coordinates, \"withinPolygon\");\n        }\n    }\n    if (firstKey === \"$intersects\") {\n        const intersectsBody = filter[firstKey];\n        if (Array.isArray(intersectsBody)) {\n            return makeGeoFilterBbox(field, intersectsBody, firstKey);\n        }\n        else if (\"$bbox\" in intersectsBody && intersectsBody.$bbox != null) {\n            return makeGeoFilterBbox(field, intersectsBody.$bbox, firstKey);\n        }\n        else {\n            const coordinates = (\"$polygon\" in intersectsBody)\n                ? intersectsBody.$polygon\n                : intersectsBody.coordinates;\n            return makeGeoFilterPolygon(field, coordinates, \"intersectsPolygon\");\n        }\n    }\n    return {\n        type: firstKey.substring(1),\n        field,\n        value: filter[firstKey],\n    };\n}\n"],"mappings":"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","ignoreList":[]}
+{"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    \"WhereClause Filter with multiple clauses isn't allowed\",\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":[]}

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

@@ -13,7 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { objectTypeWithAllPropertyTypes } from "@osdk/client.test.ontology";
+
+import { BgaoNflPlayer, objectTypeWithAllPropertyTypes } from "@osdk/client.test.ontology";
 import { expectType } from "ts-expect";
 import { describe, expect, it } from "vitest";
 import { modernToLegacyWhereClause } from "./modernToLegacyWhereClause.js";
@@ -22,26 +23,98 @@ describe(modernToLegacyWhereClause, () => {
     describe("interfaces", () => {
       it("properly converts shortname to fqApiName", () => {
         const r = modernToLegacyWhereClause({
-          prop: 5
+          $and: [{
+            prop: {
+              $eq: 5
+            }
+          }, {
+            prop2: {
+              innerProp1: {
+                $eq: "myProp"
+              }
+            }
+          }]
         }, {
           type: "interface",
-          apiName: "a.Foo"
+          apiName: "a.Foo",
+          __DefinitionMetadata: {
+            type: "interface",
+            properties: {
+              "prop": {
+                type: "integer"
+              },
+              "prop2": {
+                type: {
+                  "innerProp1": "string",
+                  "innerProp2": "float"
+                }
+              }
+            },
+            apiName: "a.Foo",
+            displayName: "",
+            links: {},
+            rid: ""
+          }
         });
         expect(r).toMatchInlineSnapshot(`
           {
-            "field": "a.prop",
-            "type": "eq",
-            "value": 5,
+            "type": "and",
+            "value": [
+              {
+                "field": "a.prop",
+                "type": "eq",
+                "value": 5,
+              },
+              {
+                "field": undefined,
+                "propertyIdentifier": {
+                  "propertyApiName": "a.prop2",
+                  "structFieldApiName": "innerProp1",
+                  "type": "structField",
+                },
+                "type": "eq",
+                "value": "myProp",
+              },
+            ],
           }
         `);
       });
       it("properly does not convert when interface has no apiNamespace", () => {
         const r = modernToLegacyWhereClause({
           "b.prop": 5,
-          foo: 6
+          foo: 6,
+          "c.prop2": {
+            innerProp1: {
+              $eq: "myProp"
+            }
+          }
         }, {
           type: "interface",
-          apiName: "Foo"
+          apiName: "Foo",
+          __DefinitionMetadata: {
+            type: "interface",
+            properties: {
+              "foo": {
+                type: "integer"
+              },
+              "b.prop": {
+                type: "integer"
+              },
+              "prop": {
+                type: "integer"
+              },
+              "c.prop2": {
+                type: {
+                  "innerProp1": "string",
+                  "innerProp2": "float"
+                }
+              }
+            },
+            apiName: "Foo",
+            displayName: "",
+            links: {},
+            rid: ""
+          }
         });
         expect(r).toMatchInlineSnapshot(`
           {
@@ -57,6 +130,16 @@ describe(modernToLegacyWhereClause, () => {
                 "type": "eq",
                 "value": 6,
               },
+              {
+                "field": undefined,
+                "propertyIdentifier": {
+                  "propertyApiName": "c.prop2",
+                  "structFieldApiName": "innerProp1",
+                  "type": "structField",
+                },
+                "type": "eq",
+                "value": "myProp",
+              },
             ],
           }
         `);
@@ -64,10 +147,39 @@ describe(modernToLegacyWhereClause, () => {
       it("gracefully handles redundant apiNamespace in property", () => {
         const r = modernToLegacyWhereClause({
           "b.prop": 5,
-          "a.foo": 6
+          "a.foo": 6,
+          "c.prop2": {
+            innerProp1: {
+              $eq: "myProp"
+            }
+          }
         }, {
           type: "interface",
-          apiName: "a.Foo"
+          apiName: "a.Foo",
+          __DefinitionMetadata: {
+            type: "interface",
+            properties: {
+              "a.foo": {
+                type: "integer"
+              },
+              "b.prop": {
+                type: "integer"
+              },
+              "prop": {
+                type: "integer"
+              },
+              "c.prop2": {
+                type: {
+                  "innerProp1": "string",
+                  "innerProp2": "float"
+                }
+              }
+            },
+            apiName: "a.Foo",
+            displayName: "",
+            links: {},
+            rid: ""
+          }
         });
         expect(r).toMatchInlineSnapshot(`
           {
@@ -83,6 +195,16 @@ describe(modernToLegacyWhereClause, () => {
                 "type": "eq",
                 "value": 6,
               },
+              {
+                "field": undefined,
+                "propertyIdentifier": {
+                  "propertyApiName": "c.prop2",
+                  "structFieldApiName": "innerProp1",
+                  "type": "structField",
+                },
+                "type": "eq",
+                "value": "myProp",
+              },
             ],
           }
         `);
@@ -92,7 +214,25 @@ describe(modernToLegacyWhereClause, () => {
           "b.prop": 5
         }, {
           type: "interface",
-          apiName: "a.Foo"
+          apiName: "a.Foo",
+          __DefinitionMetadata: {
+            type: "interface",
+            properties: {
+              "a.foo": {
+                type: "integer"
+              },
+              "b.prop": {
+                type: "integer"
+              },
+              "prop": {
+                type: "integer"
+              }
+            },
+            apiName: "a.Foo",
+            displayName: "",
+            links: {},
+            rid: ""
+          }
         })).toMatchInlineSnapshot(`
           {
             "field": "b.prop",
@@ -107,12 +247,27 @@ describe(modernToLegacyWhereClause, () => {
         const r = modernToLegacyWhereClause({
           prop: 5
         }, {
-          type: "object",
-          apiName: "a.Foo"
+          type: "interface",
+          apiName: "a.Foo",
+          __DefinitionMetadata: {
+            type: "interface",
+            properties: {
+              "a.foo": {
+                type: "integer"
+              },
+              "prop": {
+                type: "integer"
+              }
+            },
+            apiName: "a.Foo",
+            displayName: "",
+            links: {},
+            rid: ""
+          }
         });
         expect(r).toMatchInlineSnapshot(`
           {
-            "field": "prop",
+            "field": "a.prop",
             "type": "eq",
             "value": 5,
           }
@@ -509,6 +664,239 @@ describe(modernToLegacyWhereClause, () => {
         }
       `);
       });
+      it("converts $containsAllTerms correctly if using new type", () => {
+        expect(modernToLegacyWhereClause({
+          string: {
+            $containsAllTerms: {
+              term: "test",
+              fuzzySearch: true
+            }
+          }
+        }, objectTypeWithAllPropertyTypes)).toMatchInlineSnapshot(`
+        {
+          "field": "string",
+          "fuzzy": true,
+          "type": "containsAllTerms",
+          "value": "test",
+        }
+      `);
+        expect(modernToLegacyWhereClause({
+          string: {
+            $containsAllTerms: {
+              term: "test",
+              fuzzySearch: false
+            }
+          }
+        }, objectTypeWithAllPropertyTypes)).toMatchInlineSnapshot(`
+        {
+          "field": "string",
+          "fuzzy": false,
+          "type": "containsAllTerms",
+          "value": "test",
+        }
+      `);
+        expect(modernToLegacyWhereClause({
+          string: {
+            $containsAllTerms: {
+              term: "test"
+            }
+          }
+        }, objectTypeWithAllPropertyTypes)).toMatchInlineSnapshot(`
+        {
+          "field": "string",
+          "fuzzy": false,
+          "type": "containsAllTerms",
+          "value": "test",
+        }
+      `);
+      });
+      it("converts $containsAllTerms correctly if using old type", () => {
+        expect(modernToLegacyWhereClause({
+          string: {
+            $containsAllTerms: "test"
+          }
+        }, objectTypeWithAllPropertyTypes)).toMatchInlineSnapshot(`
+        {
+          "field": "string",
+          "fuzzy": false,
+          "type": "containsAllTerms",
+          "value": "test",
+        }
+      `);
+      });
+      it("converts $containsAnyTerm correctly if using new type", () => {
+        expect(modernToLegacyWhereClause({
+          string: {
+            $containsAnyTerm: {
+              term: "test",
+              fuzzySearch: true
+            }
+          }
+        }, objectTypeWithAllPropertyTypes)).toMatchInlineSnapshot(`
+        {
+          "field": "string",
+          "fuzzy": true,
+          "type": "containsAnyTerm",
+          "value": "test",
+        }
+      `);
+        expect(modernToLegacyWhereClause({
+          string: {
+            $containsAnyTerm: {
+              term: "test",
+              fuzzySearch: false
+            }
+          }
+        }, objectTypeWithAllPropertyTypes)).toMatchInlineSnapshot(`
+        {
+          "field": "string",
+          "fuzzy": false,
+          "type": "containsAnyTerm",
+          "value": "test",
+        }
+      `);
+        expect(modernToLegacyWhereClause({
+          string: {
+            $containsAnyTerm: {
+              term: "test"
+            }
+          }
+        }, objectTypeWithAllPropertyTypes)).toMatchInlineSnapshot(`
+        {
+          "field": "string",
+          "fuzzy": false,
+          "type": "containsAnyTerm",
+          "value": "test",
+        }
+      `);
+      });
+      it("converts $containsAnyTerm correctly if using old type", () => {
+        expect(modernToLegacyWhereClause({
+          string: {
+            $containsAnyTerm: "test"
+          }
+        }, objectTypeWithAllPropertyTypes)).toMatchInlineSnapshot(`
+        {
+          "field": "string",
+          "fuzzy": false,
+          "type": "containsAnyTerm",
+          "value": "test",
+        }
+      `);
+      });
+      it("converts struct where clauses correctly", () => {
+        expect(modernToLegacyWhereClause({
+          address: {
+            state: {
+              $eq: "NJ"
+            }
+          }
+        }, BgaoNflPlayer)).toMatchInlineSnapshot(`
+          {
+            "field": undefined,
+            "propertyIdentifier": {
+              "propertyApiName": "address",
+              "structFieldApiName": "state",
+              "type": "structField",
+            },
+            "type": "eq",
+            "value": "NJ",
+          }
+        `);
+        expect(modernToLegacyWhereClause({
+          $and: [{
+            address: {
+              state: {
+                $eq: "NJ"
+              }
+            }
+          }, {
+            address: {
+              city: {
+                $containsAnyTerm: "N"
+              }
+            }
+          }]
+        }, BgaoNflPlayer)).toMatchInlineSnapshot(`
+        {
+          "type": "and",
+          "value": [
+            {
+              "field": undefined,
+              "propertyIdentifier": {
+                "propertyApiName": "address",
+                "structFieldApiName": "state",
+                "type": "structField",
+              },
+              "type": "eq",
+              "value": "NJ",
+            },
+            {
+              "field": undefined,
+              "fuzzy": false,
+              "propertyIdentifier": {
+                "propertyApiName": "address",
+                "structFieldApiName": "city",
+                "type": "structField",
+              },
+              "type": "containsAnyTerm",
+              "value": "N",
+            },
+          ],
+        }
+      `);
+        expect(modernToLegacyWhereClause({
+          $or: [{
+            address: {
+              state: {
+                $eq: "NJ"
+              }
+            }
+          }, {
+            address: {
+              city: {
+                $containsAnyTerm: "N"
+              }
+            }
+          }, {
+            gamesPlayed: {
+              $gt: 5
+            }
+          }]
+        }, BgaoNflPlayer)).toMatchInlineSnapshot(`
+      {
+        "type": "or",
+        "value": [
+          {
+            "field": undefined,
+            "propertyIdentifier": {
+              "propertyApiName": "address",
+              "structFieldApiName": "state",
+              "type": "structField",
+            },
+            "type": "eq",
+            "value": "NJ",
+          },
+          {
+            "field": undefined,
+            "fuzzy": false,
+            "propertyIdentifier": {
+              "propertyApiName": "address",
+              "structFieldApiName": "city",
+              "type": "structField",
+            },
+            "type": "containsAnyTerm",
+            "value": "N",
+          },
+          {
+            "field": "gamesPlayed",
+            "type": "gt",
+            "value": 5,
+          },
+        ],
+      }
+    `);
+      });
     });
     describe("multiple checks", () => {
       it("properly handles multiple simple where checks", () => {