@osdk/generator 2.1.0-beta.0 → 2.1.0-beta.10

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

@@ -396,7 +396,7 @@ describe("generator", () => {
         ActionReturnTypeForOptions,
         ApplyActionOptions,
         ApplyBatchActionOptions,
-      } from '@osdk/api';
+      } from '@osdk/client';
       import { $osdkMetadata } from '../../OntologyMetadata';
       import type { Todo } from '../objects/Todo';
 
@@ -472,7 +472,7 @@ describe("generator", () => {
         ActionReturnTypeForOptions,
         ApplyActionOptions,
         ApplyBatchActionOptions,
-      } from '@osdk/api';
+      } from '@osdk/client';
       import { $osdkMetadata } from '../../OntologyMetadata';
       import type { Todo } from '../objects/Todo';
 
@@ -548,7 +548,7 @@ describe("generator", () => {
       ",
         "/foo/ontology/interfaces.ts": "export { SomeInterface } from './interfaces/SomeInterface';
       ",
-        "/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';
 
       import type {
@@ -556,7 +556,7 @@ describe("generator", () => {
         ObjectSet as $ObjectSet,
         Osdk as $Osdk,
         PropertyValueWireToClient as $PropType,
-      } from '@osdk/api';
+      } from '@osdk/client';
 
       export type OsdkObjectLinks$SomeInterface = {};
 
@@ -566,20 +566,18 @@ describe("generator", () => {
         export interface Props {
           readonly SomeProperty: $PropType['string'] | undefined;
         }
-        export interface StrictProps {
-          readonly SomeProperty: $PropType['string'] | undefined;
-        }
+        export type StrictProps = Props;
 
         export interface ObjectSet extends $ObjectSet<SomeInterface, SomeInterface.ObjectSet> {}
 
         export type OsdkInstance<
-          OPTIONS extends never | '$notStrict' | '$rid' = never,
+          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 | '$notStrict' | '$rid' = never,
+          OPTIONS extends never | '$rid' = never,
           K extends keyof SomeInterface.Props = keyof SomeInterface.Props,
         > = OsdkInstance<OPTIONS, K>;
       }
@@ -619,7 +617,7 @@ describe("generator", () => {
         "/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/api';
+        "/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';
@@ -627,14 +625,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';
@@ -644,22 +642,20 @@ describe("generator", () => {
         }
 
         export interface Props {
-          readonly email: $PropType['string'] | undefined;
-        }
-        export interface StrictProps {
           readonly email: $PropType['string'];
         }
+        export type StrictProps = Props;
 
         export interface ObjectSet extends $ObjectSet<Person, Person.ObjectSet> {}
 
         export type OsdkInstance<
-          OPTIONS extends never | '$notStrict' | '$rid' = never,
+          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 | '$notStrict' | '$rid' = never,
+          OPTIONS extends never | '$rid' = never,
           K extends keyof Person.Props = keyof Person.Props,
         > = OsdkInstance<OPTIONS, K>;
       }
@@ -709,7 +705,7 @@ describe("generator", () => {
         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';
       import type { $ExpectedClientVersion } from '../../OntologyMetadata';
       import type { Person } from './Person';
@@ -717,14 +713,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';
@@ -734,26 +730,22 @@ describe("generator", () => {
         }
 
         export interface Props {
-          readonly body: $PropType['string'] | undefined;
-          readonly complete: $PropType['boolean'] | undefined;
-          readonly id: $PropType['integer'] | undefined;
-        }
-        export interface StrictProps {
           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 | '$notStrict' | '$rid' = never,
+          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 | '$notStrict' | '$rid' = never,
+          OPTIONS extends never | '$rid' = never,
           K extends keyof Todo.Props = keyof Todo.Props,
         > = OsdkInstance<OPTIONS, K>;
       }
@@ -823,14 +815,13 @@ describe("generator", () => {
         "/foo/ontology/queries.ts": "export { getCount } from './queries/getCount';
       export { returnsTodo } from './queries/returnsTodo';
       ",
-        "/foo/ontology/queries/getCount.ts": "import type { QueryDefinition, VersionBound } from '@osdk/api';
-      import type { QueryParam, QueryResult } from '@osdk/api';
+        "/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<QueryResult.PrimitiveType<'integer'>>;
+          (query: getCount.Parameters): Promise<getCount.ReturnType>;
         }
 
         export interface Parameters {
@@ -839,6 +830,8 @@ describe("generator", () => {
            */
           readonly completed: QueryParam.PrimitiveType<'boolean'>;
         }
+
+        export type ReturnType = QueryResult.PrimitiveType<'integer'>;
       }
 
       export interface getCount extends QueryDefinition<getCount.Signature>, VersionBound<$ExpectedClientVersion> {
@@ -875,15 +868,14 @@ describe("generator", () => {
         osdkMetadata: $osdkMetadata,
       };
       ",
-        "/foo/ontology/queries/returnsTodo.ts": "import type { QueryDefinition, VersionBound } from '@osdk/api';
-      import type { QueryParam, QueryResult } from '@osdk/api';
+        "/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<QueryResult.ObjectType<Todo>>;
+          (query: returnsTodo.Parameters): Promise<returnsTodo.ReturnType>;
         }
 
         export interface Parameters {
@@ -892,6 +884,8 @@ describe("generator", () => {
            */
           readonly someTodo: QueryParam.ObjectType<Todo>;
         }
+
+        export type ReturnType = QueryResult.ObjectType<Todo>;
       }
 
       export interface returnsTodo extends QueryDefinition<returnsTodo.Signature>, VersionBound<$ExpectedClientVersion> {
@@ -945,14 +939,14 @@ describe("generator", () => {
   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"));
+    }, "", 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")).resolves.toMatchInlineSnapshot(`undefined`);
+    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(`
@@ -1152,20 +1146,18 @@ describe("generator", () => {
           export interface Props {
             readonly SomeProperty: $PropType['string'] | undefined;
           }
-          export interface StrictProps {
-            readonly SomeProperty: $PropType['string'] | undefined;
-          }
+          export type StrictProps = Props;
 
           export interface ObjectSet extends $ObjectSet<SomeInterface, SomeInterface.ObjectSet> {}
 
           export type OsdkInstance<
-            OPTIONS extends never | '$notStrict' | '$rid' = never,
+            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 | '$notStrict' | '$rid' = never,
+            OPTIONS extends never | '$rid' = never,
             K extends keyof SomeInterface.Props = keyof SomeInterface.Props,
           > = OsdkInstance<OPTIONS, K>;
         }
@@ -1230,22 +1222,20 @@ describe("generator", () => {
           }
 
           export interface Props {
-            readonly email: $PropType['string'] | undefined;
-          }
-          export interface StrictProps {
             readonly email: $PropType['string'];
           }
+          export type StrictProps = Props;
 
           export interface ObjectSet extends $ObjectSet<Person, Person.ObjectSet> {}
 
           export type OsdkInstance<
-            OPTIONS extends never | '$notStrict' | '$rid' = never,
+            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 | '$notStrict' | '$rid' = never,
+            OPTIONS extends never | '$rid' = never,
             K extends keyof Person.Props = keyof Person.Props,
           > = OsdkInstance<OPTIONS, K>;
         }
@@ -1320,26 +1310,22 @@ describe("generator", () => {
           }
 
           export interface Props {
-            readonly body: $PropType['string'] | undefined;
-            readonly complete: $PropType['boolean'] | undefined;
-            readonly id: $PropType['integer'] | undefined;
-          }
-          export interface StrictProps {
             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 | '$notStrict' | '$rid' = never,
+            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 | '$notStrict' | '$rid' = never,
+            OPTIONS extends never | '$rid' = never,
             K extends keyof Todo.Props = keyof Todo.Props,
           > = OsdkInstance<OPTIONS, K>;
         }
@@ -1409,14 +1395,13 @@ describe("generator", () => {
           "/foo/ontology/queries.ts": "export { getCount } from './queries/getCount.js';
         export { returnsTodo } from './queries/returnsTodo.js';
         ",
-          "/foo/ontology/queries/getCount.ts": "import type { QueryDefinition, VersionBound } from '@osdk/api';
-        import type { QueryParam, QueryResult } from '@osdk/api';
+          "/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<QueryResult.PrimitiveType<'integer'>>;
+            (query: getCount.Parameters): Promise<getCount.ReturnType>;
           }
 
           export interface Parameters {
@@ -1425,6 +1410,8 @@ describe("generator", () => {
              */
             readonly completed: QueryParam.PrimitiveType<'boolean'>;
           }
+
+          export type ReturnType = QueryResult.PrimitiveType<'integer'>;
         }
 
         export interface getCount extends QueryDefinition<getCount.Signature>, VersionBound<$ExpectedClientVersion> {
@@ -1461,15 +1448,14 @@ describe("generator", () => {
           osdkMetadata: $osdkMetadata,
         };
         ",
-          "/foo/ontology/queries/returnsTodo.ts": "import type { QueryDefinition, VersionBound } from '@osdk/api';
-        import type { QueryParam, QueryResult } from '@osdk/api';
+          "/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<QueryResult.ObjectType<Todo>>;
+            (query: returnsTodo.Parameters): Promise<returnsTodo.ReturnType>;
           }
 
           export interface Parameters {
@@ -1478,6 +1464,8 @@ describe("generator", () => {
              */
             readonly someTodo: QueryParam.ObjectType<Todo>;
           }
+
+          export type ReturnType = QueryResult.ObjectType<Todo>;
         }
 
         export interface returnsTodo extends QueryDefinition<returnsTodo.Signature>, VersionBound<$ExpectedClientVersion> {
@@ -1568,17 +1556,16 @@ describe("generator", () => {
   });
   describe("query depends on foreign object", () => {
     it("generates the correct code", async () => {
-      await expect(generateClientSdkVersionTwoPointZero(referencingOntology, "", helper.minimalFiles, BASE_PATH, "module", new Map([["com.example.dep.Task", "@com.example.dep/osdk"]]), new Map([["com.example.dep.SomeInterface", "@com.example.dep/osdk"]]), new Map([["com.example.dep.spt", "@com.example.dep/osdk"]]))).resolves.toMatchInlineSnapshot(`undefined`);
+      await expect(generateClientSdkVersionTwoPointZero(referencingOntology, "", helper.minimalFiles, BASE_PATH, "module", new Map([["com.example.dep.Task", "@com.example.dep/osdk"]]), new Map([["com.example.dep.SomeInterface", "@com.example.dep/osdk"]]), new Map([["com.example.dep.spt", "@com.example.dep/osdk"]]), true)).resolves.toMatchInlineSnapshot(`undefined`);
       expect(helper.getFiles()["/foo/ontology/queries/getTask.ts"]).toMatchInlineSnapshot(`
-          "import type { QueryDefinition, VersionBound } from '@osdk/api';
-          import type { QueryParam, QueryResult } from '@osdk/api';
+          "import type { QueryDefinition, QueryParam, QueryResult, VersionBound } from '@osdk/api';
           import type { $ExpectedClientVersion } from '../../OntologyMetadata.js';
           import { $osdkMetadata } from '../../OntologyMetadata.js';
           import type { Task as $Imported$com$example$dep$Task } from '@com.example.dep/osdk';
 
           export namespace getTask {
             export interface Signature {
-              (query: getTask.Parameters): Promise<QueryResult.ObjectType<$Imported$com$example$dep$Task>>;
+              (query: getTask.Parameters): Promise<getTask.ReturnType>;
             }
 
             export interface Parameters {
@@ -1587,6 +1574,8 @@ describe("generator", () => {
                */
               readonly a: QueryParam.ObjectType<$Imported$com$example$dep$Task>;
             }
+
+            export type ReturnType = QueryResult.ObjectType<$Imported$com$example$dep$Task>;
           }
 
           export interface getTask extends QueryDefinition<getTask.Signature>, VersionBound<$ExpectedClientVersion> {
@@ -1632,7 +1621,7 @@ describe("generator", () => {
   });
   describe("object uses on foreign spt", () => {
     it("stuff", async () => {
-      await expect(generateClientSdkVersionTwoPointZero(referencingOntology, "", helper.minimalFiles, BASE_PATH, "module", new Map([["com.example.dep.Task", "@com.example.dep/osdk"]]), new Map([["com.example.dep.SomeInterface", "@com.example.dep/osdk"]]), new Map([["com.example.dep.spt", "@com.example.dep/osdk"]]))).resolves.toMatchInlineSnapshot(`undefined`);
+      await expect(generateClientSdkVersionTwoPointZero(referencingOntology, "", helper.minimalFiles, BASE_PATH, "module", new Map([["com.example.dep.Task", "@com.example.dep/osdk"]]), new Map([["com.example.dep.SomeInterface", "@com.example.dep/osdk"]]), new Map([["com.example.dep.spt", "@com.example.dep/osdk"]]), true)).resolves.toMatchInlineSnapshot(`undefined`);
       expect(helper.getFiles()["/foo/ontology/objects/UsesForeignSpt.ts"]).toMatchInlineSnapshot(`
           "import type { PropertyDef as $PropertyDef } from '@osdk/api';
           import { $osdkMetadata } from '../../OntologyMetadata.js';
@@ -1656,24 +1645,21 @@ describe("generator", () => {
             export type Links = {};
 
             export interface Props {
-              readonly body: $PropType['string'] | undefined;
-              readonly id: $PropType['integer'] | undefined;
-            }
-            export interface StrictProps {
               readonly body: $PropType['string'] | undefined;
               readonly id: $PropType['integer'];
             }
+            export type StrictProps = Props;
 
             export interface ObjectSet extends $ObjectSet<UsesForeignSpt, UsesForeignSpt.ObjectSet> {}
 
             export type OsdkInstance<
-              OPTIONS extends never | '$notStrict' | '$rid' = never,
+              OPTIONS extends never | '$rid' = never,
               K extends keyof UsesForeignSpt.Props = keyof UsesForeignSpt.Props,
             > = $Osdk.Instance<UsesForeignSpt, OPTIONS, K>;
 
             /** @deprecated use OsdkInstance */
             export type OsdkObject<
-              OPTIONS extends never | '$notStrict' | '$rid' = never,
+              OPTIONS extends never | '$rid' = never,
               K extends keyof UsesForeignSpt.Props = keyof UsesForeignSpt.Props,
             > = OsdkInstance<OPTIONS, K>;
           }
@@ -1729,7 +1715,7 @@ describe("generator", () => {
   });
   describe("action depends on foreign object", () => {
     it("can generate the action", async () => {
-      await expect(generateClientSdkVersionTwoPointZero(referencingOntology, "", helper.minimalFiles, BASE_PATH, "module", new Map([["com.example.dep.Task", "@com.example.dep/osdk"]]), new Map([["com.example.dep.SomeInterface", "@com.example.dep/osdk"]]), new Map([["com.example.dep.spt", "@com.example.dep/osdk"]]))).resolves.toMatchInlineSnapshot(`undefined`);
+      await expect(generateClientSdkVersionTwoPointZero(referencingOntology, "", helper.minimalFiles, BASE_PATH, "module", new Map([["com.example.dep.Task", "@com.example.dep/osdk"]]), new Map([["com.example.dep.SomeInterface", "@com.example.dep/osdk"]]), new Map([["com.example.dep.spt", "@com.example.dep/osdk"]]), true)).resolves.toMatchInlineSnapshot(`undefined`);
       expect(helper.getFiles()["/foo/ontology/actions/setTaskBody.ts"]).toMatchInlineSnapshot(`
           "import type {
             ActionDefinition,
@@ -1834,7 +1820,7 @@ describe("generator", () => {
         ",
           "/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 {
@@ -1842,7 +1828,7 @@ describe("generator", () => {
           ObjectSet as $ObjectSet,
           Osdk as $Osdk,
           PropertyValueWireToClient as $PropType,
-        } from '@osdk/api';
+        } from '@osdk/client';
 
         export type OsdkObjectLinks$SomeInterface = {};
 
@@ -1852,20 +1838,18 @@ describe("generator", () => {
           export interface Props {
             readonly spt: $PropType['string'] | undefined;
           }
-          export interface StrictProps {
-            readonly spt: $PropType['string'] | undefined;
-          }
+          export type StrictProps = Props;
 
           export interface ObjectSet extends $ObjectSet<SomeInterface, SomeInterface.ObjectSet> {}
 
           export type OsdkInstance<
-            OPTIONS extends never | '$notStrict' | '$rid' = never,
+            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 | '$notStrict' | '$rid' = never,
+            OPTIONS extends never | '$rid' = never,
             K extends keyof SomeInterface.Props = keyof SomeInterface.Props,
           > = OsdkInstance<OPTIONS, K>;
         }
@@ -1902,21 +1886,21 @@ describe("generator", () => {
         ",
           "/foo/ontology/objects.ts": "export { Task } from './objects/Task.js';
         ",
-          "/foo/ontology/objects/Task.ts": "import type { PropertyDef as $PropertyDef } from '@osdk/api';
+          "/foo/ontology/objects/Task.ts": "import type { PropertyDef as $PropertyDef } from '@osdk/client';
         import { $osdkMetadata } from '../../OntologyMetadata.js';
         import type { $ExpectedClientVersion } from '../../OntologyMetadata.js';
         import type {
           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 Task {
           export type PropertyKeys = 'taskId' | 'body';
@@ -1924,24 +1908,21 @@ describe("generator", () => {
           export type Links = {};
 
           export interface Props {
-            readonly body: $PropType['string'] | undefined;
-            readonly taskId: $PropType['string'] | undefined;
-          }
-          export interface StrictProps {
             readonly body: $PropType['string'] | undefined;
             readonly taskId: $PropType['string'];
           }
+          export type StrictProps = Props;
 
           export interface ObjectSet extends $ObjectSet<Task, Task.ObjectSet> {}
 
           export type OsdkInstance<
-            OPTIONS extends never | '$notStrict' | '$rid' = never,
+            OPTIONS extends never | '$rid' = never,
             K extends keyof Task.Props = keyof Task.Props,
           > = $Osdk.Instance<Task, OPTIONS, K>;
 
           /** @deprecated use OsdkInstance */
           export type OsdkObject<
-            OPTIONS extends never | '$notStrict' | '$rid' = never,
+            OPTIONS extends never | '$rid' = never,
             K extends keyof Task.Props = keyof Task.Props,
           > = OsdkInstance<OPTIONS, K>;
         }