RDP's in TS OSDK

.changeset/forty-eggs-check.md

@@ -0,0 +1,7 @@
+---
+"@osdk/shared.test": minor
+"@osdk/client": minor
+"@osdk/api": minor
+---
+
+Adds support for runtime derived properties

etc/api.report.api.md

@@ -589,6 +589,10 @@ export interface ObjectSet<Q extends ObjectOrInterfaceDefinition = any, _UNUSED
     };
     readonly subtract: (...objectSets: ReadonlyArray<CompileTimeMetadata<Q>["objectSet"]>) => this;
     readonly union: (...objectSets: ReadonlyArray<CompileTimeMetadata<Q>["objectSet"]>) => this;
+    // Warning: (ae-forgotten-export) The symbol "WithPropertiesObjectDefinition" needs to be exported by the entry point index.d.ts
+    //
+    // (undocumented)
+    readonly withProperties: <D extends WithPropertiesClause<Q>>(clause: D) => ObjectSet<WithPropertiesObjectDefinition<Q, D>>;
 }
 
 // @public (undocumented)
@@ -941,12 +945,13 @@ export type TimeSeriesQuery = {
 // @public (undocumented)
 export type TwoDimensionalQueryAggregationDefinition = AggregationKeyDataType<"date" | "double" | "timestamp">;
 
-// Warning: (ae-forgotten-export) The symbol "AGG_FOR_TYPE" needs to be exported by the entry point index.d.ts
+// Warning: (ae-forgotten-export) The symbol "StringAggregateOption" needs to be exported by the entry point index.d.ts
+// Warning: (ae-forgotten-export) The symbol "NumericAggregateOption" needs to be exported by the entry point index.d.ts
 // Warning: (ae-forgotten-export) The symbol "PropertyValueClientToWire" needs to be exported by the entry point index.d.ts
 //
 // @public (undocumented)
-export type ValidAggregationKeys<Q extends ObjectOrInterfaceDefinition> = keyof ({
-    [KK in AggregatableKeys<Q> as `${KK & string}:${AGG_FOR_TYPE<PropertyValueClientToWire[CompileTimeMetadata<Q>["properties"][KK]["type"]]>}`]?: any;
+export type ValidAggregationKeys<Q extends ObjectOrInterfaceDefinition, StringOptions extends string = StringAggregateOption, NumericOptions extends string = NumericAggregateOption> = keyof ({
+    [KK in AggregatableKeys<Q> as `${KK & string}:${number extends PropertyValueClientToWire[CompileTimeMetadata<Q>["properties"][KK]["type"]] ? NumericOptions : string extends PropertyValueClientToWire[CompileTimeMetadata<Q>["properties"][KK]["type"]] ? StringOptions : never}`]?: any;
 } & {
     $count?: any;
 });
@@ -972,10 +977,29 @@ export type WhereClause<T extends ObjectOrInterfaceDefinition> = OrWhereClause<T
 // @public (undocumented)
 export type WirePropertyTypes = "string" | "datetime" | "double" | "boolean" | "integer" | "timestamp" | "short" | "long" | "float" | "decimal" | "byte" | "marking" | "numericTimeseries" | "stringTimeseries" | "sensorTimeseries" | "attachment" | "geopoint" | "geoshape" | "geotimeSeriesReference";
 
+// @public (undocumented)
+export type WithPropertiesClause<Q extends ObjectOrInterfaceDefinition> = {
+    [key: string]: (baseObjectSet: BaseWithPropertyObjectSet<Q>) => WithPropertyDefinition<ObjectMetadata.Property>;
+};
+
+// @public (undocumented)
+export type WithPropertyDefinition<T extends ObjectMetadata.Property> = {
+    definitionId: unknown;
+    type: T;
+};
+
+// Warning: (ae-forgotten-export) The symbol "AggregatableWithPropertyObjectSet" needs to be exported by the entry point index.d.ts
+// Warning: (ae-forgotten-export) The symbol "SingleLinkWithPropertyObjectSet" needs to be exported by the entry point index.d.ts
+//
+// @public (undocumented)
+export interface WithPropertyObjectSet<Q extends ObjectOrInterfaceDefinition> extends BaseWithPropertyObjectSet<Q>, AggregatableWithPropertyObjectSet<Q>, SingleLinkWithPropertyObjectSet<Q> {
+}
+
 // Warnings were encountered during analysis:
 //
 // src/aggregate/AggregateOpts.ts:26:3 - (ae-forgotten-export) The symbol "UnorderedAggregationClause" needs to be exported by the entry point index.d.ts
 // src/aggregate/AggregateOpts.ts:26:3 - (ae-forgotten-export) The symbol "OrderedAggregationClause" needs to be exported by the entry point index.d.ts
+// src/derivedProperties/WithPropertiesClause.ts:36:3 - (ae-forgotten-export) The symbol "BaseWithPropertyObjectSet" needs to be exported by the entry point index.d.ts
 
 // (No @packageDocumentation comment for this package)
 

packages/api/src/aggregate/AggregatableKeys.ts

@@ -36,14 +36,19 @@ type AGG_FOR_TYPE<T> = number extends T ? NumericAggregateOption
 
 export type ValidAggregationKeys<
   Q extends ObjectOrInterfaceDefinition,
+  StringOptions extends string = StringAggregateOption,
+  NumericOptions extends string = NumericAggregateOption,
 > = keyof (
   & {
     [
-      KK in AggregatableKeys<Q> as `${KK & string}:${AGG_FOR_TYPE<
+      KK in AggregatableKeys<Q> as `${KK & string}:${number extends
         PropertyValueClientToWire[
           CompileTimeMetadata<Q>["properties"][KK]["type"]
-        ]
-      >}`
+        ] ? NumericOptions
+        : string extends PropertyValueClientToWire[
+          CompileTimeMetadata<Q>["properties"][KK]["type"]
+        ] ? StringOptions
+        : never}`
     ]?: any;
   }
   & { $count?: any }

packages/api/src/derivedProperties/WithPropertiesClause.ts

@@ -0,0 +1,39 @@
+/*
+ * Copyright 2024 Palantir Technologies, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import type {
+  ObjectOrInterfaceDefinition,
+} from "../ontology/ObjectOrInterface.js";
+import type {
+  ObjectMetadata,
+  PropertyDef,
+} from "../ontology/ObjectTypeDefinition.js";
+import type { BaseWithPropertyObjectSet } from "./WithPropertyObjectSet.js";
+
+export type WithPropertyDefinition<
+  T extends ObjectMetadata.Property,
+> = {
+  definitionId: unknown;
+  type: T;
+};
+
+export type WithPropertiesClause<
+  Q extends ObjectOrInterfaceDefinition,
+> = {
+  [key: string]: (
+    baseObjectSet: BaseWithPropertyObjectSet<Q>,
+  ) => WithPropertyDefinition<ObjectMetadata.Property>;
+};

packages/api/src/derivedProperties/WithPropertyObjectSet.ts

@@ -0,0 +1,119 @@
+/*
+ * Copyright 2024 Palantir Technologies, Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import type { ValidAggregationKeys } from "../aggregate/AggregatableKeys.js";
+import type { WhereClause } from "../aggregate/WhereClause.js";
+import type {
+  ObjectOrInterfaceDefinition,
+  PropertyKeys,
+} from "../ontology/ObjectOrInterface.js";
+import type {
+  CompileTimeMetadata,
+  PropertyDef,
+} from "../ontology/ObjectTypeDefinition.js";
+import type { LinkedType, LinkNames } from "../util/LinkUtils.js";
+import type { WithPropertyDefinition } from "./WithPropertiesClause.js";
+
+export interface WithPropertyObjectSet<Q extends ObjectOrInterfaceDefinition>
+  extends
+    BaseWithPropertyObjectSet<Q>,
+    AggregatableWithPropertyObjectSet<Q>,
+    SingleLinkWithPropertyObjectSet<Q>
+{}
+
+export interface BaseWithPropertyObjectSet<
+  Q extends ObjectOrInterfaceDefinition,
+> extends FilterableDeriveObjectSet<Q> {
+  readonly pivotTo: <L extends LinkNames<Q>>(
+    type: L,
+  ) => NonNullable<CompileTimeMetadata<Q>["links"][L]["multiplicity"]> extends
+    false ? SingleLinkWithPropertyObjectSet<LinkedType<Q, L>>
+    : ManyLinkWithPropertyObjectSet<LinkedType<Q, L>>;
+}
+
+interface FilterableDeriveObjectSet<
+  Q extends ObjectOrInterfaceDefinition,
+> {
+  readonly where: (
+    clause: WhereClause<Q>,
+  ) => this;
+}
+
+type CollectAggregations = "collectSet" | "collectList";
+
+type BaseAggregations =
+  | "approximateDistinct"
+  | "exactDistinct"
+  | "approximatePercentile";
+
+type StringDeriveAggregateOption =
+  | BaseAggregations
+  | CollectAggregations;
+
+type NumericDeriveAggregateOption =
+  | "min"
+  | "max"
+  | "sum"
+  | "avg"
+  | BaseAggregations
+  | CollectAggregations;
+
+interface AggregatableWithPropertyObjectSet<
+  Q extends ObjectOrInterfaceDefinition,
+> extends FilterableDeriveObjectSet<Q> {
+  readonly aggregate: <
+    V extends ValidAggregationKeys<
+      Q,
+      StringDeriveAggregateOption,
+      NumericDeriveAggregateOption
+    >,
+  >(
+    aggregationSpecifier: V,
+    opts?: V extends `${any}:${infer P}`
+      ? P extends CollectAggregations ? { limit: number }
+      : P extends "approximatePercentile" ? { percentile: number }
+      : never
+      : never,
+  ) => WithPropertyDefinition<
+    V extends `${infer N}:${infer P}`
+      ? P extends CollectAggregations ? PropertyDef<
+          CompileTimeMetadata<Q>["properties"][N]["type"],
+          "nullable",
+          "array"
+        >
+      : P extends "approximateDistinct" | "exactDistinct" | "$count"
+        ? PropertyDef<"integer">
+      : PropertyDef<"double">
+      : V extends "$count" ? PropertyDef<"integer">
+      : never
+  >;
+}
+
+interface SingleLinkWithPropertyObjectSet<
+  Q extends ObjectOrInterfaceDefinition,
+> extends AggregatableWithPropertyObjectSet<Q>, BaseWithPropertyObjectSet<Q> {
+  readonly selectProperty: <R extends PropertyKeys<Q>>(
+    propertyName: R,
+  ) => WithPropertyDefinition<CompileTimeMetadata<Q>["properties"][R]>;
+}
+
+interface ManyLinkWithPropertyObjectSet<
+  Q extends ObjectOrInterfaceDefinition,
+> extends AggregatableWithPropertyObjectSet<Q> {
+  readonly pivotTo: <L extends LinkNames<Q>>(
+    type: L,
+  ) => ManyLinkWithPropertyObjectSet<LinkedType<Q, L>>;
+}

packages/api/src/index.ts

@@ -41,6 +41,14 @@ export type {
   OsdkObjectLinksObject,
   SingleLinkAccessor,
 } from "./definitions/LinkDefinitions.js";
+export type {
+  WithPropertiesClause,
+  WithPropertyDefinition,
+} from "./derivedProperties/WithPropertiesClause.js";
+export type {
+  WithPropertyObjectSet,
+} from "./derivedProperties/WithPropertyObjectSet.js";
+
 export { DurationMapping } from "./groupby/GroupByClause.js";
 export type {
   AllGroupByValues,

packages/api/src/objectSet/ObjectSet.ts

@@ -18,6 +18,11 @@ import type { AggregateOpts } from "../aggregate/AggregateOpts.js";
 import type { AggregateOptsThatErrorsAndDisallowsOrderingWithMultipleGroupBy } from "../aggregate/AggregateOptsThatErrors.js";
 import type { AggregationsResults } from "../aggregate/AggregationsResults.js";
 import type { WhereClause } from "../aggregate/WhereClause.js";
+import type {
+  WithPropertiesClause,
+  WithPropertyDefinition,
+} from "../derivedProperties/WithPropertiesClause.js";
+import type { PropertyValueWireToClient } from "../mapping/PropertyValueMapping.js";
 import type {
   AsyncIterArgs,
   Augments,
@@ -34,7 +39,9 @@ import type {
 } from "../ontology/ObjectOrInterface.js";
 import type {
   CompileTimeMetadata,
+  ObjectMetadata,
   ObjectTypeDefinition,
+  PropertyDef,
 } from "../ontology/ObjectTypeDefinition.js";
 import type { PrimaryKeyType } from "../OsdkBase.js";
 import type { ExtractOptions, Osdk } from "../OsdkObjectFrom.js";
@@ -254,4 +261,36 @@ export interface ObjectSet<
     listener: ObjectSetListener<Q, P>,
     opts?: ObjectSetListenerOptions<Q, P>,
   ) => { unsubscribe: () => void };
+
+  readonly withProperties: <
+    D extends WithPropertiesClause<Q>,
+  >(
+    clause: D,
+  ) => ObjectSet<
+    WithPropertiesObjectDefinition<
+      Q,
+      D
+    >
+  >;
 }
+
+type WithPropertiesObjectDefinition<
+  K extends ObjectOrInterfaceDefinition,
+  D extends WithPropertiesClause<K>,
+> = {
+  __DefinitionMetadata: {
+    properties: {
+      [T in Extract<keyof D, string>]: D[T] extends
+        (baseObjectSet: any) => WithPropertyDefinition<infer P> ? P
+        : never;
+    };
+    props: {
+      [T in Extract<keyof D, string>]: D[T] extends
+        (baseObjectSet: any) => WithPropertyDefinition<infer P>
+        ? P extends PropertyDef<infer A, any, any>
+          ? PropertyValueWireToClient[A]
+        : never
+        : never;
+    };
+  };
+} & K;