@osdk/generator 2.0.2-rc.3 → 2.1.0-beta.0

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

@@ -227,8 +227,11 @@ const referencingOntology = {
       }]
     }
   },
-  interfaceTypes: {},
+  interfaceTypes: {
+    ...referencedOntology.interfaceTypes
+  },
   objectTypes: {
+    ...referencedOntology.objectTypes,
     "Thing": {
       implementsInterfaces: ["com.example.dep.SomeInterface"],
       implementsInterfaces2: {
@@ -373,13 +376,13 @@ describe("generator", () => {
 
       export const $ontologyRid = 'ridHere';
       ",
-        "/foo/index.ts": "export * from './ontology/actions';
+        "/foo/index.ts": "export { deleteTodos, markTodoCompleted } from './ontology/actions';
       export * as $Actions from './ontology/actions';
-      export * from './ontology/interfaces';
+      export { SomeInterface } from './ontology/interfaces';
       export * as $Interfaces from './ontology/interfaces';
-      export * from './ontology/objects';
+      export { Person, Todo } from './ontology/objects';
       export * as $Objects from './ontology/objects';
-      export * from './ontology/queries';
+      export { getCount, returnsTodo } from './ontology/queries';
       export * as $Queries from './ontology/queries';
       export { $ontologyRid } from './OntologyMetadata';
       ",
@@ -543,7 +546,7 @@ describe("generator", () => {
         osdkMetadata: $osdkMetadata,
       };
       ",
-        "/foo/ontology/interfaces.ts": "export * from './interfaces/SomeInterface';
+        "/foo/ontology/interfaces.ts": "export { SomeInterface } from './interfaces/SomeInterface';
       ",
         "/foo/ontology/interfaces/SomeInterface.ts": "import type { PropertyDef as $PropertyDef } from '@osdk/api';
       import { $osdkMetadata } from '../../OntologyMetadata';
@@ -569,10 +572,16 @@ describe("generator", () => {
 
         export interface ObjectSet extends $ObjectSet<SomeInterface, SomeInterface.ObjectSet> {}
 
+        export type OsdkInstance<
+          OPTIONS extends never | '$notStrict' | '$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,
           K extends keyof SomeInterface.Props = keyof SomeInterface.Props,
-        > = $Osdk<SomeInterface, K | OPTIONS>;
+        > = OsdkInstance<OPTIONS, K>;
       }
 
       export interface SomeInterface extends $InterfaceDefinition {
@@ -607,8 +616,8 @@ describe("generator", () => {
         osdkMetadata: $osdkMetadata,
       };
       ",
-        "/foo/ontology/objects.ts": "export * from './objects/Person';
-      export * from './objects/Todo';
+        "/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';
       import { $osdkMetadata } from '../../OntologyMetadata';
@@ -643,10 +652,16 @@ describe("generator", () => {
 
         export interface ObjectSet extends $ObjectSet<Person, Person.ObjectSet> {}
 
+        export type OsdkInstance<
+          OPTIONS extends never | '$notStrict' | '$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,
           K extends keyof Person.Props = keyof Person.Props,
-        > = $Osdk<Person, K | OPTIONS>;
+        > = OsdkInstance<OPTIONS, K>;
       }
 
       export interface Person extends $ObjectTypeDefinition {
@@ -731,10 +746,16 @@ describe("generator", () => {
 
         export interface ObjectSet extends $ObjectSet<Todo, Todo.ObjectSet> {}
 
+        export type OsdkInstance<
+          OPTIONS extends never | '$notStrict' | '$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,
           K extends keyof Todo.Props = keyof Todo.Props,
-        > = $Osdk<Todo, K | OPTIONS>;
+        > = OsdkInstance<OPTIONS, K>;
       }
 
       export interface Todo extends $ObjectTypeDefinition {
@@ -799,8 +820,8 @@ describe("generator", () => {
         osdkMetadata: $osdkMetadata,
       };
       ",
-        "/foo/ontology/queries.ts": "export * from './queries/getCount';
-      export * from './queries/returnsTodo';
+        "/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';
@@ -924,25 +945,32 @@ 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", "foo.bar")).rejects.toThrowErrorMatchingInlineSnapshot(`[Error: Expected { ns:'undefined', shortName: 'Todo'} to be in namespace 'foo.bar' or in a provided package mapping]`);
+    }, "", helper.minimalFiles, BASE_PATH, "module"));
+    // 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", "foo.bar")).resolves.toMatchInlineSnapshot(`undefined`);
+    await expect(generateClientSdkVersionTwoPointZero(fooBarTodoWireOntology, "", helper.minimalFiles, BASE_PATH, "module")).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 * from './ontology/actions.js';
+          "/foo/index.ts": "export { deleteTodos, markTodoCompleted } from './ontology/actions.js';
         export * as $Actions from './ontology/actions.js';
-        export * from './ontology/interfaces.js';
+        export { SomeInterface } from './ontology/interfaces.js';
         export * as $Interfaces from './ontology/interfaces.js';
-        export * from './ontology/objects.js';
+        export { Person, Todo } from './ontology/objects.js';
         export * as $Objects from './ontology/objects.js';
-        export * from './ontology/queries.js';
+        export { getCount, returnsTodo } from './ontology/queries.js';
         export * as $Queries from './ontology/queries.js';
+        export { $ontologyRid } from './OntologyMetadata.js';
         ",
           "/foo/ontology/actions.ts": "export { deleteTodos } from './actions/deleteTodos.js';
         export { markTodoCompleted } from './actions/markTodoCompleted.js';
@@ -1104,7 +1132,7 @@ describe("generator", () => {
           osdkMetadata: $osdkMetadata,
         };
         ",
-          "/foo/ontology/interfaces.ts": "export * from './interfaces/SomeInterface.js';
+          "/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';
@@ -1130,10 +1158,16 @@ describe("generator", () => {
 
           export interface ObjectSet extends $ObjectSet<SomeInterface, SomeInterface.ObjectSet> {}
 
+          export type OsdkInstance<
+            OPTIONS extends never | '$notStrict' | '$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,
             K extends keyof SomeInterface.Props = keyof SomeInterface.Props,
-          > = $Osdk<SomeInterface, K | OPTIONS>;
+          > = OsdkInstance<OPTIONS, K>;
         }
 
         export interface SomeInterface extends $InterfaceDefinition {
@@ -1168,8 +1202,8 @@ describe("generator", () => {
           osdkMetadata: $osdkMetadata,
         };
         ",
-          "/foo/ontology/objects.ts": "export * from './objects/Person.js';
-        export * from './objects/Todo.js';
+          "/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';
@@ -1204,10 +1238,16 @@ describe("generator", () => {
 
           export interface ObjectSet extends $ObjectSet<Person, Person.ObjectSet> {}
 
+          export type OsdkInstance<
+            OPTIONS extends never | '$notStrict' | '$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,
             K extends keyof Person.Props = keyof Person.Props,
-          > = $Osdk<Person, K | OPTIONS>;
+          > = OsdkInstance<OPTIONS, K>;
         }
 
         export interface Person extends $ObjectTypeDefinition {
@@ -1292,10 +1332,16 @@ describe("generator", () => {
 
           export interface ObjectSet extends $ObjectSet<Todo, Todo.ObjectSet> {}
 
+          export type OsdkInstance<
+            OPTIONS extends never | '$notStrict' | '$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,
             K extends keyof Todo.Props = keyof Todo.Props,
-          > = $Osdk<Todo, K | OPTIONS>;
+          > = OsdkInstance<OPTIONS, K>;
         }
 
         export interface Todo extends $ObjectTypeDefinition {
@@ -1360,8 +1406,8 @@ describe("generator", () => {
           osdkMetadata: $osdkMetadata,
         };
         ",
-          "/foo/ontology/queries.ts": "export * from './queries/getCount.js';
-        export * from './queries/returnsTodo.js';
+          "/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';
@@ -1510,8 +1556,10 @@ describe("generator", () => {
   });
   describe("$ontologyRid", () => {
     it("does not exist when an ontology api name is provided", async () => {
-      await expect(generateClientSdkVersionTwoPointZero(fooBarTodoWireOntology, "", helper.minimalFiles, "/foo", "module", "foo.bar", new Map())).resolves.toMatchInlineSnapshot(`undefined`);
-      expect(helper.getFiles()["/foo/index.ts"]).not.toContain("$ontologyRid");
+      await expect(generateClientSdkVersionTwoPointZero(fooBarTodoWireOntology, "", helper.minimalFiles, "/foo", "module", new Map())).resolves.toMatchInlineSnapshot(`undefined`);
+      // expect(helper.getFiles()["/foo/index.ts"]).not.toContain(
+      //   "$ontologyRid",
+      // );
     });
     it("does exist when an ontology api name is not provided", async () => {
       await expect(generateClientSdkVersionTwoPointZero(TodoWireOntology, "", helper.minimalFiles, "/foo", "module", undefined, new Map())).resolves.toMatchInlineSnapshot(`undefined`);
@@ -1520,24 +1568,24 @@ describe("generator", () => {
   });
   describe("query depends on foreign object", () => {
     it("generates the correct code", async () => {
-      await expect(generateClientSdkVersionTwoPointZero(referencingOntology, "", helper.minimalFiles, BASE_PATH, "module", undefined, new Map([["com.example.dep", "@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"]]))).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 { $ExpectedClientVersion } from '../../OntologyMetadata.js';
           import { $osdkMetadata } from '../../OntologyMetadata.js';
-          import type { Task as $Imported$objectTypes$com$example$dep$Task } from '@com.example.dep/osdk';
+          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$objectTypes$com$example$dep$Task>>;
+              (query: getTask.Parameters): Promise<QueryResult.ObjectType<$Imported$com$example$dep$Task>>;
             }
 
             export interface Parameters {
               /**
                * (no ontology metadata)
                */
-              readonly a: QueryParam.ObjectType<$Imported$objectTypes$com$example$dep$Task>;
+              readonly a: QueryParam.ObjectType<$Imported$com$example$dep$Task>;
             }
           }
 
@@ -1555,14 +1603,14 @@ describe("generator", () => {
                   nullable: false;
                   object: 'com.example.dep.Task';
                   type: 'object';
-                  __OsdkTargetType?: $Imported$objectTypes$com$example$dep$Task;
+                  __OsdkTargetType?: $Imported$com$example$dep$Task;
                 };
               };
               output: {
                 nullable: false;
                 object: 'com.example.dep.Task';
                 type: 'object';
-                __OsdkTargetType?: $Imported$objectTypes$com$example$dep$Task;
+                __OsdkTargetType?: $Imported$com$example$dep$Task;
               };
               signature: getTask.Signature;
             };
@@ -1584,7 +1632,7 @@ describe("generator", () => {
   });
   describe("object uses on foreign spt", () => {
     it("stuff", async () => {
-      await expect(generateClientSdkVersionTwoPointZero(referencingOntology, "", helper.minimalFiles, BASE_PATH, "module", undefined, new Map([["com.example.dep", "@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"]]))).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';
@@ -1618,10 +1666,16 @@ describe("generator", () => {
 
             export interface ObjectSet extends $ObjectSet<UsesForeignSpt, UsesForeignSpt.ObjectSet> {}
 
+            export type OsdkInstance<
+              OPTIONS extends never | '$notStrict' | '$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,
               K extends keyof UsesForeignSpt.Props = keyof UsesForeignSpt.Props,
-            > = $Osdk<UsesForeignSpt, K | OPTIONS>;
+            > = OsdkInstance<OPTIONS, K>;
           }
 
           export interface UsesForeignSpt extends $ObjectTypeDefinition {
@@ -1674,8 +1728,8 @@ describe("generator", () => {
     });
   });
   describe("action depends on foreign object", () => {
-    it("stuff", async () => {
-      await expect(generateClientSdkVersionTwoPointZero(referencingOntology, "", helper.minimalFiles, BASE_PATH, "module", undefined, new Map([["com.example.dep", "@com.example.dep/osdk"]]))).resolves.toMatchInlineSnapshot(`undefined`);
+    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`);
       expect(helper.getFiles()["/foo/ontology/actions/setTaskBody.ts"]).toMatchInlineSnapshot(`
           "import type {
             ActionDefinition,
@@ -1686,7 +1740,7 @@ describe("generator", () => {
             ApplyBatchActionOptions,
           } from '@osdk/api';
           import { $osdkMetadata } from '../../OntologyMetadata.js';
-          import type { Task as $Imported$objectTypes$com$example$dep$Task } from '@com.example.dep/osdk';
+          import type { Task as $Imported$com$example$dep$Task } from '@com.example.dep/osdk';
 
           export namespace setTaskBody {
             // Represents the definition of the parameters for the action
@@ -1699,14 +1753,14 @@ describe("generator", () => {
               task: {
                 multiplicity: false;
                 nullable: false;
-                type: ActionMetadata.DataType.Object<$Imported$objectTypes$com$example$dep$Task>;
+                type: ActionMetadata.DataType.Object<$Imported$com$example$dep$Task>;
               };
             };
 
             export interface Params {
               readonly body: ActionParam.PrimitiveType<'string'>;
 
-              readonly task: ActionParam.ObjectType<$Imported$objectTypes$com$example$dep$Task>;
+              readonly task: ActionParam.ObjectType<$Imported$com$example$dep$Task>;
             }
 
             // Represents a fqn of the action
@@ -1725,7 +1779,7 @@ describe("generator", () => {
 
           /**
            * @param {ActionParam.PrimitiveType<"string">} body
-           * @param {ActionParam.ObjectType<$Imported$objectTypes$com$example$dep$Task>} task
+           * @param {ActionParam.ObjectType<$Imported$com$example$dep$Task>} task
            */
           export interface setTaskBody extends ActionDefinition<setTaskBody.Signatures> {
             __DefinitionMetadata?: {
@@ -1758,7 +1812,7 @@ describe("generator", () => {
     });
   });
   it("can generate an sdk package that is entirely a library", async () => {
-    await expect(generateClientSdkVersionTwoPointZero(referencedOntology, "", helper.minimalFiles, BASE_PATH, "module", undefined, new Map([["com.example.dep", "@com.example.dep/osdk"]]))).resolves.toMatchInlineSnapshot(`undefined`);
+    await expect(generateClientSdkVersionTwoPointZero(referencedOntology, "", helper.minimalFiles, BASE_PATH, "module")).resolves.toMatchInlineSnapshot(`undefined`);
     expect(tweakedFilesForSnapshotConsistency(helper.getFiles())).toMatchInlineSnapshot(`
         {
           "/foo/OntologyMetadata.ts": "export type $ExpectedClientVersion = 'PLACEHOLDER';
@@ -1766,19 +1820,19 @@ describe("generator", () => {
 
         export const $ontologyRid = 'ri.ontology.main.ontology.dep';
         ",
-          "/foo/index.ts": "export * from './ontology/actions.js';
+          "/foo/index.ts": "export {} from './ontology/actions.js';
         export * as $Actions from './ontology/actions.js';
-        export * from './ontology/interfaces.js';
+        export { SomeInterface } from './ontology/interfaces.js';
         export * as $Interfaces from './ontology/interfaces.js';
-        export * from './ontology/objects.js';
+        export { Task } from './ontology/objects.js';
         export * as $Objects from './ontology/objects.js';
-        export * from './ontology/queries.js';
+        export {} from './ontology/queries.js';
         export * as $Queries from './ontology/queries.js';
         export { $ontologyRid } from './OntologyMetadata.js';
         ",
           "/foo/ontology/actions.ts": "export {};
         ",
-          "/foo/ontology/interfaces.ts": "export * from './interfaces/SomeInterface.js';
+          "/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';
@@ -1804,10 +1858,16 @@ describe("generator", () => {
 
           export interface ObjectSet extends $ObjectSet<SomeInterface, SomeInterface.ObjectSet> {}
 
+          export type OsdkInstance<
+            OPTIONS extends never | '$notStrict' | '$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,
             K extends keyof SomeInterface.Props = keyof SomeInterface.Props,
-          > = $Osdk<SomeInterface, K | OPTIONS>;
+          > = OsdkInstance<OPTIONS, K>;
         }
 
         export interface SomeInterface extends $InterfaceDefinition {
@@ -1840,7 +1900,7 @@ describe("generator", () => {
           osdkMetadata: $osdkMetadata,
         };
         ",
-          "/foo/ontology/objects.ts": "export * from './objects/Task.js';
+          "/foo/ontology/objects.ts": "export { Task } from './objects/Task.js';
         ",
           "/foo/ontology/objects/Task.ts": "import type { PropertyDef as $PropertyDef } from '@osdk/api';
         import { $osdkMetadata } from '../../OntologyMetadata.js';
@@ -1874,10 +1934,16 @@ describe("generator", () => {
 
           export interface ObjectSet extends $ObjectSet<Task, Task.ObjectSet> {}
 
+          export type OsdkInstance<
+            OPTIONS extends never | '$notStrict' | '$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,
             K extends keyof Task.Props = keyof Task.Props,
-          > = $Osdk<Task, K | OPTIONS>;
+          > = OsdkInstance<OPTIONS, K>;
         }
 
         export interface Task extends $ObjectTypeDefinition {