@osdk/client 2.6.0-beta.6 → 2.6.0-beta.7

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @osdk/client
 
+## 2.6.0-beta.7
+
+### Minor Changes
+
+- 507ec7f: Allows top level filters with an implied and clause to support a combination of a not and and clause
+
+### Patch Changes
+
+- @osdk/api@2.6.0-beta.7
+- @osdk/client.unstable@2.6.0-beta.7
+- @osdk/generator-converters@2.6.0-beta.7
+
 ## 2.6.0-beta.6
 
 ### Minor Changes

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

@@ -30,6 +30,22 @@ function isNotClause(whereClause) {
 
 /** @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 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",
@@ -46,14 +62,7 @@ export function modernToLegacyWhereClause(whereClause, objectOrInterface, rdpNam
       value: modernToLegacyWhereClause(whereClause.$not, objectOrInterface, rdpNames)
     };
   }
-  const parts = Object.entries(whereClause);
-  if (parts.length === 1) {
-    return handleWherePair(parts[0], objectOrInterface, undefined, rdpNames);
-  }
-  return {
-    type: "and",
-    value: parts.map(v => handleWherePair(v, objectOrInterface, undefined, rdpNames))
-  };
+  return handleWherePair(parts[0], objectOrInterface, undefined, rdpNames);
 }
 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;
@@ -67,6 +76,7 @@ function handleWherePair([fieldName, filter], objectOrInterface, structFieldSele
     propertyApiName: fullyQualifyPropName(structFieldSelector.propertyApiName, 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",

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

@@ -1 +1 @@
-{"version":3,"file":"modernToLegacyWhereClause.js","names":["invariant","fullyQualifyPropName","makeGeoFilterIntersects","makeGeoFilterWithin","isAndClause","whereClause","$and","undefined","isOrClause","$or","isNotClause","$not","modernToLegacyWhereClause","objectOrInterface","rdpNames","type","value","map","clause","parts","Object","entries","length","handleWherePair","v","fieldName","filter","structFieldSelector","process","env","NODE_ENV","isRdp","has","propertyIdentifier","apiName","propertyApiName","field","keysOfFilter","keys","hasDollarSign","some","key","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  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  const parts = Object.entries(whereClause);\n\n  if (parts.length === 1) {\n    return handleWherePair(parts[0], objectOrInterface, undefined, rdpNames);\n  }\n\n  return {\n    type: \"and\",\n    value: parts.map<SearchJsonQueryV2>(\n      v => handleWherePair(v, objectOrInterface, undefined, rdpNames),\n    ),\n  };\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  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    }, rdpNames);\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    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  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    invariant(\n      structFilter[0][1] != null\n        && Object.keys(structFilter[0][1]).length === 1\n        && \"$eq\" in structFilter[0][1],\n      \"Cannot filter on a struct field in an array with anything other than a single $eq\",\n    );\n    return {\n      type: \"contains\",\n      propertyIdentifier: {\n        type: \"structField\",\n        propertyApiName: fieldName,\n        structFieldApiName,\n      },\n      value: structFilter[0][1][\"$eq\"],\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":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAgBA,OAAOA,SAAS,MAAM,gBAAgB;AACtC,SAASC,oBAAoB,QAAQ,2BAA2B;AAChE,SAASC,uBAAuB,QAAQ,8BAA8B;AACtE,SAASC,mBAAmB,QAAQ,0BAA0B;AAK9D,SAASC,WAAWA,CAIlBC,WAAiC,EACO;EACxC,OAAO,MAAM,IAAIA,WAAW,IAAIA,WAAW,CAACC,IAAI,KAAKC,SAAS;AAChE;AAEA,SAASC,UAAUA,CAIjBH,WAAiC,EACM;EACvC,OAAO,KAAK,IAAIA,WAAW,IAAIA,WAAW,CAACI,GAAG,KAAKF,SAAS;AAC9D;AAEA,SAASG,WAAWA,CAIlBL,WAAiC,EACO;EACxC,OAAO,MAAM,IAAIA,WAAW,IAAIA,WAAW,CAACM,IAAI,KAAKJ,SAAS;AAChE;;AAEA;AACA,OAAO,SAASK,yBAAyBA,CAIvCP,WAAiC,EACjCQ,iBAAoB,EACpBC,QAAsB,EACH;EACnB,IAAIV,WAAW,CAACC,WAAW,CAAC,EAAE;IAC5B,OAAO;MACLU,IAAI,EAAE,KAAK;MACXC,KAAK,EAAGX,WAAW,CAACC,IAAI,CAA4BW,GAAG,CACpDC,MAAM,IACLN,yBAAyB,CAACM,MAAM,EAAEL,iBAAiB,EAAEC,QAAQ,CACjE;IACF,CAAC;EACH,CAAC,MAAM,IAAIN,UAAU,CAACH,WAAW,CAAC,EAAE;IAClC,OAAO;MACLU,IAAI,EAAE,IAAI;MACVC,KAAK,EAAGX,WAAW,CAACI,GAAG,CAA4BQ,GAAG,CACnDC,MAAM,IACLN,yBAAyB,CAACM,MAAM,EAAEL,iBAAiB,EAAEC,QAAQ,CACjE;IACF,CAAC;EACH,CAAC,MAAM,IAAIJ,WAAW,CAACL,WAAW,CAAC,EAAE;IACnC,OAAO;MACLU,IAAI,EAAE,KAAK;MACXC,KAAK,EAAEJ,yBAAyB,CAC9BP,WAAW,CAACM,IAAI,EAChBE,iBAAiB,EACjBC,QACF;IACF,CAAC;EACH;EAEA,MAAMK,KAAK,GAAGC,MAAM,CAACC,OAAO,CAAChB,WAAW,CAAC;EAEzC,IAAIc,KAAK,CAACG,MAAM,KAAK,CAAC,EAAE;IACtB,OAAOC,eAAe,CAACJ,KAAK,CAAC,CAAC,CAAC,EAAEN,iBAAiB,EAAEN,SAAS,EAAEO,QAAQ,CAAC;EAC1E;EAEA,OAAO;IACLC,IAAI,EAAE,KAAK;IACXC,KAAK,EAAEG,KAAK,CAACF,GAAG,CACdO,CAAC,IAAID,eAAe,CAACC,CAAC,EAAEX,iBAAiB,EAAEN,SAAS,EAAEO,QAAQ,CAChE;EACF,CAAC;AACH;AAEA,SAASS,eAAeA,CACtB,CAACE,SAAS,EAAEC,MAAM,CAAgB,EAClCb,iBAA8C,EAC9Cc,mBAA6E,EAC7Eb,QAAsB,EACH;EACnB,EACEY,MAAM,IAAI,IAAI,IAAAE,OAAA,CAAAC,GAAA,CAAAC,QAAA,oBADhB9B,SAAS,QAEP,kEAAkE,IAFpEA,SAAS;EAKT,MAAM+B,KAAK,GAAG,CAACJ,mBAAmB,IAAIb,QAAQ,EAAEkB,GAAG,CAACP,SAAS,CAAC;EAE9D,MAAMQ,kBAAkD,GAAGF,KAAK,GAC5D;IACAhB,IAAI,EAAE,UAAU;IAChBmB,OAAO,EAAET;EACX,CAAC,GACCE,mBAAmB,IAAI,IAAI,GAC3B;IACAZ,IAAI,EAAE,aAAa;IACnB,GAAGY,mBAAmB;IACtBQ,eAAe,EAAElC,oBAAoB,CACnC0B,mBAAmB,CAACQ,eAAe,EACnCtB,iBACF;EACF,CAAC,GACCN,SAAS;EAEb,MAAM6B,KAAK,GAAG,CAACL,KAAK,IAAIJ,mBAAmB,IAAI,IAAI,GAC/C1B,oBAAoB,CAACwB,SAAS,EAAEZ,iBAAiB,CAAC,GAClDN,SAAS;EAEb,IACE,OAAOmB,MAAM,KAAK,QAAQ,IAAI,OAAOA,MAAM,KAAK,QAAQ,IACrD,OAAOA,MAAM,KAAK,SAAS,EAC9B;IAEA,OAAO;MACLX,IAAI,EAAE,IAAI;MACV,IAAIkB,kBAAkB,IAAI,IAAI,IACzB;QAAEA;MAAmB,CAAC,CAAC;MAC5BG,KAAK;MACLpB,KAAK,EAAEU;IACT,CAAC;EACH;EAEA,MAAMW,YAAY,GAAGjB,MAAM,CAACkB,IAAI,CAACZ,MAAM,CAAC;;EAExC;EACA;EACA,MAAMa,aAAa,GAAGF,YAAY,CAACG,IAAI,CAAEC,GAAG,IAAKA,GAAG,CAACC,UAAU,CAAC,GAAG,CAAC,CAAC;EACrE,EACE,CAACH,aAAa,IACTF,YAAY,CAACf,MAAM,KAAK,CAAC,IAAAM,OAAA,CAAAC,GAAA,CAAAC,QAAA,oBAFhC9B,SAAS,QAGP,kIAAkI,IAHpIA,SAAS;EAMT,IAAI,CAACuC,aAAa,EAAE;IAClB,MAAMI,YAAY,GAAGvB,MAAM,CAACC,OAAO,CAACK,MAAM,CAAC;IAC3C,EACEiB,YAAY,CAACrB,MAAM,KAAK,CAAC,IAAAM,OAAA,CAAAC,GAAA,CAAAC,QAAA,oBAD3B9B,SAAS,QAEP,2FAA2F,IAF7FA,SAAS;IAIT,MAAM4C,kBAAkB,GAAGP,YAAY,CAAC,CAAC,CAAC;IAC1C,OAAOd,eAAe,CAACH,MAAM,CAACC,OAAO,CAACK,MAAM,CAAC,CAAC,CAAC,CAAC,EAAEb,iBAAiB,EAAE;MACnEsB,eAAe,EAAEV,SAAS;MAC1BmB;IACF,CAAC,EAAE9B,QAAQ,CAAC;EACd;EAEA,MAAM+B,QAAQ,GAAGR,YAAY,CAAC,CAAC,CAA+B;EAC9D,EAAUX,MAAM,CAACmB,QAAQ,CAAC,IAAI,IAAI,IAAAjB,OAAA,CAAAC,GAAA,CAAAC,QAAA,oBAAlC9B,SAAS,UAATA,SAAS;EAET,IAAI6C,QAAQ,KAAK,KAAK,EAAE;IACtB,OAAO;MACL9B,IAAI,EAAE,KAAK;MACXC,KAAK,EAAE;QACLD,IAAI,EAAE,IAAI;QACV,IAAIkB,kBAAkB,IAAI,IAAI,IAAI;UAAEA;QAAmB,CAAC,CAAC;QACzDG,KAAK;QACLpB,KAAK,EAAEU,MAAM,CAACmB,QAAQ;MACxB;IACF,CAAC;EACH;EAEA,IAAIA,QAAQ,KAAK,SAAS,EAAE;IAC1B,OAAO1C,mBAAmB,CAACuB,MAAM,CAACmB,QAAQ,CAAC,EAAEZ,kBAAkB,EAAEG,KAAK,CAAC;EACzE;EACA,IAAIS,QAAQ,KAAK,aAAa,EAAE;IAC9B,OAAO3C,uBAAuB,CAACwB,MAAM,CAACmB,QAAQ,CAAC,EAAEZ,kBAAkB,EAAEG,KAAK,CAAC;EAC7E;EAEA,IAAIS,QAAQ,KAAK,mBAAmB,IAAIA,QAAQ,KAAK,kBAAkB,EAAE;IACvE,OAAO;MACL9B,IAAI,EAAE8B,QAAQ,CAACC,SAAS,CAAC,CAAC,CAAoC;MAC9D,IAAIb,kBAAkB,IAAI,IAAI,IAAI;QAAEA;MAAmB,CAAC,CAAC;MACzDG,KAAK;MACLpB,KAAK,EAAE,OAAOU,MAAM,CAACmB,QAAQ,CAAC,KAAK,QAAQ,GACvCnB,MAAM,CAACmB,QAAQ,CAAC,GAChBnB,MAAM,CAACmB,QAAQ,CAAC,CAAC,MAAM,CAAC;MAC5BE,KAAK,EAAE,OAAOrB,MAAM,CAACmB,QAAQ,CAAC,KAAK,QAAQ,GACvC,KAAK,GACLnB,MAAM,CAACmB,QAAQ,CAAC,CAAC,aAAa,CAAC,IAAI;IACzC,CAAC;EACH;EAEA,IAAIA,QAAQ,KAAK,WAAW,IAAInB,MAAM,CAACmB,QAAQ,CAAC,YAAYzB,MAAM,EAAE;IAClE,MAAMuB,YAA6B,GAAGvB,MAAM,CAACC,OAAO,CAACK,MAAM,CAACmB,QAAQ,CAAC,CAAC;IACtE,EACEF,YAAY,CAACrB,MAAM,KAAK,CAAC,IAAAM,OAAA,CAAAC,GAAA,CAAAC,QAAA,oBAD3B9B,SAAS,QAEP,2FAA2F,IAF7FA,SAAS;IAIT,MAAM4C,kBAAkB,GAAGD,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7C,EACEA,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,IACrBvB,MAAM,CAACkB,IAAI,CAACK,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAACrB,MAAM,KAAK,CAAC,IAC5C,KAAK,IAAIqB,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAAf,OAAA,CAAAC,GAAA,CAAAC,QAAA,oBAHlC9B,SAAS,QAIP,mFAAmF,IAJrFA,SAAS;IAMT,OAAO;MACLe,IAAI,EAAE,UAAU;MAChBkB,kBAAkB,EAAE;QAClBlB,IAAI,EAAE,aAAa;QACnBoB,eAAe,EAAEV,SAAS;QAC1BmB;MACF,CAAC;MACD5B,KAAK,EAAE2B,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK;IACjC,CAAC;EACH;EAEA,OAAO;IACL5B,IAAI,EAAE8B,QAAQ,CAACC,SAAS,CAAC,CAAC,CAAoC;IAC9D,IAAIb,kBAAkB,IAAI,IAAI,IAAI;MAAEA;IAAmB,CAAC,CAAC;IACzDG,KAAK;IACLpB,KAAK,EAAEU,MAAM,CAACmB,QAAQ;EACxB,CAAC;AACH","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  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  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  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    invariant(\n      structFilter[0][1] != null\n        && Object.keys(structFilter[0][1]).length === 1\n        && \"$eq\" in structFilter[0][1],\n      \"Cannot filter on a struct field in an array with anything other than a single $eq\",\n    );\n    return {\n      type: \"contains\",\n      propertyIdentifier: {\n        type: \"structField\",\n        propertyApiName: fieldName,\n        structFieldApiName,\n      },\n      value: structFilter[0][1][\"$eq\"],\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

@@ -983,6 +983,80 @@ 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",
@@ -1022,28 +1096,36 @@ describe(modernToLegacyWhereClause, () => {
         },
         managerName: "John"
       }, mockObjectType, rdpNames);
-      expect(result).toEqual({
-        type: "and",
-        value: [{
-          type: "eq",
-          field: "department",
-          value: "Engineering"
-        }, {
-          type: "gte",
-          propertyIdentifier: {
-            type: "property",
-            apiName: "reportCount"
-          },
-          value: 5
-        }, {
-          type: "eq",
-          propertyIdentifier: {
-            type: "property",
-            apiName: "managerName"
-          },
-          value: "John"
-        }]
-      });
+      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"]);
@@ -1056,21 +1138,27 @@ describe(modernToLegacyWhereClause, () => {
           }
         }]
       }, mockObjectType, rdpNames);
-      expect(result).toEqual({
-        type: "and",
-        value: [{
-          type: "eq",
-          field: "department",
-          value: "Engineering"
-        }, {
-          type: "gte",
-          propertyIdentifier: {
-            type: "property",
-            apiName: "reportCount"
-          },
-          value: 5
-        }]
-      });
+      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"]);
@@ -1092,34 +1180,54 @@ describe(modernToLegacyWhereClause, () => {
       }, mockObjectType, rdpNames);
 
       // The actual structure flattens the nested $and differently
-      expect(result).toEqual({
-        type: "and",
-        value: [{
-          type: "or",
-          value: [{
-            type: "eq",
-            field: "status",
-            value: "active"
-          }, {
-            type: "gte",
-            propertyIdentifier: {
-              type: "property",
-              apiName: "reportCount"
+      expect(result).toMatchInlineSnapshot(`
+        {
+          "type": "and",
+          "value": [
+            {
+              "field": "department",
+              "type": "eq",
+              "value": "Engineering",
             },
-            value: 10
-          }]
-        }, {
-          type: "not",
-          value: {
-            type: "eq",
-            propertyIdentifier: {
-              type: "property",
-              apiName: "managerName"
+            {
+              "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",
+                  },
+                },
+              ],
             },
-            value: "Admin"
-          }
-        }]
-      });
+          ],
+        }
+      `);
     });
   });
 });