more progress

packages/client.api/src/OsdkObjectFrom.ts

@@ -53,10 +53,10 @@ export type ConvertProps<
   : TO extends ObjectTypeDefinition<any> ? (
       (
         UnionIfTrue<
-          TO["interfaceMap"][ApiNameAsString<FROM>][
+          NonNullable<TO["interfaceMap"]>[ApiNameAsString<FROM>][
             P extends "$all" ? (
                 keyof FROM["properties"] extends
-                  keyof TO["interfaceMap"][ApiNameAsString<FROM>]
+                  NonNullable<keyof TO["interfaceMap"]>[ApiNameAsString<FROM>]
                   ? keyof FROM["properties"]
                   : never
               )
@@ -70,9 +70,10 @@ export type ConvertProps<
   : UnionIfTrue<
     TO extends InterfaceDefinition<any> ? P extends "$all" ? "$all"
       : FROM extends ObjectTypeDefinition<any>
-        ? DropDollarOptions<P> extends keyof FROM["inverseInterfaceMap"][
-          ApiNameAsString<TO>
-        ] ? FROM["inverseInterfaceMap"][ApiNameAsString<TO>][
+        ? DropDollarOptions<P> extends
+          keyof NonNullable<FROM["inverseInterfaceMap"]>[
+            ApiNameAsString<TO>
+          ] ? NonNullable<FROM["inverseInterfaceMap"]>[ApiNameAsString<TO>][
             DropDollarOptions<P>
           ]
         : never
@@ -82,6 +83,57 @@ export type ConvertProps<
     "$notStrict"
   >;
 
+// type TO = InterfaceDefinition<string, unknown>;
+// type FROM = FetchedObjectTypeDefinition<any, unknown>;
+// type P = string;
+// type Z = ValidToFrom<FROM>;
+
+// type huh2 = TO["apiName"]["__Unbranded"];
+// type huh3 = ApiNameAsString<Z>;
+// type huh22 = FROM["inverseInterfaceMap"];
+
+// type huhtest<TO extends ObjectTypeDefinition<any>> = UnionIfTrue<
+//   TO["interfaceMap"][ApiNameAsString<FROM>][
+//     P extends "$all" ? (
+//         keyof FROM["properties"] extends
+//           keyof TO["interfaceMap"][ApiNameAsString<FROM>]
+//           ? keyof FROM["properties"]
+//           : never
+//       )
+//       : DropDollarOptions<P>
+//   ],
+//   P extends "$notStrict" ? true : false,
+//   "$notStrict"
+// >;
+
+// type huh = UnionIfTrue<
+//   TO extends InterfaceDefinition<any> ? P extends "$all" ? "$all"
+//     : FROM extends ObjectTypeDefinition<any>
+//       ? DropDollarOptions<P> extends keyof NonNullable<FROM["inverseInterfaceMap"]>[
+//         ApiNameAsString<Z>
+//       ] ? NonNullable<FROM["inverseInterfaceMap"]>[ApiNameAsString<Z>][
+//           DropDollarOptions<P>
+//         ]
+//       : never
+//     : never
+//     : never,
+//   P extends "$notStrict" ? true : false,
+//   "$notStrict"
+// >;
+
+export const InterfaceDefinitions = Symbol(
+  process.env.MODE !== "production" ? "InterfaceDefinitions" : undefined,
+);
+export interface FetchedObjectTypeDefinition<K extends string, N = unknown>
+  extends ObjectTypeDefinition<K, N>
+{
+  rid: string;
+
+  // we keep this here so we can depend on these synchronously
+  [InterfaceDefinitions]: {
+    [key: string]: { def: InterfaceDefinition<any> };
+  };
+}
 /** DO NOT EXPORT FROM PACKAGE */
 export type ValidToFrom<FROM extends ObjectOrInterfaceDefinition> = FROM extends
   InterfaceDefinition<any, any>
@@ -139,7 +191,7 @@ export type Osdk<
     /** @deprecated use $primaryKey */
     __primaryKey: Q extends ObjectTypeDefinition<any>
       ? OsdkObjectPrimaryKeyType<Q>
-      : unknown;
+      : any;
 
     // $uniqueId: string; // will be dynamic
 

packages/client.api/src/index.ts

@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+import { TimeseriesDurationMapping } from "./timeseries/timeseries.js";
+
 export type { ActionReturnTypeForOptions } from "./actions/ActionReturnTypeForOptions.js";
 export type {
   ActionEditResponse,
@@ -111,7 +113,9 @@ export type { PageResult } from "./PageResult.js";
 export type {
   TimeSeriesPoint,
   TimeSeriesProperty,
+  TimeSeriesQuery,
 } from "./timeseries/timeseries.js";
+export { TimeseriesDurationMapping } from "./timeseries/timeseries.js";
 export type { LinkedType, LinkNames } from "./util/LinkUtils.js";
 export type { NOOP } from "./util/NOOP.js";
 

packages/client.api/src/mapping/PropertyValueMapping.ts

@@ -37,7 +37,7 @@ export interface PropertyValueWireToClient {
   string: string;
   timestamp: string;
 
-  numericTimeseries: unknown;
+  numericTimeseries: TimeSeriesProperty<number>;
   stringTimeseries: TimeSeriesProperty<string>;
 }
 

packages/client.api/src/object/FetchPageResult.ts

@@ -36,10 +36,13 @@ export type UnionIfFalse<S extends string, JUST_S_IF_TRUE extends boolean, E> =
     : S | E;
 
 /** @internal exposed for a test */
-export type UnionIfTrue<S extends string, UNION_IF_TRUE extends boolean, E> =
-  IsNever<S> extends true ? never
-    : UNION_IF_TRUE extends true ? S | E
-    : S;
+export type UnionIfTrue<
+  S extends string,
+  UNION_IF_TRUE extends boolean,
+  E extends string,
+> = IsNever<S> extends true ? never
+  : UNION_IF_TRUE extends true ? S | E
+  : S;
 
 export type FetchPageResult<
   Q extends ObjectOrInterfaceDefinition,

packages/client.api/src/timeseries/timeseries.ts

@@ -14,11 +14,15 @@
  * limitations under the License.
  */
 
-export interface TimeSeriesQuery {
-  when: "BEFORE" | "AFTER";
-  value: number;
-  unit: TimeseriesDurationUnits;
-}
+export type TimeSeriesQuery = {
+  $before: number;
+  $after?: never;
+  $unit: keyof typeof TimeseriesDurationMapping;
+} | {
+  $after: number;
+  $before?: never;
+  $unit: keyof typeof TimeseriesDurationMapping;
+};
 
 export type TimeseriesDurationUnits =
   | "YEARS"
@@ -30,6 +34,31 @@ export type TimeseriesDurationUnits =
   | "SECONDS"
   | "MILLISECONDS";
 
+export const TimeseriesDurationMapping = {
+  "ms": "MILLISECONDS",
+  "milliseconds": "MILLISECONDS",
+  "sec": "SECONDS",
+  "seconds": "SECONDS",
+  "min": "MINUTES",
+  "minute": "MINUTES",
+  "minutes": "MINUTES",
+  "hr": "HOURS",
+  "hrs": "HOURS",
+  "hour": "HOURS",
+  "hours": "HOURS",
+  "day": "DAYS",
+  "days": "DAYS",
+  "wk": "WEEKS",
+  "week": "WEEKS",
+  "weeks": "WEEKS",
+  "mos": "MONTHS",
+  "month": "MONTHS",
+  "months": "MONTHS",
+  "yr": "YEARS",
+  "year": "YEARS",
+  "years": "YEARS",
+} satisfies Record<string, TimeseriesDurationUnits>;
+
 export interface TimeSeriesPoint<T extends string | number> {
   time: string;
   value: T;

packages/client/src/createTimeseriesProperty.ts

@@ -14,12 +14,18 @@
  * limitations under the License.
  */
 
-import type {
-  Attachment,
-  TimeSeriesPoint,
-  TimeSeriesProperty,
+import {
+  type Attachment,
+  TimeseriesDurationMapping,
+  type TimeSeriesPoint,
+  type TimeSeriesProperty,
+  type TimeSeriesQuery,
 } from "@osdk/client.api";
-import type { StreamTimeSeriesPointsRequest } from "@osdk/internal.foundry";
+import type {
+  RelativeTime,
+  RelativeTimeRange,
+  StreamTimeSeriesPointsRequest,
+} from "@osdk/internal.foundry";
 import { Ontologies, OntologiesV2 } from "@osdk/internal.foundry";
 import type { MinimalClient } from "./MinimalClientContext.js";
 import {
@@ -32,13 +38,12 @@ export function createTimeseriesProperty<T extends number | string>(
   objectApiName: string,
   primaryKey: any,
   propertyName: string,
-  body: StreamTimeSeriesPointsRequest,
 ): TimeSeriesProperty<T> {
   return {
     async getFirstPoint() {
       return OntologiesV2.OntologyObjectsV2.getFirstPoint(
         client,
-        client.ontologyRid,
+        await client.ontologyRid,
         objectApiName,
         primaryKey,
         propertyName,
@@ -47,29 +52,29 @@ export function createTimeseriesProperty<T extends number | string>(
     async getLastPoint() {
       return OntologiesV2.OntologyObjectsV2.getLastPoint(
         client,
-        client.ontologyRid,
+        await client.ontologyRid,
         objectApiName,
         primaryKey,
         propertyName,
       ) as Promise<TimeSeriesPoint<T>>;
     },
-    async getAllPoints() {
+    async getAllPoints(query: TimeSeriesQuery) {
       return getAllTimeSeriesPoints(
         client,
         objectApiName,
         primaryKey,
         propertyName,
-        body,
+        query,
       );
     },
 
-    asyncIterPoints() {
+    asyncIterPoints(query: TimeSeriesQuery) {
       return iterateTimeSeriesPoints(
         client,
         objectApiName,
         primaryKey,
         propertyName,
-        body,
+        query,
       );
     },
   };
@@ -80,16 +85,27 @@ async function getAllTimeSeriesPoints<T extends string | number>(
   objectApiName: string,
   primaryKey: any,
   propertyName: string,
-  body: StreamTimeSeriesPointsRequest,
+  body: TimeSeriesQuery,
 ): Promise<Array<TimeSeriesPoint<T>>> {
+  const relativeTime: RelativeTime = body.$before
+    ? {
+      when: "BEFORE",
+      value: body.$before,
+      unit: TimeseriesDurationMapping[body.$unit],
+    }
+    : {
+      when: "AFTER",
+      value: body.$after!,
+      unit: TimeseriesDurationMapping[body.$unit],
+    };
   const streamPointsIterator = await OntologiesV2.OntologyObjectsV2
     .streamPoints(
       client,
-      client.ontologyRid,
+      await client.ontologyRid,
       objectApiName,
       primaryKey,
       propertyName,
-      body,
+      { range: { type: "relative", startTime: relativeTime } },
     );
 
   const allPoints: Array<TimeSeriesPoint<T>> = [];
@@ -111,16 +127,27 @@ async function* iterateTimeSeriesPoints<T extends string | number>(
   objectApiName: string,
   primaryKey: any,
   propertyName: string,
-  body: StreamTimeSeriesPointsRequest,
+  body: TimeSeriesQuery,
 ): AsyncGenerator<TimeSeriesPoint<T>, any, unknown> {
+  const relativeTime: RelativeTime = body.$before
+    ? {
+      when: "BEFORE",
+      value: body.$before,
+      unit: TimeseriesDurationMapping[body.$unit],
+    }
+    : {
+      when: "AFTER",
+      value: body.$after!,
+      unit: TimeseriesDurationMapping[body.$unit],
+    };
   const streamPointsResponse = await OntologiesV2.OntologyObjectsV2
     .streamPoints(
       client,
-      client.ontologyRid,
+      await client.ontologyRid,
       objectApiName,
       primaryKey,
       propertyName,
-      body,
+      { range: { type: "relative", startTime: relativeTime } },
     );
 
   const reader = streamPointsResponse.stream().getReader();

packages/client/src/object/convertWireToOsdkObjects.test.ts

@@ -167,7 +167,7 @@ describe("convertWireToOsdkObjects", () => {
       clientCtx,
       [objectFromWire],
       undefined,
-    )) as Osdk<Employee>[];
+    )) as unknown as Osdk<Employee>[];
 
     expect(obj.fullName).toEqual("Steve");
     expect(Object.keys(obj).sort()).toEqual([
@@ -227,7 +227,7 @@ describe("convertWireToOsdkObjects", () => {
       clientCtx,
       [objectFromWire],
       FooInterface.apiName,
-    )) as Osdk<FooInterface>[];
+    )) as unknown as Osdk<FooInterface>[];
 
     expect(objAsFoo).toMatchInlineSnapshot(`
       {

packages/client/src/object/convertWireToOsdkObjects.ts

@@ -19,7 +19,11 @@ import type {
   ObjectOrInterfaceDefinition,
   ObjectTypeDefinition,
 } from "@osdk/api";
-import type { NullabilityAdherence, Osdk } from "@osdk/client.api";
+import type {
+  ConvertProps,
+  NullabilityAdherence,
+  Osdk,
+} from "@osdk/client.api";
 import type { OntologyObjectV2 } from "@osdk/internal.foundry";
 import invariant from "tiny-invariant";
 import type { MinimalClient } from "../MinimalClientContext.js";
@@ -29,6 +33,12 @@ import {
 } from "../ontology/OntologyProvider.js";
 import { createOsdkObject } from "./convertWireToOsdkObjects/createOsdkObject.js";
 
+type Expand<T> = T extends infer O ? { [K in keyof O]: O[K] } : never;
+
+// expands object types recursively
+type ExpandRecursively<T> = T extends object
+  ? T extends infer O ? { [K in keyof O]: ExpandRecursively<O[K]> } : never
+  : T;
 /**
  * If interfaceApiName is not undefined, converts the instances of the
  * interface into their respective
@@ -101,7 +111,14 @@ export async function convertWireToOsdkObjects(
     } else if (strictNonNull === "drop" && !conforming) {
       continue;
     }
-
+    // type huh = Osdk<InterfaceDefinition<any, any>, string, never>;
+    // type huh2 = Osdk<FetchedObjectTypeDefinition<any, unknown>, string, never>;
+    // type expandedhuh = Expand<huh>;
+    type huhuh = ConvertProps<
+      FetchedObjectTypeDefinition<any, unknown>,
+      InterfaceDefinition<any, unknown>,
+      string
+    >;
     let osdkObject = createOsdkObject(client, objectDef, rawObj);
     if (interfaceApiName) osdkObject = osdkObject.$as(interfaceApiName);
 

packages/client/src/object/convertWireToOsdkObjects/createOsdkObject.ts

@@ -123,9 +123,8 @@ export function createOsdkObject<
             >(
               client,
               objectDef.apiName,
-              objectDef.primaryKeyApiName,
+              target[RawObject][objectDef.primaryKeyApiName as string],
               p as string,
-              undefined as any,
             );
           }
         }