@osdk/generator 2.1.0-beta.1 → 2.1.0-beta.11

package/build/browser/v2.0/generateClientSdkVersionTwoPointZero.d.ts

@@ -1,4 +1,4 @@
 import type { MinimalFs } from "../MinimalFs.js";
 import type { WireOntologyDefinition } from "../WireOntologyDefinition.js";
-export declare function generateClientSdkVersionTwoPointZero(ontology: WireOntologyDefinition, userAgent: string, fs: MinimalFs, outDir: string, packageType?: "module" | "commonjs", externalObjects?: Map<string, string>, externalInterfaces?: Map<string, string>, externalSpts?: Map<string, string>): Promise<void>;
+export declare function generateClientSdkVersionTwoPointZero(ontology: WireOntologyDefinition, userAgent: string, fs: MinimalFs, outDir: string, packageType?: "module" | "commonjs", externalObjects?: Map<string, string>, externalInterfaces?: Map<string, string>, externalSpts?: Map<string, string>, forInternalUse?: boolean): Promise<void>;
 //# sourceMappingURL=generateClientSdkVersionTwoPointZero.d.ts.map

package/build/browser/v2.0/generateClientSdkVersionTwoPointZero.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generateClientSdkVersionTwoPointZero.d.ts","sourceRoot":"","sources":["../../../src/v2.0/generateClientSdkVersionTwoPointZero.ts"],"names":[],"mappings":"AAkBA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAGjD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AAQ3E,wBAAsB,oCAAoC,CACxD,QAAQ,EAAE,sBAAsB,EAChC,SAAS,EAAE,MAAM,EACjB,EAAE,EAAE,SAAS,EACb,MAAM,EAAE,MAAM,EACd,WAAW,GAAE,QAAQ,GAAG,UAAuB,EAC/C,eAAe,GAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAa,EAChD,kBAAkB,GAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAa,EACnD,YAAY,GAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAa,iBAkC9C"}
+{"version":3,"file":"generateClientSdkVersionTwoPointZero.d.ts","sourceRoot":"","sources":["../../../src/v2.0/generateClientSdkVersionTwoPointZero.ts"],"names":[],"mappings":"AAkBA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAGjD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AAQ3E,wBAAsB,oCAAoC,CACxD,QAAQ,EAAE,sBAAsB,EAChC,SAAS,EAAE,MAAM,EACjB,EAAE,EAAE,SAAS,EACb,MAAM,EAAE,MAAM,EACd,WAAW,GAAE,QAAQ,GAAG,UAAuB,EAC/C,eAAe,GAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAa,EAChD,kBAAkB,GAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAa,EACnD,YAAY,GAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAa,EAC7C,cAAc,GAAE,OAAe,iBAmChC"}

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

@@ -22,7 +22,7 @@ import { generatePerInterfaceDataFiles } from "./generatePerInterfaceDataFiles.j
 import { generatePerObjectDataFiles } from "./generatePerObjectDataFiles.js";
 import { generatePerQueryDataFilesV2 } from "./generatePerQueryDataFiles.js";
 import { generateRootIndexTsFile } from "./generateRootIndexTsFile.js";
-export async function generateClientSdkVersionTwoPointZero(ontology, userAgent, fs, outDir, packageType = "commonjs", externalObjects = new Map(), externalInterfaces = new Map(), externalSpts = new Map()) {
+export async function generateClientSdkVersionTwoPointZero(ontology, userAgent, fs, outDir, packageType = "commonjs", externalObjects = new Map(), externalInterfaces = new Map(), externalSpts = new Map(), forInternalUse = false) {
   const importExt = packageType === "module" ? ".js" : "";
   // Structurally, we need to have multiple ontologies read in
   // with one per package.
@@ -43,7 +43,8 @@ export async function generateClientSdkVersionTwoPointZero(ontology, userAgent,
     ontology: enhancedOntology,
     importExt,
     fs,
-    outDir
+    outDir,
+    forInternalUse
   };
   await generateRootIndexTsFile(ctx);
   await generateOntologyMetadataFile(ctx, userAgent);

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

@@ -1 +1 @@
-{"version":3,"file":"generateClientSdkVersionTwoPointZero.js","names":["enhanceOntology","sanitizeMetadata","verifyOutDir","generateOntologyMetadataFile","generatePerActionDataFiles","generatePerInterfaceDataFiles","generatePerObjectDataFiles","generatePerQueryDataFilesV2","generateRootIndexTsFile","generateClientSdkVersionTwoPointZero","ontology","userAgent","fs","outDir","packageType","externalObjects","Map","externalInterfaces","externalSpts","importExt","sanitizedOntology","mkdir","recursive","enhancedOntology","sanitized","ctx"],"sources":["generateClientSdkVersionTwoPointZero.js"],"sourcesContent":["/*\n * Copyright 2023 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport { enhanceOntology } from \"../GenerateContext/enhanceOntology.js\";\nimport { sanitizeMetadata } from \"../shared/sanitizeMetadata.js\";\nimport { verifyOutDir } from \"../util/verifyOutDir.js\";\nimport { generateOntologyMetadataFile } from \"./generateMetadata.js\";\nimport { generatePerActionDataFiles } from \"./generatePerActionDataFiles.js\";\nimport { generatePerInterfaceDataFiles } from \"./generatePerInterfaceDataFiles.js\";\nimport { generatePerObjectDataFiles } from \"./generatePerObjectDataFiles.js\";\nimport { generatePerQueryDataFilesV2 } from \"./generatePerQueryDataFiles.js\";\nimport { generateRootIndexTsFile } from \"./generateRootIndexTsFile.js\";\nexport async function generateClientSdkVersionTwoPointZero(ontology, userAgent, fs, outDir, packageType = \"commonjs\", externalObjects = new Map(), externalInterfaces = new Map(), externalSpts = new Map()) {\n    const importExt = packageType === \"module\" ? \".js\" : \"\";\n    // Structurally, we need to have multiple ontologies read in\n    // with one per package.\n    await verifyOutDir(outDir, fs);\n    const sanitizedOntology = sanitizeMetadata(ontology);\n    await fs.mkdir(outDir, { recursive: true });\n    const enhancedOntology = enhanceOntology({\n        sanitized: sanitizedOntology,\n        importExt,\n        externalObjects,\n        externalInterfaces,\n        externalSpts,\n    });\n    const ctx = {\n        sanitizedOntology,\n        ontology: enhancedOntology,\n        importExt,\n        fs,\n        outDir,\n    };\n    await generateRootIndexTsFile(ctx);\n    await generateOntologyMetadataFile(ctx, userAgent);\n    await generatePerObjectDataFiles(ctx);\n    await generatePerInterfaceDataFiles(ctx);\n    await generatePerActionDataFiles(ctx);\n    await generatePerQueryDataFilesV2(ctx, true);\n}\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAASA,eAAe,QAAQ,uCAAuC;AACvE,SAASC,gBAAgB,QAAQ,+BAA+B;AAChE,SAASC,YAAY,QAAQ,yBAAyB;AACtD,SAASC,4BAA4B,QAAQ,uBAAuB;AACpE,SAASC,0BAA0B,QAAQ,iCAAiC;AAC5E,SAASC,6BAA6B,QAAQ,oCAAoC;AAClF,SAASC,0BAA0B,QAAQ,iCAAiC;AAC5E,SAASC,2BAA2B,QAAQ,gCAAgC;AAC5E,SAASC,uBAAuB,QAAQ,8BAA8B;AACtE,OAAO,eAAeC,oCAAoCA,CAACC,QAAQ,EAAEC,SAAS,EAAEC,EAAE,EAAEC,MAAM,EAAEC,WAAW,GAAG,UAAU,EAAEC,eAAe,GAAG,IAAIC,GAAG,CAAC,CAAC,EAAEC,kBAAkB,GAAG,IAAID,GAAG,CAAC,CAAC,EAAEE,YAAY,GAAG,IAAIF,GAAG,CAAC,CAAC,EAAE;EACzM,MAAMG,SAAS,GAAGL,WAAW,KAAK,QAAQ,GAAG,KAAK,GAAG,EAAE;EACvD;EACA;EACA,MAAMZ,YAAY,CAACW,MAAM,EAAED,EAAE,CAAC;EAC9B,MAAMQ,iBAAiB,GAAGnB,gBAAgB,CAACS,QAAQ,CAAC;EACpD,MAAME,EAAE,CAACS,KAAK,CAACR,MAAM,EAAE;IAAES,SAAS,EAAE;EAAK,CAAC,CAAC;EAC3C,MAAMC,gBAAgB,GAAGvB,eAAe,CAAC;IACrCwB,SAAS,EAAEJ,iBAAiB;IAC5BD,SAAS;IACTJ,eAAe;IACfE,kBAAkB;IAClBC;EACJ,CAAC,CAAC;EACF,MAAMO,GAAG,GAAG;IACRL,iBAAiB;IACjBV,QAAQ,EAAEa,gBAAgB;IAC1BJ,SAAS;IACTP,EAAE;IACFC;EACJ,CAAC;EACD,MAAML,uBAAuB,CAACiB,GAAG,CAAC;EAClC,MAAMtB,4BAA4B,CAACsB,GAAG,EAAEd,SAAS,CAAC;EAClD,MAAML,0BAA0B,CAACmB,GAAG,CAAC;EACrC,MAAMpB,6BAA6B,CAACoB,GAAG,CAAC;EACxC,MAAMrB,0BAA0B,CAACqB,GAAG,CAAC;EACrC,MAAMlB,2BAA2B,CAACkB,GAAG,EAAE,IAAI,CAAC;AAChD","ignoreList":[]}
+{"version":3,"file":"generateClientSdkVersionTwoPointZero.js","names":["enhanceOntology","sanitizeMetadata","verifyOutDir","generateOntologyMetadataFile","generatePerActionDataFiles","generatePerInterfaceDataFiles","generatePerObjectDataFiles","generatePerQueryDataFilesV2","generateRootIndexTsFile","generateClientSdkVersionTwoPointZero","ontology","userAgent","fs","outDir","packageType","externalObjects","Map","externalInterfaces","externalSpts","forInternalUse","importExt","sanitizedOntology","mkdir","recursive","enhancedOntology","sanitized","ctx"],"sources":["generateClientSdkVersionTwoPointZero.js"],"sourcesContent":["/*\n * Copyright 2023 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport { enhanceOntology } from \"../GenerateContext/enhanceOntology.js\";\nimport { sanitizeMetadata } from \"../shared/sanitizeMetadata.js\";\nimport { verifyOutDir } from \"../util/verifyOutDir.js\";\nimport { generateOntologyMetadataFile } from \"./generateMetadata.js\";\nimport { generatePerActionDataFiles } from \"./generatePerActionDataFiles.js\";\nimport { generatePerInterfaceDataFiles } from \"./generatePerInterfaceDataFiles.js\";\nimport { generatePerObjectDataFiles } from \"./generatePerObjectDataFiles.js\";\nimport { generatePerQueryDataFilesV2 } from \"./generatePerQueryDataFiles.js\";\nimport { generateRootIndexTsFile } from \"./generateRootIndexTsFile.js\";\nexport async function generateClientSdkVersionTwoPointZero(ontology, userAgent, fs, outDir, packageType = \"commonjs\", externalObjects = new Map(), externalInterfaces = new Map(), externalSpts = new Map(), forInternalUse = false) {\n    const importExt = packageType === \"module\" ? \".js\" : \"\";\n    // Structurally, we need to have multiple ontologies read in\n    // with one per package.\n    await verifyOutDir(outDir, fs);\n    const sanitizedOntology = sanitizeMetadata(ontology);\n    await fs.mkdir(outDir, { recursive: true });\n    const enhancedOntology = enhanceOntology({\n        sanitized: sanitizedOntology,\n        importExt,\n        externalObjects,\n        externalInterfaces,\n        externalSpts,\n    });\n    const ctx = {\n        sanitizedOntology,\n        ontology: enhancedOntology,\n        importExt,\n        fs,\n        outDir,\n        forInternalUse,\n    };\n    await generateRootIndexTsFile(ctx);\n    await generateOntologyMetadataFile(ctx, userAgent);\n    await generatePerObjectDataFiles(ctx);\n    await generatePerInterfaceDataFiles(ctx);\n    await generatePerActionDataFiles(ctx);\n    await generatePerQueryDataFilesV2(ctx, true);\n}\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAASA,eAAe,QAAQ,uCAAuC;AACvE,SAASC,gBAAgB,QAAQ,+BAA+B;AAChE,SAASC,YAAY,QAAQ,yBAAyB;AACtD,SAASC,4BAA4B,QAAQ,uBAAuB;AACpE,SAASC,0BAA0B,QAAQ,iCAAiC;AAC5E,SAASC,6BAA6B,QAAQ,oCAAoC;AAClF,SAASC,0BAA0B,QAAQ,iCAAiC;AAC5E,SAASC,2BAA2B,QAAQ,gCAAgC;AAC5E,SAASC,uBAAuB,QAAQ,8BAA8B;AACtE,OAAO,eAAeC,oCAAoCA,CAACC,QAAQ,EAAEC,SAAS,EAAEC,EAAE,EAAEC,MAAM,EAAEC,WAAW,GAAG,UAAU,EAAEC,eAAe,GAAG,IAAIC,GAAG,CAAC,CAAC,EAAEC,kBAAkB,GAAG,IAAID,GAAG,CAAC,CAAC,EAAEE,YAAY,GAAG,IAAIF,GAAG,CAAC,CAAC,EAAEG,cAAc,GAAG,KAAK,EAAE;EACjO,MAAMC,SAAS,GAAGN,WAAW,KAAK,QAAQ,GAAG,KAAK,GAAG,EAAE;EACvD;EACA;EACA,MAAMZ,YAAY,CAACW,MAAM,EAAED,EAAE,CAAC;EAC9B,MAAMS,iBAAiB,GAAGpB,gBAAgB,CAACS,QAAQ,CAAC;EACpD,MAAME,EAAE,CAACU,KAAK,CAACT,MAAM,EAAE;IAAEU,SAAS,EAAE;EAAK,CAAC,CAAC;EAC3C,MAAMC,gBAAgB,GAAGxB,eAAe,CAAC;IACrCyB,SAAS,EAAEJ,iBAAiB;IAC5BD,SAAS;IACTL,eAAe;IACfE,kBAAkB;IAClBC;EACJ,CAAC,CAAC;EACF,MAAMQ,GAAG,GAAG;IACRL,iBAAiB;IACjBX,QAAQ,EAAEc,gBAAgB;IAC1BJ,SAAS;IACTR,EAAE;IACFC,MAAM;IACNM;EACJ,CAAC;EACD,MAAMX,uBAAuB,CAACkB,GAAG,CAAC;EAClC,MAAMvB,4BAA4B,CAACuB,GAAG,EAAEf,SAAS,CAAC;EAClD,MAAML,0BAA0B,CAACoB,GAAG,CAAC;EACrC,MAAMrB,6BAA6B,CAACqB,GAAG,CAAC;EACxC,MAAMtB,0BAA0B,CAACsB,GAAG,CAAC;EACrC,MAAMnB,2BAA2B,CAACmB,GAAG,EAAE,IAAI,CAAC;AAChD","ignoreList":[]}

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

@@ -153,12 +153,14 @@ const referencedOntology = {
           "taskId": {
             "dataType": {
               "type": "string"
-            }
+            },
+            "rid": "ridForTaskId"
           },
           "body": {
             "dataType": {
               "type": "string"
-            }
+            },
+            "rid": "ridForBody"
           }
         },
         "status": "ACTIVE",
@@ -184,6 +186,7 @@ const referencedOntology = {
           rid: "idk"
         }
       },
+      implementedByObjectTypes: [],
       links: {}
     }
   },
@@ -256,12 +259,14 @@ const referencingOntology = {
           "id": {
             dataType: {
               type: "integer"
-            }
+            },
+            rid: "rid"
           },
           "body": {
             dataType: {
               type: "string"
-            }
+            },
+            "rid": "rid"
           }
         },
         rid: "ridForThing",
@@ -288,12 +293,14 @@ const referencingOntology = {
           "id": {
             dataType: {
               type: "integer"
-            }
+            },
+            rid: "rid"
           },
           "body": {
             dataType: {
               type: "string"
-            }
+            },
+            rid: "rid"
           }
         },
         rid: "theRid",
@@ -396,7 +403,7 @@ describe("generator", () => {
         ActionReturnTypeForOptions,
         ApplyActionOptions,
         ApplyBatchActionOptions,
-      } from '@osdk/api';
+      } from '@osdk/client';
       import { $osdkMetadata } from '../../OntologyMetadata';
       import type { Todo } from '../objects/Todo';
 
@@ -472,7 +479,7 @@ describe("generator", () => {
         ActionReturnTypeForOptions,
         ApplyActionOptions,
         ApplyBatchActionOptions,
-      } from '@osdk/api';
+      } from '@osdk/client';
       import { $osdkMetadata } from '../../OntologyMetadata';
       import type { Todo } from '../objects/Todo';
 
@@ -548,7 +555,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 +563,7 @@ describe("generator", () => {
         ObjectSet as $ObjectSet,
         Osdk as $Osdk,
         PropertyValueWireToClient as $PropType,
-      } from '@osdk/api';
+      } from '@osdk/client';
 
       export type OsdkObjectLinks$SomeInterface = {};
 
@@ -566,20 +573,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 +624,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 +632,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 +649,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 +712,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 +720,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 +737,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,8 +822,7 @@ 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';
 
@@ -877,8 +875,7 @@ 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';
@@ -949,14 +946,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(`
@@ -1156,20 +1153,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>;
         }
@@ -1234,22 +1229,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>;
         }
@@ -1324,26 +1317,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>;
         }
@@ -1413,8 +1402,7 @@ 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';
 
@@ -1467,8 +1455,7 @@ 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';
@@ -1576,10 +1563,9 @@ 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';
@@ -1642,7 +1628,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';
@@ -1666,24 +1652,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>;
           }
@@ -1739,7 +1722,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,
@@ -1844,7 +1827,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 {
@@ -1852,7 +1835,7 @@ describe("generator", () => {
           ObjectSet as $ObjectSet,
           Osdk as $Osdk,
           PropertyValueWireToClient as $PropType,
-        } from '@osdk/api';
+        } from '@osdk/client';
 
         export type OsdkObjectLinks$SomeInterface = {};
 
@@ -1862,20 +1845,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>;
         }
@@ -1912,21 +1893,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';
@@ -1934,24 +1915,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>;
         }