@osdk/generator 2.1.0-beta.9 → 2.2.0-beta.1

package/build/browser/v2.0/generateClientSdkVersionTwoPointZero.test.js

@@ -13,6 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+import { consola } from "consola";
 import { mkdir, readdir, rmdir, writeFile } from "fs/promises";
 import * as immer from "immer";
 import { beforeEach, describe, expect, it, test, vi } from "vitest";
@@ -66,16 +68,19 @@ function changeNames(ontology, newNames) {
     changeEachEntry(draft.sharedPropertyTypes, newNames.spts, (draft, oldSptName, newSptName) => {
       changeValue(draft, "apiName", oldSptName, newSptName);
     }, true);
+
     // Handle query renames
     changeEachEntry(draft.queryTypes, newNames.queries, (draft, oldActionName, newActionName) => {
       if (draft.apiName === oldActionName) {
         draft.apiName = newActionName;
       }
     }, true);
+
     // Handle action renames
     changeEachEntry(draft.actionTypes, newNames.actions, (draft, oldActionName, newActionName) => {
       changeValue(draft, "apiName", oldActionName, newActionName);
     }, true);
+
     // Handle interface renames
     changeEachEntry(draft.interfaceTypes, newNames.interfaces, (ifaceType, oldIfaceName, newIfaceName) => {
       changeValue(ifaceType, "apiName", oldIfaceName, newIfaceName);
@@ -88,6 +93,7 @@ function changeNames(ontology, newNames) {
       changeArrayEntry(objectType.implementsInterfaces, oldIfaceName, newIfaceName);
       changeKey(objectType.implementsInterfaces2, oldIfaceName, newIfaceName);
     });
+
     // Handle object renames
     changeEachEntry(draft.queryTypes, newNames.objects, (queryType, oldObjectName, newObjectName) => {
       changeDataType(queryType.output, oldObjectName, newObjectName);
@@ -153,12 +159,20 @@ const referencedOntology = {
           "taskId": {
             "dataType": {
               "type": "string"
-            }
+            },
+            "rid": "ridForTaskId"
           },
           "body": {
             "dataType": {
               "type": "string"
-            }
+            },
+            "rid": "ridForBody"
+          },
+          "shouldBeIgnored": {
+            "dataType": {
+              "type": "futureUnknownType"
+            },
+            "rid": "ridForShouldBeIgnored"
           }
         },
         "status": "ACTIVE",
@@ -184,7 +198,20 @@ const referencedOntology = {
           rid: "idk"
         }
       },
-      links: {}
+      implementedByObjectTypes: [],
+      links: {},
+      allExtendsInterfaces: [],
+      allLinks: {},
+      allProperties: {
+        "com.example.dep.spt": {
+          apiName: "com.example.dep.spt",
+          dataType: {
+            type: "string"
+          },
+          displayName: "Some Property",
+          rid: "idk"
+        }
+      }
     }
   },
   "sharedPropertyTypes": {
@@ -256,12 +283,14 @@ const referencingOntology = {
           "id": {
             dataType: {
               type: "integer"
-            }
+            },
+            rid: "rid"
           },
           "body": {
             dataType: {
               type: "string"
-            }
+            },
+            "rid": "rid"
           }
         },
         rid: "ridForThing",
@@ -288,12 +317,14 @@ const referencingOntology = {
           "id": {
             dataType: {
               type: "integer"
-            }
+            },
+            rid: "rid"
           },
           "body": {
             dataType: {
               type: "string"
-            }
+            },
+            rid: "rid"
           }
         },
         rid: "theRid",
@@ -354,7 +385,9 @@ describe("generator", () => {
   beforeEach(async () => {
     helper = createMockMinimalFiles();
   });
-  test("should be able to generate a project", async () => {
+  test("should be able to generate a project", {
+    timeout: 20_000
+  }, async () => {
     await generateClientSdkVersionTwoPointZero(TodoWireOntology, "typescript-sdk/0.0.0 osdk-cli/0.0.0", helper.minimalFiles, BASE_PATH);
     const files = helper.getFiles();
     expect(files).toMatchObject({
@@ -364,595 +397,16 @@ describe("generator", () => {
     });
     const diagnostics = compileThis(helper.getFiles(), BASE_PATH);
     for (const q of diagnostics) {
-      console.error(`${q.file?.fileName}:${q.file?.getLineStarts()} ${q.messageText}`);
+      console.error(`${q.file?.fileName}:${q.file?.getLineStarts()}`, q.messageText);
     }
+
     // TODO: Certain errors are expected since we can't resolve the static code, but we should fix them.
     const errors = diagnostics.filter(q => q.code !== 2792);
     expect(errors).toHaveLength(0);
-    expect(tweakedFilesForSnapshotConsistency(helper.getFiles())).toMatchInlineSnapshot(`
-      {
-        "/foo/OntologyMetadata.ts": "export type $ExpectedClientVersion = 'PLACEHOLDER';
-      export const $osdkMetadata = { extraUserAgent: 'typescript-sdk/0.0.0 osdk-cli/0.0.0' };
-
-      export const $ontologyRid = 'ridHere';
-      ",
-        "/foo/index.ts": "export { deleteTodos, markTodoCompleted } from './ontology/actions';
-      export * as $Actions from './ontology/actions';
-      export { SomeInterface } from './ontology/interfaces';
-      export * as $Interfaces from './ontology/interfaces';
-      export { Person, Todo } from './ontology/objects';
-      export * as $Objects from './ontology/objects';
-      export { getCount, returnsTodo } from './ontology/queries';
-      export * as $Queries from './ontology/queries';
-      export { $ontologyRid } from './OntologyMetadata';
-      ",
-        "/foo/ontology/actions.ts": "export { deleteTodos } from './actions/deleteTodos';
-      export { markTodoCompleted } from './actions/markTodoCompleted';
-      ",
-        "/foo/ontology/actions/deleteTodos.ts": "import type {
-        ActionDefinition,
-        ActionMetadata,
-        ActionParam,
-        ActionReturnTypeForOptions,
-        ApplyActionOptions,
-        ApplyBatchActionOptions,
-      } from '@osdk/client';
-      import { $osdkMetadata } from '../../OntologyMetadata';
-      import type { Todo } from '../objects/Todo';
-
-      export namespace deleteTodos {
-        // Represents the definition of the parameters for the action
-        export type ParamsDefinition = {
-          object: {
-            description: 'Todo(s) to be deleted';
-            multiplicity: true;
-            nullable: true;
-            type: ActionMetadata.DataType.Object<Todo>;
-          };
-        };
-
-        /**
-         * An action which takes in an array of objects
-         */
-        export interface Params {
-          /**
-           * Todo(s) to be deleted
-           */
-          readonly object?: ReadonlyArray<ActionParam.ObjectType<Todo>>;
-        }
-
-        // Represents a fqn of the action
-        export interface Signatures {
-          /**
-           * An action which takes in an array of objects
-           */
-          applyAction<P extends deleteTodos.Params, OP extends ApplyActionOptions>(
-            args: P,
-            options?: OP,
-          ): Promise<ActionReturnTypeForOptions<OP>>;
-
-          batchApplyAction<P extends ReadonlyArray<deleteTodos.Params>, OP extends ApplyBatchActionOptions>(
-            args: P,
-            options?: OP,
-          ): Promise<ActionReturnTypeForOptions<OP>>;
-        }
-      }
-
-      /**
-       * An action which takes in an array of objects
-       * @param {ActionParam.ObjectType<Todo>} [object] Todo(s) to be deleted
-       */
-      export interface deleteTodos extends ActionDefinition<deleteTodos.Signatures> {
-        __DefinitionMetadata?: {
-          apiName: 'deleteTodos';
-          description: 'An action which takes in an array of objects';
-          modifiedEntities: {};
-          parameters: deleteTodos.ParamsDefinition;
-          rid: 'ri.ontology.main.action-type.8f94017d-cf17-4fa8-84c3-8e01e5d594f2';
-          status: 'ACTIVE';
-          type: 'action';
-
-          signatures: deleteTodos.Signatures;
-        };
-        apiName: 'deleteTodos';
-        type: 'action';
-        osdkMetadata: typeof $osdkMetadata;
-      }
-
-      export const deleteTodos: deleteTodos = {
-        apiName: 'deleteTodos',
-        type: 'action',
-        osdkMetadata: $osdkMetadata,
-      };
-      ",
-        "/foo/ontology/actions/markTodoCompleted.ts": "import type {
-        ActionDefinition,
-        ActionMetadata,
-        ActionParam,
-        ActionReturnTypeForOptions,
-        ApplyActionOptions,
-        ApplyBatchActionOptions,
-      } from '@osdk/client';
-      import { $osdkMetadata } from '../../OntologyMetadata';
-      import type { Todo } from '../objects/Todo';
-
-      export namespace markTodoCompleted {
-        // Represents the definition of the parameters for the action
-        export type ParamsDefinition = {
-          object: {
-            description: 'A Todo to mark completed';
-            multiplicity: false;
-            nullable: true;
-            type: ActionMetadata.DataType.Object<Todo>;
-          };
-        };
-
-        /**
-         * An action which takes different types of parameters
-         */
-        export interface Params {
-          /**
-           * A Todo to mark completed
-           */
-          readonly object?: ActionParam.ObjectType<Todo>;
-        }
-
-        // Represents a fqn of the action
-        export interface Signatures {
-          /**
-           * An action which takes different types of parameters
-           */
-          applyAction<P extends markTodoCompleted.Params, OP extends ApplyActionOptions>(
-            args: P,
-            options?: OP,
-          ): Promise<ActionReturnTypeForOptions<OP>>;
-
-          batchApplyAction<P extends ReadonlyArray<markTodoCompleted.Params>, OP extends ApplyBatchActionOptions>(
-            args: P,
-            options?: OP,
-          ): Promise<ActionReturnTypeForOptions<OP>>;
-        }
-      }
-
-      /**
-       * An action which takes different types of parameters
-       * @param {ActionParam.ObjectType<Todo>} [object] A Todo to mark completed
-       */
-      export interface markTodoCompleted extends ActionDefinition<markTodoCompleted.Signatures> {
-        __DefinitionMetadata?: {
-          apiName: 'markTodoCompleted';
-          description: 'An action which takes different types of parameters';
-          modifiedEntities: {
-            Todo: {
-              created: false;
-              modified: true;
-            };
-          };
-          parameters: markTodoCompleted.ParamsDefinition;
-          rid: 'ri.ontology.main.action-type.9f84017d-cf17-4fa8-84c3-8e01e5d594f2';
-          status: 'ACTIVE';
-          type: 'action';
-
-          signatures: markTodoCompleted.Signatures;
-        };
-        apiName: 'markTodoCompleted';
-        type: 'action';
-        osdkMetadata: typeof $osdkMetadata;
-      }
-
-      export const markTodoCompleted: markTodoCompleted = {
-        apiName: 'markTodoCompleted',
-        type: 'action',
-        osdkMetadata: $osdkMetadata,
-      };
-      ",
-        "/foo/ontology/interfaces.ts": "export { SomeInterface } from './interfaces/SomeInterface';
-      ",
-        "/foo/ontology/interfaces/SomeInterface.ts": "import type { PropertyDef as $PropertyDef } from '@osdk/client';
-      import { $osdkMetadata } from '../../OntologyMetadata';
-
-      import type {
-        InterfaceDefinition as $InterfaceDefinition,
-        ObjectSet as $ObjectSet,
-        Osdk as $Osdk,
-        PropertyValueWireToClient as $PropType,
-      } from '@osdk/client';
-
-      export type OsdkObjectLinks$SomeInterface = {};
-
-      export namespace SomeInterface {
-        export type PropertyKeys = 'SomeProperty';
-
-        export interface Props {
-          readonly SomeProperty: $PropType['string'] | undefined;
-        }
-        export type StrictProps = Props;
-
-        export interface ObjectSet extends $ObjectSet<SomeInterface, SomeInterface.ObjectSet> {}
-
-        export type OsdkInstance<
-          OPTIONS extends never | '$rid' = never,
-          K extends keyof SomeInterface.Props = keyof SomeInterface.Props,
-        > = $Osdk.Instance<SomeInterface, OPTIONS, K>;
-
-        /** @deprecated use OsdkInstance */
-        export type OsdkObject<
-          OPTIONS extends never | '$rid' = never,
-          K extends keyof SomeInterface.Props = keyof SomeInterface.Props,
-        > = OsdkInstance<OPTIONS, K>;
-      }
-
-      export interface SomeInterface extends $InterfaceDefinition {
-        osdkMetadata: typeof $osdkMetadata;
-        type: 'interface';
-        apiName: 'SomeInterface';
-        __DefinitionMetadata?: {
-          objectSet: SomeInterface.ObjectSet;
-          props: SomeInterface.Props;
-          linksType: OsdkObjectLinks$SomeInterface;
-          strictProps: SomeInterface.StrictProps;
-          apiName: 'SomeInterface';
-          description: 'Some interface';
-          displayName: 'Sum Interface';
-          implements: [];
-          links: {};
-          properties: {
-            /**
-             *   display name: 'Sum Property',
-             *   description: Some property
-             */
-            SomeProperty: $PropertyDef<'string', 'nullable', 'single'>;
-          };
-          rid: 'idk';
-          type: 'interface';
-        };
-      }
-
-      export const SomeInterface: SomeInterface = {
-        type: 'interface',
-        apiName: 'SomeInterface',
-        osdkMetadata: $osdkMetadata,
-      };
-      ",
-        "/foo/ontology/objects.ts": "export { Person } from './objects/Person';
-      export { Todo } from './objects/Todo';
-      ",
-        "/foo/ontology/objects/Person.ts": "import type { PropertyDef as $PropertyDef } from '@osdk/client';
-      import { $osdkMetadata } from '../../OntologyMetadata';
-      import type { $ExpectedClientVersion } from '../../OntologyMetadata';
-      import type { Todo } from './Todo';
-      import type {
-        PropertyKeys as $PropertyKeys,
-        ObjectTypeDefinition as $ObjectTypeDefinition,
-        ObjectMetadata as $ObjectMetadata,
-      } from '@osdk/client';
-      import type {
-        ObjectSet as $ObjectSet,
-        Osdk as $Osdk,
-        OsdkObject as $OsdkObject,
-        PropertyValueWireToClient as $PropType,
-        SingleLinkAccessor as $SingleLinkAccessor,
-      } from '@osdk/client';
-
-      export namespace Person {
-        export type PropertyKeys = 'email';
-
-        export interface Links {
-          readonly Todos: Todo.ObjectSet;
-        }
-
-        export interface Props {
-          readonly email: $PropType['string'];
-        }
-        export type StrictProps = Props;
-
-        export interface ObjectSet extends $ObjectSet<Person, Person.ObjectSet> {}
-
-        export type OsdkInstance<
-          OPTIONS extends never | '$rid' = never,
-          K extends keyof Person.Props = keyof Person.Props,
-        > = $Osdk.Instance<Person, OPTIONS, K>;
-
-        /** @deprecated use OsdkInstance */
-        export type OsdkObject<
-          OPTIONS extends never | '$rid' = never,
-          K extends keyof Person.Props = keyof Person.Props,
-        > = OsdkInstance<OPTIONS, K>;
-      }
-
-      export interface Person extends $ObjectTypeDefinition {
-        osdkMetadata: typeof $osdkMetadata;
-        type: 'object';
-        apiName: 'Person';
-        __DefinitionMetadata?: {
-          objectSet: Person.ObjectSet;
-          props: Person.Props;
-          linksType: Person.Links;
-          strictProps: Person.StrictProps;
-          apiName: 'Person';
-          description: 'A person';
-          displayName: 'Person';
-          icon: {
-            type: 'blueprint';
-            name: 'document';
-            color: 'blue';
-          };
-          implements: [];
-          interfaceMap: {};
-          inverseInterfaceMap: {};
-          links: {
-            Todos: $ObjectMetadata.Link<Todo, true>;
-          };
-          pluralDisplayName: 'Persons';
-          primaryKeyApiName: 'email';
-          primaryKeyType: 'string';
-          properties: {
-            /**
-             * (no ontology metadata)
-             */
-            email: $PropertyDef<'string', 'non-nullable', 'single'>;
-          };
-          rid: 'ridForPerson';
-          status: 'ACTIVE';
-          titleProperty: 'email';
-          type: 'object';
-        };
-      }
-
-      export const Person: Person = {
-        type: 'object',
-        apiName: 'Person',
-        osdkMetadata: $osdkMetadata,
-      };
-      ",
-        "/foo/ontology/objects/Todo.ts": "import type { PropertyDef as $PropertyDef } from '@osdk/client';
-      import { $osdkMetadata } from '../../OntologyMetadata';
-      import type { $ExpectedClientVersion } from '../../OntologyMetadata';
-      import type { Person } from './Person';
-      import type {
-        PropertyKeys as $PropertyKeys,
-        ObjectTypeDefinition as $ObjectTypeDefinition,
-        ObjectMetadata as $ObjectMetadata,
-      } from '@osdk/client';
-      import type {
-        ObjectSet as $ObjectSet,
-        Osdk as $Osdk,
-        OsdkObject as $OsdkObject,
-        PropertyValueWireToClient as $PropType,
-        SingleLinkAccessor as $SingleLinkAccessor,
-      } from '@osdk/client';
-
-      export namespace Todo {
-        export type PropertyKeys = 'id' | 'body' | 'complete';
-
-        export interface Links {
-          readonly Assignee: $SingleLinkAccessor<Person>;
-        }
-
-        export interface Props {
-          readonly body: $PropType['string'] | undefined;
-          readonly complete: $PropType['boolean'] | undefined;
-          readonly id: $PropType['integer'];
-        }
-        export type StrictProps = Props;
-
-        export interface ObjectSet extends $ObjectSet<Todo, Todo.ObjectSet> {}
-
-        export type OsdkInstance<
-          OPTIONS extends never | '$rid' = never,
-          K extends keyof Todo.Props = keyof Todo.Props,
-        > = $Osdk.Instance<Todo, OPTIONS, K>;
-
-        /** @deprecated use OsdkInstance */
-        export type OsdkObject<
-          OPTIONS extends never | '$rid' = never,
-          K extends keyof Todo.Props = keyof Todo.Props,
-        > = OsdkInstance<OPTIONS, K>;
-      }
-
-      export interface Todo extends $ObjectTypeDefinition {
-        osdkMetadata: typeof $osdkMetadata;
-        type: 'object';
-        apiName: 'Todo';
-        __DefinitionMetadata?: {
-          objectSet: Todo.ObjectSet;
-          props: Todo.Props;
-          linksType: Todo.Links;
-          strictProps: Todo.StrictProps;
-          apiName: 'Todo';
-          description: 'Its a todo item.';
-          displayName: 'AwesomeTodoDisplayname';
-          icon: {
-            type: 'blueprint';
-            name: 'document';
-            color: 'blue';
-          };
-          implements: ['SomeInterface'];
-          interfaceMap: {
-            SomeInterface: {
-              SomeProperty: 'body';
-            };
-          };
-          inverseInterfaceMap: {
-            SomeInterface: {
-              body: 'SomeProperty';
-            };
-          };
-          links: {
-            Assignee: $ObjectMetadata.Link<Person, false>;
-          };
-          pluralDisplayName: 'AwesomeTodoDisplayNames';
-          primaryKeyApiName: 'id';
-          primaryKeyType: 'integer';
-          properties: {
-            /**
-             *   display name: 'Body',
-             *   description: The text of the todo
-             */
-            body: $PropertyDef<'string', 'nullable', 'single'>;
-            /**
-             * (no ontology metadata)
-             */
-            complete: $PropertyDef<'boolean', 'nullable', 'single'>;
-            /**
-             * (no ontology metadata)
-             */
-            id: $PropertyDef<'integer', 'non-nullable', 'single'>;
-          };
-          rid: 'ridForTodo';
-          status: 'ACTIVE';
-          titleProperty: 'body';
-          type: 'object';
-        };
-      }
-
-      export const Todo: Todo = {
-        type: 'object',
-        apiName: 'Todo',
-        osdkMetadata: $osdkMetadata,
-      };
-      ",
-        "/foo/ontology/queries.ts": "export { getCount } from './queries/getCount';
-      export { returnsTodo } from './queries/returnsTodo';
-      ",
-        "/foo/ontology/queries/getCount.ts": "import type { QueryDefinition, QueryParam, QueryResult, VersionBound } from '@osdk/client';
-      import type { $ExpectedClientVersion } from '../../OntologyMetadata';
-      import { $osdkMetadata } from '../../OntologyMetadata';
-
-      export namespace getCount {
-        export interface Signature {
-          (query: getCount.Parameters): Promise<getCount.ReturnType>;
-        }
-
-        export interface Parameters {
-          /**
-           * (no ontology metadata)
-           */
-          readonly completed: QueryParam.PrimitiveType<'boolean'>;
-        }
-
-        export type ReturnType = QueryResult.PrimitiveType<'integer'>;
-      }
-
-      export interface getCount extends QueryDefinition<getCount.Signature>, VersionBound<$ExpectedClientVersion> {
-        __DefinitionMetadata?: {
-          apiName: 'getCount';
-          rid: 'rid.query.1';
-          type: 'query';
-          version: '0';
-          parameters: {
-            /**
-             * (no ontology metadata)
-             */
-            completed: {
-              nullable: false;
-              type: 'boolean';
-            };
-          };
-          output: {
-            nullable: false;
-            type: 'integer';
-          };
-          signature: getCount.Signature;
-        };
-        apiName: 'getCount';
-        type: 'query';
-        version: '0';
-        osdkMetadata: typeof $osdkMetadata;
-      }
-
-      export const getCount: getCount = {
-        apiName: 'getCount',
-        type: 'query',
-        version: '0',
-        osdkMetadata: $osdkMetadata,
-      };
-      ",
-        "/foo/ontology/queries/returnsTodo.ts": "import type { QueryDefinition, QueryParam, QueryResult, VersionBound } from '@osdk/client';
-      import type { $ExpectedClientVersion } from '../../OntologyMetadata';
-      import { $osdkMetadata } from '../../OntologyMetadata';
-      import type { Todo } from '../objects/Todo';
-
-      export namespace returnsTodo {
-        export interface Signature {
-          (query: returnsTodo.Parameters): Promise<returnsTodo.ReturnType>;
-        }
-
-        export interface Parameters {
-          /**
-           *   description: Random desc so we test jsdoc
-           */
-          readonly someTodo: QueryParam.ObjectType<Todo>;
-        }
-
-        export type ReturnType = QueryResult.ObjectType<Todo>;
-      }
-
-      export interface returnsTodo extends QueryDefinition<returnsTodo.Signature>, VersionBound<$ExpectedClientVersion> {
-        __DefinitionMetadata?: {
-          apiName: 'returnsTodo';
-          rid: 'rid.query.2';
-          type: 'query';
-          version: '0';
-          parameters: {
-            /**
-             *   description: Random desc so we test jsdoc
-             */
-            someTodo: {
-              description: 'Random desc so we test jsdoc';
-              nullable: false;
-              object: 'Todo';
-              type: 'object';
-              __OsdkTargetType?: Todo;
-            };
-          };
-          output: {
-            nullable: false;
-            object: 'Todo';
-            type: 'object';
-            __OsdkTargetType?: Todo;
-          };
-          signature: returnsTodo.Signature;
-        };
-        apiName: 'returnsTodo';
-        type: 'query';
-        version: '0';
-        osdkMetadata: typeof $osdkMetadata;
-      }
-
-      export const returnsTodo: returnsTodo = {
-        apiName: 'returnsTodo',
-        type: 'query',
-        version: '0',
-        osdkMetadata: $osdkMetadata,
-      };
-      ",
-      }
-    `);
-  });
-  test("throws an error when target destination is not empty", async () => {
-    helper.minimalFiles.readdir = vi.fn(async () => ["file"]);
-    await expect(async () => {
-      await expect(generateClientSdkVersionTwoPointZero(TodoWireOntology, "typescript-sdk/0.0.0 osdk-cli/0.0.0", helper.minimalFiles, BASE_PATH)).rejects.toThrow();
-    });
-  });
-  it("throws an error if a namespace is provided that all top levels do not use", async () => {
-    await expect(generateClientSdkVersionTwoPointZero({
-      ...TodoWireOntology
-    }, "", helper.minimalFiles, BASE_PATH, "module", undefined, undefined, undefined, true));
-    // Disabled for now since we can't really enforce it from dev console at the moment
-    // .rejects.toThrowErrorMatchingInlineSnapshot(
-    //   `[Error: Found type { ns:'undefined', shortName: 'Todo'} but it is not in the generation namespace 'foo.bar'. This violates the contract of the generator.]`,
-    // );
-  });
-  it("does not throw an error if a namespace is provided that all top levels use", async () => {
-    await expect(generateClientSdkVersionTwoPointZero(fooBarTodoWireOntology, "", helper.minimalFiles, BASE_PATH, "module", undefined, undefined, undefined, true)).resolves.toMatchInlineSnapshot(`undefined`);
-    expect(helper.getFiles()["/foo/ontology/objects/foo.bar.Todo.ts"]).toBeUndefined();
-    expect(helper.getFiles()["/foo/ontology/objects/Todo.ts"]).not.toBeUndefined();
     expect(tweakedFilesForSnapshotConsistency(helper.getFiles())).toMatchInlineSnapshot(`
         {
           "/foo/OntologyMetadata.ts": "export type $ExpectedClientVersion = 'PLACEHOLDER';
-        export const $osdkMetadata = { extraUserAgent: '' };
+        export const $osdkMetadata = { extraUserAgent: 'typescript-sdk/0.0.0 osdk-cli/0.0.0' };
 
         export const $ontologyRid = 'ridHere';
         ",
@@ -964,6 +418,7 @@ describe("generator", () => {
         export * as $Objects from './ontology/objects.js';
         export { getCount, returnsTodo } from './ontology/queries.js';
         export * as $Queries from './ontology/queries.js';
+        export { $osdkMetadata } from './OntologyMetadata.js';
         export { $ontologyRid } from './OntologyMetadata.js';
         ",
           "/foo/ontology/actions.ts": "export { deleteTodos } from './actions/deleteTodos.js';
@@ -976,7 +431,7 @@ describe("generator", () => {
           ActionReturnTypeForOptions,
           ApplyActionOptions,
           ApplyBatchActionOptions,
-        } from '@osdk/api';
+        } from '@osdk/client';
         import { $osdkMetadata } from '../../OntologyMetadata.js';
         import type { Todo } from '../objects/Todo.js';
 
@@ -1024,7 +479,7 @@ describe("generator", () => {
          */
         export interface deleteTodos extends ActionDefinition<deleteTodos.Signatures> {
           __DefinitionMetadata?: {
-            apiName: 'foo.bar.deleteTodos';
+            apiName: 'deleteTodos';
             description: 'An action which takes in an array of objects';
             modifiedEntities: {};
             parameters: deleteTodos.ParamsDefinition;
@@ -1034,13 +489,13 @@ describe("generator", () => {
 
             signatures: deleteTodos.Signatures;
           };
-          apiName: 'foo.bar.deleteTodos';
+          apiName: 'deleteTodos';
           type: 'action';
           osdkMetadata: typeof $osdkMetadata;
         }
 
         export const deleteTodos: deleteTodos = {
-          apiName: 'foo.bar.deleteTodos',
+          apiName: 'deleteTodos',
           type: 'action',
           osdkMetadata: $osdkMetadata,
         };
@@ -1052,7 +507,7 @@ describe("generator", () => {
           ActionReturnTypeForOptions,
           ApplyActionOptions,
           ApplyBatchActionOptions,
-        } from '@osdk/api';
+        } from '@osdk/client';
         import { $osdkMetadata } from '../../OntologyMetadata.js';
         import type { Todo } from '../objects/Todo.js';
 
@@ -1100,10 +555,10 @@ describe("generator", () => {
          */
         export interface markTodoCompleted extends ActionDefinition<markTodoCompleted.Signatures> {
           __DefinitionMetadata?: {
-            apiName: 'foo.bar.markTodoCompleted';
+            apiName: 'markTodoCompleted';
             description: 'An action which takes different types of parameters';
             modifiedEntities: {
-              'foo.bar.Todo': {
+              Todo: {
                 created: false;
                 modified: true;
               };
@@ -1115,20 +570,20 @@ describe("generator", () => {
 
             signatures: markTodoCompleted.Signatures;
           };
-          apiName: 'foo.bar.markTodoCompleted';
+          apiName: 'markTodoCompleted';
           type: 'action';
           osdkMetadata: typeof $osdkMetadata;
         }
 
         export const markTodoCompleted: markTodoCompleted = {
-          apiName: 'foo.bar.markTodoCompleted',
+          apiName: 'markTodoCompleted',
           type: 'action',
           osdkMetadata: $osdkMetadata,
         };
         ",
           "/foo/ontology/interfaces.ts": "export { SomeInterface } from './interfaces/SomeInterface.js';
         ",
-          "/foo/ontology/interfaces/SomeInterface.ts": "import type { PropertyDef as $PropertyDef } from '@osdk/api';
+          "/foo/ontology/interfaces/SomeInterface.ts": "import type { PropertyDef as $PropertyDef } from '@osdk/client';
         import { $osdkMetadata } from '../../OntologyMetadata.js';
 
         import type {
@@ -1136,7 +591,7 @@ describe("generator", () => {
           ObjectSet as $ObjectSet,
           Osdk as $Osdk,
           PropertyValueWireToClient as $PropType,
-        } from '@osdk/api';
+        } from '@osdk/client';
 
         export type OsdkObjectLinks$SomeInterface = {};
 
@@ -1165,15 +620,16 @@ describe("generator", () => {
         export interface SomeInterface extends $InterfaceDefinition {
           osdkMetadata: typeof $osdkMetadata;
           type: 'interface';
-          apiName: 'foo.bar.SomeInterface';
+          apiName: 'SomeInterface';
           __DefinitionMetadata?: {
             objectSet: SomeInterface.ObjectSet;
             props: SomeInterface.Props;
             linksType: OsdkObjectLinks$SomeInterface;
             strictProps: SomeInterface.StrictProps;
-            apiName: 'foo.bar.SomeInterface';
+            apiName: 'SomeInterface';
             description: 'Some interface';
             displayName: 'Sum Interface';
+            implementedBy: [];
             implements: [];
             links: {};
             properties: {
@@ -1190,14 +646,14 @@ describe("generator", () => {
 
         export const SomeInterface: SomeInterface = {
           type: 'interface',
-          apiName: 'foo.bar.SomeInterface',
+          apiName: 'SomeInterface',
           osdkMetadata: $osdkMetadata,
         };
         ",
           "/foo/ontology/objects.ts": "export { Person } from './objects/Person.js';
         export { Todo } from './objects/Todo.js';
         ",
-          "/foo/ontology/objects/Person.ts": "import type { PropertyDef as $PropertyDef } from '@osdk/api';
+          "/foo/ontology/objects/Person.ts": "import type { PropertyDef as $PropertyDef } from '@osdk/client';
         import { $osdkMetadata } from '../../OntologyMetadata.js';
         import type { $ExpectedClientVersion } from '../../OntologyMetadata.js';
         import type { Todo } from './Todo.js';
@@ -1205,14 +661,14 @@ describe("generator", () => {
           PropertyKeys as $PropertyKeys,
           ObjectTypeDefinition as $ObjectTypeDefinition,
           ObjectMetadata as $ObjectMetadata,
-        } from '@osdk/api';
+        } from '@osdk/client';
         import type {
           ObjectSet as $ObjectSet,
           Osdk as $Osdk,
           OsdkObject as $OsdkObject,
           PropertyValueWireToClient as $PropType,
           SingleLinkAccessor as $SingleLinkAccessor,
-        } from '@osdk/api';
+        } from '@osdk/client';
 
         export namespace Person {
           export type PropertyKeys = 'email';
@@ -1243,13 +699,13 @@ describe("generator", () => {
         export interface Person extends $ObjectTypeDefinition {
           osdkMetadata: typeof $osdkMetadata;
           type: 'object';
-          apiName: 'foo.bar.Person';
+          apiName: 'Person';
           __DefinitionMetadata?: {
             objectSet: Person.ObjectSet;
             props: Person.Props;
             linksType: Person.Links;
             strictProps: Person.StrictProps;
-            apiName: 'foo.bar.Person';
+            apiName: 'Person';
             description: 'A person';
             displayName: 'Person';
             icon: {
@@ -1281,11 +737,11 @@ describe("generator", () => {
 
         export const Person: Person = {
           type: 'object',
-          apiName: 'foo.bar.Person',
+          apiName: 'Person',
           osdkMetadata: $osdkMetadata,
         };
         ",
-          "/foo/ontology/objects/Todo.ts": "import type { PropertyDef as $PropertyDef } from '@osdk/api';
+          "/foo/ontology/objects/Todo.ts": "import type { PropertyDef as $PropertyDef } from '@osdk/client';
         import { $osdkMetadata } from '../../OntologyMetadata.js';
         import type { $ExpectedClientVersion } from '../../OntologyMetadata.js';
         import type { Person } from './Person.js';
@@ -1293,14 +749,14 @@ describe("generator", () => {
           PropertyKeys as $PropertyKeys,
           ObjectTypeDefinition as $ObjectTypeDefinition,
           ObjectMetadata as $ObjectMetadata,
-        } from '@osdk/api';
+        } from '@osdk/client';
         import type {
           ObjectSet as $ObjectSet,
           Osdk as $Osdk,
           OsdkObject as $OsdkObject,
           PropertyValueWireToClient as $PropType,
           SingleLinkAccessor as $SingleLinkAccessor,
-        } from '@osdk/api';
+        } from '@osdk/client';
 
         export namespace Todo {
           export type PropertyKeys = 'id' | 'body' | 'complete';
@@ -1333,13 +789,13 @@ describe("generator", () => {
         export interface Todo extends $ObjectTypeDefinition {
           osdkMetadata: typeof $osdkMetadata;
           type: 'object';
-          apiName: 'foo.bar.Todo';
+          apiName: 'Todo';
           __DefinitionMetadata?: {
             objectSet: Todo.ObjectSet;
             props: Todo.Props;
             linksType: Todo.Links;
             strictProps: Todo.StrictProps;
-            apiName: 'foo.bar.Todo';
+            apiName: 'Todo';
             description: 'Its a todo item.';
             displayName: 'AwesomeTodoDisplayname';
             icon: {
@@ -1347,14 +803,14 @@ describe("generator", () => {
               name: 'document';
               color: 'blue';
             };
-            implements: ['foo.bar.SomeInterface'];
+            implements: ['SomeInterface'];
             interfaceMap: {
-              'foo.bar.SomeInterface': {
+              SomeInterface: {
                 SomeProperty: 'body';
               };
             };
             inverseInterfaceMap: {
-              'foo.bar.SomeInterface': {
+              SomeInterface: {
                 body: 'SomeProperty';
               };
             };
@@ -1388,14 +844,14 @@ describe("generator", () => {
 
         export const Todo: Todo = {
           type: 'object',
-          apiName: 'foo.bar.Todo',
+          apiName: 'Todo',
           osdkMetadata: $osdkMetadata,
         };
         ",
           "/foo/ontology/queries.ts": "export { getCount } from './queries/getCount.js';
         export { returnsTodo } from './queries/returnsTodo.js';
         ",
-          "/foo/ontology/queries/getCount.ts": "import type { QueryDefinition, QueryParam, QueryResult, VersionBound } from '@osdk/api';
+          "/foo/ontology/queries/getCount.ts": "import type { QueryDefinition, QueryParam, QueryResult, VersionBound } from '@osdk/client';
         import type { $ExpectedClientVersion } from '../../OntologyMetadata.js';
         import { $osdkMetadata } from '../../OntologyMetadata.js';
 
@@ -1416,7 +872,7 @@ describe("generator", () => {
 
         export interface getCount extends QueryDefinition<getCount.Signature>, VersionBound<$ExpectedClientVersion> {
           __DefinitionMetadata?: {
-            apiName: 'foo.bar.getCount';
+            apiName: 'getCount';
             rid: 'rid.query.1';
             type: 'query';
             version: '0';
@@ -1435,20 +891,20 @@ describe("generator", () => {
             };
             signature: getCount.Signature;
           };
-          apiName: 'foo.bar.getCount';
+          apiName: 'getCount';
           type: 'query';
           version: '0';
           osdkMetadata: typeof $osdkMetadata;
         }
 
         export const getCount: getCount = {
-          apiName: 'foo.bar.getCount',
+          apiName: 'getCount',
           type: 'query',
           version: '0',
           osdkMetadata: $osdkMetadata,
         };
         ",
-          "/foo/ontology/queries/returnsTodo.ts": "import type { QueryDefinition, QueryParam, QueryResult, VersionBound } from '@osdk/api';
+          "/foo/ontology/queries/returnsTodo.ts": "import type { QueryDefinition, QueryParam, QueryResult, VersionBound } from '@osdk/client';
         import type { $ExpectedClientVersion } from '../../OntologyMetadata.js';
         import { $osdkMetadata } from '../../OntologyMetadata.js';
         import type { Todo } from '../objects/Todo.js';
@@ -1470,7 +926,7 @@ describe("generator", () => {
 
         export interface returnsTodo extends QueryDefinition<returnsTodo.Signature>, VersionBound<$ExpectedClientVersion> {
           __DefinitionMetadata?: {
-            apiName: 'foo.bar.returnsTodo';
+            apiName: 'returnsTodo';
             rid: 'rid.query.2';
             type: 'query';
             version: '0';
@@ -1481,20 +937,603 @@ describe("generator", () => {
               someTodo: {
                 description: 'Random desc so we test jsdoc';
                 nullable: false;
-                object: 'foo.bar.Todo';
+                object: 'Todo';
                 type: 'object';
                 __OsdkTargetType?: Todo;
               };
             };
             output: {
               nullable: false;
-              object: 'foo.bar.Todo';
+              object: 'Todo';
               type: 'object';
               __OsdkTargetType?: Todo;
             };
             signature: returnsTodo.Signature;
           };
-          apiName: 'foo.bar.returnsTodo';
+          apiName: 'returnsTodo';
+          type: 'query';
+          version: '0';
+          osdkMetadata: typeof $osdkMetadata;
+        }
+
+        export const returnsTodo: returnsTodo = {
+          apiName: 'returnsTodo',
+          type: 'query',
+          version: '0',
+          osdkMetadata: $osdkMetadata,
+        };
+        ",
+        }
+      `);
+  });
+  test("throws an error when target destination is not empty", async () => {
+    helper.minimalFiles.readdir = vi.fn(async () => ["file"]);
+    await expect(async () => {
+      await expect(generateClientSdkVersionTwoPointZero(TodoWireOntology, "typescript-sdk/0.0.0 osdk-cli/0.0.0", helper.minimalFiles, BASE_PATH)).rejects.toThrow();
+    });
+  });
+  it("throws an error if a namespace is provided that all top levels do not use", async () => {
+    await expect(generateClientSdkVersionTwoPointZero({
+      ...TodoWireOntology
+    }, "", helper.minimalFiles, BASE_PATH, "module", undefined, undefined, undefined, true));
+
+    // Disabled for now since we can't really enforce it from dev console at the moment
+    // .rejects.toThrowErrorMatchingInlineSnapshot(
+    //   `[Error: Found type { ns:'undefined', shortName: 'Todo'} but it is not in the generation namespace 'foo.bar'. This violates the contract of the generator.]`,
+    // );
+  });
+  it("does not throw an error if a namespace is provided that all top levels use", async () => {
+    await expect(generateClientSdkVersionTwoPointZero(fooBarTodoWireOntology, "", helper.minimalFiles, BASE_PATH, "module", undefined, undefined, undefined, true)).resolves.toMatchInlineSnapshot(`undefined`);
+    expect(helper.getFiles()["/foo/ontology/objects/foo.bar.Todo.ts"]).toBeUndefined();
+    expect(helper.getFiles()["/foo/ontology/objects/Todo.ts"]).not.toBeUndefined();
+    expect(tweakedFilesForSnapshotConsistency(helper.getFiles())).toMatchInlineSnapshot(`
+        {
+          "/foo/OntologyMetadata.ts": "export type $ExpectedClientVersion = 'PLACEHOLDER';
+        export const $osdkMetadata = { extraUserAgent: '' };
+
+        export const $ontologyRid = 'ridHere';
+        ",
+          "/foo/index.ts": "export { deleteTodos, markTodoCompleted } from './ontology/actions.js';
+        export * as $Actions from './ontology/actions.js';
+        export { SomeInterface } from './ontology/interfaces.js';
+        export * as $Interfaces from './ontology/interfaces.js';
+        export { Person, Todo } from './ontology/objects.js';
+        export * as $Objects from './ontology/objects.js';
+        export { getCount, returnsTodo } from './ontology/queries.js';
+        export * as $Queries from './ontology/queries.js';
+        export { $osdkMetadata } from './OntologyMetadata.js';
+        export { $ontologyRid } from './OntologyMetadata.js';
+        ",
+          "/foo/ontology/actions.ts": "export { deleteTodos } from './actions/deleteTodos.js';
+        export { markTodoCompleted } from './actions/markTodoCompleted.js';
+        ",
+          "/foo/ontology/actions/deleteTodos.ts": "import type {
+          ActionDefinition,
+          ActionMetadata,
+          ActionParam,
+          ActionReturnTypeForOptions,
+          ApplyActionOptions,
+          ApplyBatchActionOptions,
+        } from '@osdk/api';
+        import { $osdkMetadata } from '../../OntologyMetadata.js';
+        import type { Todo } from '../objects/Todo.js';
+
+        export namespace deleteTodos {
+          // Represents the definition of the parameters for the action
+          export type ParamsDefinition = {
+            object: {
+              description: 'Todo(s) to be deleted';
+              multiplicity: true;
+              nullable: true;
+              type: ActionMetadata.DataType.Object<Todo>;
+            };
+          };
+
+          /**
+           * An action which takes in an array of objects
+           */
+          export interface Params {
+            /**
+             * Todo(s) to be deleted
+             */
+            readonly object?: ReadonlyArray<ActionParam.ObjectType<Todo>>;
+          }
+
+          // Represents a fqn of the action
+          export interface Signatures {
+            /**
+             * An action which takes in an array of objects
+             */
+            applyAction<P extends deleteTodos.Params, OP extends ApplyActionOptions>(
+              args: P,
+              options?: OP,
+            ): Promise<ActionReturnTypeForOptions<OP>>;
+
+            batchApplyAction<P extends ReadonlyArray<deleteTodos.Params>, OP extends ApplyBatchActionOptions>(
+              args: P,
+              options?: OP,
+            ): Promise<ActionReturnTypeForOptions<OP>>;
+          }
+        }
+
+        /**
+         * An action which takes in an array of objects
+         * @param {ActionParam.ObjectType<Todo>} [object] Todo(s) to be deleted
+         */
+        export interface deleteTodos extends ActionDefinition<deleteTodos.Signatures> {
+          __DefinitionMetadata?: {
+            apiName: 'foo.bar.deleteTodos';
+            description: 'An action which takes in an array of objects';
+            modifiedEntities: {};
+            parameters: deleteTodos.ParamsDefinition;
+            rid: 'ri.ontology.main.action-type.8f94017d-cf17-4fa8-84c3-8e01e5d594f2';
+            status: 'ACTIVE';
+            type: 'action';
+
+            signatures: deleteTodos.Signatures;
+          };
+          apiName: 'foo.bar.deleteTodos';
+          type: 'action';
+          osdkMetadata: typeof $osdkMetadata;
+        }
+
+        export const deleteTodos: deleteTodos = {
+          apiName: 'foo.bar.deleteTodos',
+          type: 'action',
+          osdkMetadata: $osdkMetadata,
+        };
+        ",
+          "/foo/ontology/actions/markTodoCompleted.ts": "import type {
+          ActionDefinition,
+          ActionMetadata,
+          ActionParam,
+          ActionReturnTypeForOptions,
+          ApplyActionOptions,
+          ApplyBatchActionOptions,
+        } from '@osdk/api';
+        import { $osdkMetadata } from '../../OntologyMetadata.js';
+        import type { Todo } from '../objects/Todo.js';
+
+        export namespace markTodoCompleted {
+          // Represents the definition of the parameters for the action
+          export type ParamsDefinition = {
+            object: {
+              description: 'A Todo to mark completed';
+              multiplicity: false;
+              nullable: true;
+              type: ActionMetadata.DataType.Object<Todo>;
+            };
+          };
+
+          /**
+           * An action which takes different types of parameters
+           */
+          export interface Params {
+            /**
+             * A Todo to mark completed
+             */
+            readonly object?: ActionParam.ObjectType<Todo>;
+          }
+
+          // Represents a fqn of the action
+          export interface Signatures {
+            /**
+             * An action which takes different types of parameters
+             */
+            applyAction<P extends markTodoCompleted.Params, OP extends ApplyActionOptions>(
+              args: P,
+              options?: OP,
+            ): Promise<ActionReturnTypeForOptions<OP>>;
+
+            batchApplyAction<P extends ReadonlyArray<markTodoCompleted.Params>, OP extends ApplyBatchActionOptions>(
+              args: P,
+              options?: OP,
+            ): Promise<ActionReturnTypeForOptions<OP>>;
+          }
+        }
+
+        /**
+         * An action which takes different types of parameters
+         * @param {ActionParam.ObjectType<Todo>} [object] A Todo to mark completed
+         */
+        export interface markTodoCompleted extends ActionDefinition<markTodoCompleted.Signatures> {
+          __DefinitionMetadata?: {
+            apiName: 'foo.bar.markTodoCompleted';
+            description: 'An action which takes different types of parameters';
+            modifiedEntities: {
+              'foo.bar.Todo': {
+                created: false;
+                modified: true;
+              };
+            };
+            parameters: markTodoCompleted.ParamsDefinition;
+            rid: 'ri.ontology.main.action-type.9f84017d-cf17-4fa8-84c3-8e01e5d594f2';
+            status: 'ACTIVE';
+            type: 'action';
+
+            signatures: markTodoCompleted.Signatures;
+          };
+          apiName: 'foo.bar.markTodoCompleted';
+          type: 'action';
+          osdkMetadata: typeof $osdkMetadata;
+        }
+
+        export const markTodoCompleted: markTodoCompleted = {
+          apiName: 'foo.bar.markTodoCompleted',
+          type: 'action',
+          osdkMetadata: $osdkMetadata,
+        };
+        ",
+          "/foo/ontology/interfaces.ts": "export { SomeInterface } from './interfaces/SomeInterface.js';
+        ",
+          "/foo/ontology/interfaces/SomeInterface.ts": "import type { PropertyDef as $PropertyDef } from '@osdk/api';
+        import { $osdkMetadata } from '../../OntologyMetadata.js';
+
+        import type {
+          InterfaceDefinition as $InterfaceDefinition,
+          ObjectSet as $ObjectSet,
+          Osdk as $Osdk,
+          PropertyValueWireToClient as $PropType,
+        } from '@osdk/api';
+
+        export type OsdkObjectLinks$SomeInterface = {};
+
+        export namespace SomeInterface {
+          export type PropertyKeys = 'SomeProperty';
+
+          export interface Props {
+            readonly SomeProperty: $PropType['string'] | undefined;
+          }
+          export type StrictProps = Props;
+
+          export interface ObjectSet extends $ObjectSet<SomeInterface, SomeInterface.ObjectSet> {}
+
+          export type OsdkInstance<
+            OPTIONS extends never | '$rid' = never,
+            K extends keyof SomeInterface.Props = keyof SomeInterface.Props,
+          > = $Osdk.Instance<SomeInterface, OPTIONS, K>;
+
+          /** @deprecated use OsdkInstance */
+          export type OsdkObject<
+            OPTIONS extends never | '$rid' = never,
+            K extends keyof SomeInterface.Props = keyof SomeInterface.Props,
+          > = OsdkInstance<OPTIONS, K>;
+        }
+
+        export interface SomeInterface extends $InterfaceDefinition {
+          osdkMetadata: typeof $osdkMetadata;
+          type: 'interface';
+          apiName: 'foo.bar.SomeInterface';
+          __DefinitionMetadata?: {
+            objectSet: SomeInterface.ObjectSet;
+            props: SomeInterface.Props;
+            linksType: OsdkObjectLinks$SomeInterface;
+            strictProps: SomeInterface.StrictProps;
+            apiName: 'foo.bar.SomeInterface';
+            description: 'Some interface';
+            displayName: 'Sum Interface';
+            implementedBy: [];
+            implements: [];
+            links: {};
+            properties: {
+              /**
+               *   display name: 'Sum Property',
+               *   description: Some property
+               */
+              SomeProperty: $PropertyDef<'string', 'nullable', 'single'>;
+            };
+            rid: 'idk';
+            type: 'interface';
+          };
+        }
+
+        export const SomeInterface: SomeInterface = {
+          type: 'interface',
+          apiName: 'foo.bar.SomeInterface',
+          osdkMetadata: $osdkMetadata,
+        };
+        ",
+          "/foo/ontology/objects.ts": "export { Person } from './objects/Person.js';
+        export { Todo } from './objects/Todo.js';
+        ",
+          "/foo/ontology/objects/Person.ts": "import type { PropertyDef as $PropertyDef } from '@osdk/api';
+        import { $osdkMetadata } from '../../OntologyMetadata.js';
+        import type { $ExpectedClientVersion } from '../../OntologyMetadata.js';
+        import type { Todo } from './Todo.js';
+        import type {
+          PropertyKeys as $PropertyKeys,
+          ObjectTypeDefinition as $ObjectTypeDefinition,
+          ObjectMetadata as $ObjectMetadata,
+        } from '@osdk/api';
+        import type {
+          ObjectSet as $ObjectSet,
+          Osdk as $Osdk,
+          OsdkObject as $OsdkObject,
+          PropertyValueWireToClient as $PropType,
+          SingleLinkAccessor as $SingleLinkAccessor,
+        } from '@osdk/api';
+
+        export namespace Person {
+          export type PropertyKeys = 'email';
+
+          export interface Links {
+            readonly Todos: Todo.ObjectSet;
+          }
+
+          export interface Props {
+            readonly email: $PropType['string'];
+          }
+          export type StrictProps = Props;
+
+          export interface ObjectSet extends $ObjectSet<Person, Person.ObjectSet> {}
+
+          export type OsdkInstance<
+            OPTIONS extends never | '$rid' = never,
+            K extends keyof Person.Props = keyof Person.Props,
+          > = $Osdk.Instance<Person, OPTIONS, K>;
+
+          /** @deprecated use OsdkInstance */
+          export type OsdkObject<
+            OPTIONS extends never | '$rid' = never,
+            K extends keyof Person.Props = keyof Person.Props,
+          > = OsdkInstance<OPTIONS, K>;
+        }
+
+        export interface Person extends $ObjectTypeDefinition {
+          osdkMetadata: typeof $osdkMetadata;
+          type: 'object';
+          apiName: 'foo.bar.Person';
+          __DefinitionMetadata?: {
+            objectSet: Person.ObjectSet;
+            props: Person.Props;
+            linksType: Person.Links;
+            strictProps: Person.StrictProps;
+            apiName: 'foo.bar.Person';
+            description: 'A person';
+            displayName: 'Person';
+            icon: {
+              type: 'blueprint';
+              name: 'document';
+              color: 'blue';
+            };
+            implements: [];
+            interfaceMap: {};
+            inverseInterfaceMap: {};
+            links: {
+              Todos: $ObjectMetadata.Link<Todo, true>;
+            };
+            pluralDisplayName: 'Persons';
+            primaryKeyApiName: 'email';
+            primaryKeyType: 'string';
+            properties: {
+              /**
+               * (no ontology metadata)
+               */
+              email: $PropertyDef<'string', 'non-nullable', 'single'>;
+            };
+            rid: 'ridForPerson';
+            status: 'ACTIVE';
+            titleProperty: 'email';
+            type: 'object';
+          };
+        }
+
+        export const Person: Person = {
+          type: 'object',
+          apiName: 'foo.bar.Person',
+          osdkMetadata: $osdkMetadata,
+        };
+        ",
+          "/foo/ontology/objects/Todo.ts": "import type { PropertyDef as $PropertyDef } from '@osdk/api';
+        import { $osdkMetadata } from '../../OntologyMetadata.js';
+        import type { $ExpectedClientVersion } from '../../OntologyMetadata.js';
+        import type { Person } from './Person.js';
+        import type {
+          PropertyKeys as $PropertyKeys,
+          ObjectTypeDefinition as $ObjectTypeDefinition,
+          ObjectMetadata as $ObjectMetadata,
+        } from '@osdk/api';
+        import type {
+          ObjectSet as $ObjectSet,
+          Osdk as $Osdk,
+          OsdkObject as $OsdkObject,
+          PropertyValueWireToClient as $PropType,
+          SingleLinkAccessor as $SingleLinkAccessor,
+        } from '@osdk/api';
+
+        export namespace Todo {
+          export type PropertyKeys = 'id' | 'body' | 'complete';
+
+          export interface Links {
+            readonly Assignee: $SingleLinkAccessor<Person>;
+          }
+
+          export interface Props {
+            readonly body: $PropType['string'] | undefined;
+            readonly complete: $PropType['boolean'] | undefined;
+            readonly id: $PropType['integer'];
+          }
+          export type StrictProps = Props;
+
+          export interface ObjectSet extends $ObjectSet<Todo, Todo.ObjectSet> {}
+
+          export type OsdkInstance<
+            OPTIONS extends never | '$rid' = never,
+            K extends keyof Todo.Props = keyof Todo.Props,
+          > = $Osdk.Instance<Todo, OPTIONS, K>;
+
+          /** @deprecated use OsdkInstance */
+          export type OsdkObject<
+            OPTIONS extends never | '$rid' = never,
+            K extends keyof Todo.Props = keyof Todo.Props,
+          > = OsdkInstance<OPTIONS, K>;
+        }
+
+        export interface Todo extends $ObjectTypeDefinition {
+          osdkMetadata: typeof $osdkMetadata;
+          type: 'object';
+          apiName: 'foo.bar.Todo';
+          __DefinitionMetadata?: {
+            objectSet: Todo.ObjectSet;
+            props: Todo.Props;
+            linksType: Todo.Links;
+            strictProps: Todo.StrictProps;
+            apiName: 'foo.bar.Todo';
+            description: 'Its a todo item.';
+            displayName: 'AwesomeTodoDisplayname';
+            icon: {
+              type: 'blueprint';
+              name: 'document';
+              color: 'blue';
+            };
+            implements: ['foo.bar.SomeInterface'];
+            interfaceMap: {
+              'foo.bar.SomeInterface': {
+                SomeProperty: 'body';
+              };
+            };
+            inverseInterfaceMap: {
+              'foo.bar.SomeInterface': {
+                body: 'SomeProperty';
+              };
+            };
+            links: {
+              Assignee: $ObjectMetadata.Link<Person, false>;
+            };
+            pluralDisplayName: 'AwesomeTodoDisplayNames';
+            primaryKeyApiName: 'id';
+            primaryKeyType: 'integer';
+            properties: {
+              /**
+               *   display name: 'Body',
+               *   description: The text of the todo
+               */
+              body: $PropertyDef<'string', 'nullable', 'single'>;
+              /**
+               * (no ontology metadata)
+               */
+              complete: $PropertyDef<'boolean', 'nullable', 'single'>;
+              /**
+               * (no ontology metadata)
+               */
+              id: $PropertyDef<'integer', 'non-nullable', 'single'>;
+            };
+            rid: 'ridForTodo';
+            status: 'ACTIVE';
+            titleProperty: 'body';
+            type: 'object';
+          };
+        }
+
+        export const Todo: Todo = {
+          type: 'object',
+          apiName: 'foo.bar.Todo',
+          osdkMetadata: $osdkMetadata,
+        };
+        ",
+          "/foo/ontology/queries.ts": "export { getCount } from './queries/getCount.js';
+        export { returnsTodo } from './queries/returnsTodo.js';
+        ",
+          "/foo/ontology/queries/getCount.ts": "import type { QueryDefinition, QueryParam, QueryResult, VersionBound } from '@osdk/api';
+        import type { $ExpectedClientVersion } from '../../OntologyMetadata.js';
+        import { $osdkMetadata } from '../../OntologyMetadata.js';
+
+        export namespace getCount {
+          export interface Signature {
+            (query: getCount.Parameters): Promise<getCount.ReturnType>;
+          }
+
+          export interface Parameters {
+            /**
+             * (no ontology metadata)
+             */
+            readonly completed: QueryParam.PrimitiveType<'boolean'>;
+          }
+
+          export type ReturnType = QueryResult.PrimitiveType<'integer'>;
+        }
+
+        export interface getCount extends QueryDefinition<getCount.Signature>, VersionBound<$ExpectedClientVersion> {
+          __DefinitionMetadata?: {
+            apiName: 'foo.bar.getCount';
+            rid: 'rid.query.1';
+            type: 'query';
+            version: '0';
+            parameters: {
+              /**
+               * (no ontology metadata)
+               */
+              completed: {
+                nullable: false;
+                type: 'boolean';
+              };
+            };
+            output: {
+              nullable: false;
+              type: 'integer';
+            };
+            signature: getCount.Signature;
+          };
+          apiName: 'foo.bar.getCount';
+          type: 'query';
+          version: '0';
+          osdkMetadata: typeof $osdkMetadata;
+        }
+
+        export const getCount: getCount = {
+          apiName: 'foo.bar.getCount',
+          type: 'query',
+          version: '0',
+          osdkMetadata: $osdkMetadata,
+        };
+        ",
+          "/foo/ontology/queries/returnsTodo.ts": "import type { QueryDefinition, QueryParam, QueryResult, VersionBound } from '@osdk/api';
+        import type { $ExpectedClientVersion } from '../../OntologyMetadata.js';
+        import { $osdkMetadata } from '../../OntologyMetadata.js';
+        import type { Todo } from '../objects/Todo.js';
+
+        export namespace returnsTodo {
+          export interface Signature {
+            (query: returnsTodo.Parameters): Promise<returnsTodo.ReturnType>;
+          }
+
+          export interface Parameters {
+            /**
+             *   description: Random desc so we test jsdoc
+             */
+            readonly someTodo: QueryParam.ObjectType<Todo>;
+          }
+
+          export type ReturnType = QueryResult.ObjectType<Todo>;
+        }
+
+        export interface returnsTodo extends QueryDefinition<returnsTodo.Signature>, VersionBound<$ExpectedClientVersion> {
+          __DefinitionMetadata?: {
+            apiName: 'foo.bar.returnsTodo';
+            rid: 'rid.query.2';
+            type: 'query';
+            version: '0';
+            parameters: {
+              /**
+               *   description: Random desc so we test jsdoc
+               */
+              someTodo: {
+                description: 'Random desc so we test jsdoc';
+                nullable: false;
+                object: 'foo.bar.Todo';
+                type: 'object';
+                __OsdkTargetType?: Todo;
+              };
+            };
+            output: {
+              nullable: false;
+              object: 'foo.bar.Todo';
+              type: 'object';
+              __OsdkTargetType?: Todo;
+            };
+            signature: returnsTodo.Signature;
+          };
+          apiName: 'foo.bar.returnsTodo';
           type: 'query';
           version: '0';
           osdkMetadata: typeof $osdkMetadata;
@@ -1545,6 +1584,7 @@ describe("generator", () => {
   describe("$ontologyRid", () => {
     it("does not exist when an ontology api name is provided", async () => {
       await expect(generateClientSdkVersionTwoPointZero(fooBarTodoWireOntology, "", helper.minimalFiles, "/foo", "module", new Map())).resolves.toMatchInlineSnapshot(`undefined`);
+
       // expect(helper.getFiles()["/foo/index.ts"]).not.toContain(
       //   "$ontologyRid",
       // );
@@ -1798,7 +1838,9 @@ describe("generator", () => {
     });
   });
   it("can generate an sdk package that is entirely a library", async () => {
+    const mockConsola = vi.spyOn(consola, "info");
     await expect(generateClientSdkVersionTwoPointZero(referencedOntology, "", helper.minimalFiles, BASE_PATH, "module")).resolves.toMatchInlineSnapshot(`undefined`);
+    expect(mockConsola).toHaveBeenCalledWith(`{"type":"futureUnknownType"} is not a supported propertyType`);
     expect(tweakedFilesForSnapshotConsistency(helper.getFiles())).toMatchInlineSnapshot(`
         {
           "/foo/OntologyMetadata.ts": "export type $ExpectedClientVersion = 'PLACEHOLDER';
@@ -1814,6 +1856,7 @@ describe("generator", () => {
         export * as $Objects from './ontology/objects.js';
         export {} from './ontology/queries.js';
         export * as $Queries from './ontology/queries.js';
+        export { $osdkMetadata } from './OntologyMetadata.js';
         export { $ontologyRid } from './OntologyMetadata.js';
         ",
           "/foo/ontology/actions.ts": "export {};
@@ -1865,6 +1908,7 @@ describe("generator", () => {
             strictProps: SomeInterface.StrictProps;
             apiName: 'com.example.dep.SomeInterface';
             displayName: 'Sum Interface';
+            implementedBy: [];
             implements: [];
             links: {};
             properties: {