Merge remote-tracking branch 'origin/main' into mf/upgrade-generator

examples/basic/cli/src/OntologyType.ts

@@ -18,5 +18,7 @@ import type { OsdkObjectFrom } from "@osdk/client";
 import type { Ontology } from "@osdk/examples.basic.sdk";
 
 // Demo for if you want concrete types
-export interface Employee extends OsdkObjectFrom<"Employee", Ontology> {}
-export interface Todo extends OsdkObjectFrom<"Todo", Ontology> {}
+export interface Employee
+  extends OsdkObjectFrom<Ontology["objects"]["Employee"]>
+{}
+export interface Todo extends OsdkObjectFrom<Ontology["objects"]["Todo"]> {}

examples/basic/cli/src/examples/fetchAggregationForEmployeesGroupedThin.ts

@@ -16,15 +16,15 @@
 
 import type { ClientContext } from "@osdk/client";
 import { aggregateOrThrow } from "@osdk/client/objects";
-import type { Ontology } from "@osdk/examples.basic.sdk";
+import { Ontology } from "@osdk/examples.basic.sdk";
 import invariant from "tiny-invariant";
 import type { TypeOf } from "ts-expect";
 import { expectType } from "ts-expect";
 
 export async function fetchAggregationForEmployeesGroupedThin(
   clientCtx: ClientContext<Ontology>,
 ) {
-  const result = await aggregateOrThrow(clientCtx, "Employee", {
+  const result = await aggregateOrThrow(clientCtx, Ontology.objects.Employee, {
     select: {
       locationCity: "approximateDistinct",
       locationName: "approximateDistinct",

examples/basic/cli/src/examples/fetchEmployeePageThin.ts

@@ -18,14 +18,14 @@ import * as OsdkApi from "@osdk/client";
 import type { ClientContext } from "@osdk/client";
 import { Objects } from "@osdk/client";
 import { fetchPageOrThrow } from "@osdk/client/objects";
-import type { Ontology } from "@osdk/examples.basic.sdk";
+import { Ontology } from "@osdk/examples.basic.sdk";
 import type { TypeOf } from "ts-expect";
 import { expectType } from "ts-expect";
 
 export async function fetchEmployeePageThin(
   clientCtx: ClientContext<Ontology>,
 ) {
-  let result = await fetchPageOrThrow(clientCtx, "Employee", {
+  let result = await fetchPageOrThrow(clientCtx, Ontology.objects.Employee, {
     select: ["adUsername", "businessTitle", "employeeNumber"],
   });
 
@@ -42,17 +42,29 @@ export async function fetchEmployeePageThin(
   >(false);
 
   // OR
-  let result2 = await Objects.fetchPageOrThrow(clientCtx, "Employee", {
-    select: ["adUsername", "businessTitle", "employeeNumber"],
-  });
+  let result2 = await Objects.fetchPageOrThrow(
+    clientCtx,
+    Ontology.objects.Employee,
+    {
+      select: ["adUsername", "businessTitle", "employeeNumber"],
+    },
+  );
 
   // or
-  let result3 = await OsdkApi.Objects.fetchPageOrThrow(clientCtx, "Employee", {
-    select: ["adUsername", "businessTitle", "employeeNumber"],
-  });
+  let result3 = await OsdkApi.Objects.fetchPageOrThrow(
+    clientCtx,
+    Ontology.objects.Employee,
+    {
+      select: ["adUsername", "businessTitle", "employeeNumber"],
+    },
+  );
 
   // Quick check to make sure we get everything
-  let result4 = await fetchPageOrThrow(clientCtx, "Employee", {});
+  let result4 = await fetchPageOrThrow(
+    clientCtx,
+    Ontology.objects.Employee,
+    {},
+  );
 
   console.log("fetchEmployeePageThin(): ");
   console.table(

examples/basic/cli/src/typeChecks.ts

@@ -80,7 +80,9 @@ export async function typeChecks(client: Client<Ontology>) {
 
     // lead is an employee
     const lead = await employee.$link.lead.get();
-    expectType<TypeOf<typeof lead, OsdkObjectFrom<"Employee", Ontology>>>(true);
+    expectType<
+      TypeOf<typeof lead, OsdkObjectFrom<Ontology["objects"]["Employee"]>>
+    >(true);
 
     // lead is an employee but we downselect to just their adUsername
     const leadName = await employee.$link.lead.get({ select: ["adUsername"] });
@@ -97,7 +99,10 @@ export async function typeChecks(client: Client<Ontology>) {
       TypeOf<
         typeof peeps,
         PageResult<
-          OsdkObjectFrom<"Employee", Ontology, "adUsername" | "employeeNumber">
+          OsdkObjectFrom<
+            Ontology["objects"]["Employee"],
+            "adUsername" | "employeeNumber"
+          >
         >
       >
     >(true);
@@ -112,7 +117,7 @@ export async function typeChecks(client: Client<Ontology>) {
     expectType<
       TypeOf<
         typeof peepById,
-        OsdkObjectFrom<"Employee", Ontology, "adUsername">
+        OsdkObjectFrom<Ontology["objects"]["Employee"], "adUsername">
       >
     >(
       true,

examples/basic/sdk/src/generatedNoCheck/ontology/actions/actionTakesAllParameterTypes.ts

@@ -1,6 +1,7 @@
 import { ActionDefinition } from '@osdk/api';
 
 export const actionTakesAllParameterTypes = {
+  type: 'action',
   apiName: 'actionTakesAllParameterTypes',
   parameters: {
     objectSet: {

examples/basic/sdk/src/generatedNoCheck/ontology/actions/createTodo.ts

@@ -1,6 +1,7 @@
 import { ActionDefinition } from '@osdk/api';
 
 export const createTodo = {
+  type: 'action',
   apiName: 'createTodo',
   parameters: {},
   description: 'Creates a new Todo',

examples/basic/sdk/src/generatedNoCheck/ontology/interfaces/SimpleInterface.ts

@@ -1,6 +1,7 @@
 import type { InterfaceDefinition } from '@osdk/api';
 
 export const SimpleInterface = {
+  type: 'interface',
   apiName: 'SimpleInterface',
   description: 'Its a todo item.',
   properties: {
@@ -26,4 +27,5 @@ export const SimpleInterface = {
       nullable: true,
     },
   },
+  links: {},
 } satisfies InterfaceDefinition<'SimpleInterface', ''>;

examples/basic/sdk/src/generatedNoCheck/ontology/objects/BoundariesUsState.ts

@@ -1,6 +1,28 @@
 import type { ObjectTypeDefinition } from '@osdk/api';
 
-export const BoundariesUsState = {
+export interface BoundariesUsStateDef extends ObjectTypeDefinition<'BoundariesUsState'> {
+  type: 'object';
+  apiName: 'BoundariesUsState';
+  description: 'Boundaries US State';
+  primaryKeyType: 'string';
+  links: {};
+  properties: {
+    usState: {
+      multiplicity: false;
+      type: 'string';
+      nullable: false;
+    };
+    geometry10M: {
+      multiplicity: false;
+      description: 'geoshape';
+      type: 'geoshape';
+      nullable: true;
+    };
+  };
+}
+
+export const BoundariesUsState: BoundariesUsStateDef = {
+  type: 'object',
   apiName: 'BoundariesUsState',
   description: 'Boundaries US State',
   primaryKeyType: 'string',
@@ -18,4 +40,4 @@ export const BoundariesUsState = {
       nullable: true,
     },
   },
-} satisfies ObjectTypeDefinition<'BoundariesUsState', never>;
+};

examples/basic/sdk/src/generatedNoCheck/ontology/objects/Employee.ts

@@ -1,6 +1,62 @@
-import type { ObjectTypeDefinition } from '@osdk/api';
+import type { ObjectTypeDefinition, ObjectTypeLinkDefinition } from '@osdk/api';
 
-export const Employee = {
+export interface EmployeeDef extends ObjectTypeDefinition<'Employee'> {
+  type: 'object';
+  apiName: 'Employee';
+  description: 'An employee';
+  primaryKeyType: 'string';
+  links: { lead: ObjectTypeLinkDefinition<EmployeeDef, false>; peeps: ObjectTypeLinkDefinition<EmployeeDef, true> };
+  properties: {
+    adUsername: {
+      multiplicity: false;
+      type: 'string';
+      nullable: false;
+    };
+    locationName: {
+      multiplicity: false;
+      type: 'string';
+      nullable: true;
+    };
+    locationCity: {
+      multiplicity: false;
+      type: 'string';
+      nullable: true;
+    };
+    firstFullTimeStartDate: {
+      multiplicity: false;
+      type: 'datetime';
+      nullable: true;
+    };
+    businessTitle: {
+      multiplicity: false;
+      type: 'string';
+      nullable: true;
+    };
+    employeeNumber: {
+      multiplicity: false;
+      type: 'double';
+      nullable: true;
+    };
+    jobProfile: {
+      multiplicity: false;
+      type: 'string';
+      nullable: true;
+    };
+    locationType: {
+      multiplicity: false;
+      type: 'string';
+      nullable: true;
+    };
+    favPlace: {
+      multiplicity: false;
+      type: 'geopoint';
+      nullable: true;
+    };
+  };
+}
+
+export const Employee: EmployeeDef = {
+  type: 'object',
   apiName: 'Employee',
   description: 'An employee',
   primaryKeyType: 'string',
@@ -61,4 +117,4 @@ export const Employee = {
       nullable: true,
     },
   },
-} satisfies ObjectTypeDefinition<'Employee', 'Employee'>;
+};