@osdk/generator 1.12.0-beta.1 → 1.12.0-beta.2

package/build/cjs/shared/UNSTABLE_wireInterfaceTypeV2ToSdkObjectConst.d.cts

@@ -1,4 +1,5 @@
 import type { InterfaceType } from "@osdk/gateway/types";
+import type { WireOntologyDefinition } from "../WireOntologyDefinition.cjs";
 /** @internal */
-export declare function __UNSTABLE_wireInterfaceTypeV2ToSdkObjectConst(interfaceDef: InterfaceType, v2?: boolean): string;
+export declare function __UNSTABLE_wireInterfaceTypeV2ToSdkObjectConst(interfaceDef: InterfaceType, ontology: WireOntologyDefinition, v2?: boolean): string;
 //# sourceMappingURL=UNSTABLE_wireInterfaceTypeV2ToSdkObjectConst.d.ts.map

package/build/cjs/shared/UNSTABLE_wireInterfaceTypeV2ToSdkObjectConst.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"UNSTABLE_wireInterfaceTypeV2ToSdkObjectConst.d.ts","sourceRoot":"","sources":["../../../src/shared/UNSTABLE_wireInterfaceTypeV2ToSdkObjectConst.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAOzD,gBAAgB;AAChB,wBAAgB,8CAA8C,CAC5D,YAAY,EAAE,aAAa,EAC3B,EAAE,GAAE,OAAe,UAoEpB"}
+{"version":3,"file":"UNSTABLE_wireInterfaceTypeV2ToSdkObjectConst.d.ts","sourceRoot":"","sources":["../../../src/shared/UNSTABLE_wireInterfaceTypeV2ToSdkObjectConst.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAMzD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AAI3E,gBAAgB;AAChB,wBAAgB,8CAA8C,CAC5D,YAAY,EAAE,aAAa,EAC3B,QAAQ,EAAE,sBAAsB,EAChC,EAAE,GAAE,OAAe,UA4HpB"}

package/build/cjs/shared/UNSTABLE_wireInterfaceTypeV2ToSdkObjectConst.test.d.cts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=UNSTABLE_wireInterfaceTypeV2ToSdkObjectConst.test.d.ts.map

package/build/cjs/shared/UNSTABLE_wireInterfaceTypeV2ToSdkObjectConst.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"UNSTABLE_wireInterfaceTypeV2ToSdkObjectConst.test.d.ts","sourceRoot":"","sources":["../../../src/shared/UNSTABLE_wireInterfaceTypeV2ToSdkObjectConst.test.ts"],"names":[],"mappings":""}

package/build/cjs/shared/propertyJsdoc.d.cts

@@ -0,0 +1,6 @@
+import type { ObjectTypePropertyDefinition } from "@osdk/api";
+export declare function propertyJsdoc(property: ObjectTypePropertyDefinition, { isInherited, apiName }: {
+    isInherited?: boolean;
+    apiName: string;
+}): string;
+//# sourceMappingURL=propertyJsdoc.d.ts.map

package/build/cjs/shared/propertyJsdoc.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"propertyJsdoc.d.ts","sourceRoot":"","sources":["../../../src/shared/propertyJsdoc.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,WAAW,CAAC;AAE9D,wBAAgB,aAAa,CAC3B,QAAQ,EAAE,4BAA4B,EACtC,EAAE,WAAW,EAAE,OAAO,EAAE,EAAE;IAAE,WAAW,CAAC,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,UAyBrE"}

package/build/cjs/shared/wireObjectTypeV2ToSdkObjectConst.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wireObjectTypeV2ToSdkObjectConst.d.ts","sourceRoot":"","sources":["../../../src/shared/wireObjectTypeV2ToSdkObjectConst.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAKlE,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,OAAO,UAE/D;AAED,gBAAgB;AAChB,wBAAgB,gCAAgC,CAC9C,MAAM,EAAE,sBAAsB,EAC9B,SAAS,EAAE,MAAM,EACjB,EAAE,GAAE,OAAe,UAoGpB"}
+{"version":3,"file":"wireObjectTypeV2ToSdkObjectConst.d.ts","sourceRoot":"","sources":["../../../src/shared/wireObjectTypeV2ToSdkObjectConst.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAMlE,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,OAAO,UAE/D;AAED,gBAAgB;AAChB,wBAAgB,gCAAgC,CAC9C,MAAM,EAAE,sBAAsB,EAC9B,SAAS,EAAE,MAAM,EACjB,EAAE,GAAE,OAAe,UAsGpB"}

package/build/cjs/shared/wireQueryDataTypeToQueryDataTypeDefinition.d.cts

@@ -1,4 +1,4 @@
 import type { QueryDataTypeDefinition } from "@osdk/api";
 import type { QueryDataType } from "@osdk/gateway/types";
-export declare function wireQueryDataTypeToQueryDataTypeDefinition<K extends string>(input: QueryDataType): QueryDataTypeDefinition<K>;
+export declare function wireQueryDataTypeToQueryDataTypeDefinition<K extends string>(input: QueryDataType): QueryDataTypeDefinition<K, any>;
 //# sourceMappingURL=wireQueryDataTypeToQueryDataTypeDefinition.d.ts.map

package/build/cjs/shared/wireQueryDataTypeToQueryDataTypeDefinition.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wireQueryDataTypeToQueryDataTypeDefinition.d.ts","sourceRoot":"","sources":["../../../src/shared/wireQueryDataTypeToQueryDataTypeDefinition.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EACV,uBAAuB,EAGxB,MAAM,WAAW,CAAC;AACnB,OAAO,KAAK,EAIV,aAAa,EAGd,MAAM,qBAAqB,CAAC;AAG7B,wBAAgB,0CAA0C,CAAC,CAAC,SAAS,MAAM,EACzE,KAAK,EAAE,aAAa,GACnB,uBAAuB,CAAC,CAAC,CAAC,CAqG5B"}
+{"version":3,"file":"wireQueryDataTypeToQueryDataTypeDefinition.d.ts","sourceRoot":"","sources":["../../../src/shared/wireQueryDataTypeToQueryDataTypeDefinition.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EACV,uBAAuB,EAGxB,MAAM,WAAW,CAAC;AACnB,OAAO,KAAK,EAIV,aAAa,EAGd,MAAM,qBAAqB,CAAC;AAI7B,wBAAgB,0CAA0C,CACxD,CAAC,SAAS,MAAM,EAEhB,KAAK,EAAE,aAAa,GACnB,uBAAuB,CAAC,CAAC,EAAE,GAAG,CAAC,CAuGjC"}

package/build/cjs/shared/wireQueryTypeV2ToSdkQueryDefinition.d.cts

@@ -1,4 +1,12 @@
-import type { QueryDefinition } from "@osdk/api";
-import type { QueryTypeV2 } from "@osdk/gateway/types";
+import type { QueryDefinition, QueryParameterDefinition } from "@osdk/api";
+import type { QueryParameterV2, QueryTypeV2 } from "@osdk/gateway/types";
 export declare function wireQueryTypeV2ToSdkQueryDefinition(input: QueryTypeV2): QueryDefinition<any, any>;
+export declare function wireQueryTypeV2ToSdkQueryDefinitionNoParams(input: QueryTypeV2): {
+    type: string;
+    apiName: string;
+    description: string | undefined;
+    displayName: string | undefined;
+    version: string;
+};
+export declare function wireQueryParameterV2ToQueryParameterDefinition(parameter: QueryParameterV2): QueryParameterDefinition<any>;
 //# sourceMappingURL=wireQueryTypeV2ToSdkQueryDefinition.d.ts.map

package/build/cjs/shared/wireQueryTypeV2ToSdkQueryDefinition.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wireQueryTypeV2ToSdkQueryDefinition.d.ts","sourceRoot":"","sources":["../../../src/shared/wireQueryTypeV2ToSdkQueryDefinition.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,eAAe,EAA4B,MAAM,WAAW,CAAC;AAC3E,OAAO,KAAK,EAAoB,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAGzE,wBAAgB,mCAAmC,CACjD,KAAK,EAAE,WAAW,GACjB,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,CAc3B"}
+{"version":3,"file":"wireQueryTypeV2ToSdkQueryDefinition.d.ts","sourceRoot":"","sources":["../../../src/shared/wireQueryTypeV2ToSdkQueryDefinition.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,eAAe,EAAE,wBAAwB,EAAE,MAAM,WAAW,CAAC;AAC3E,OAAO,KAAK,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAKzE,wBAAgB,mCAAmC,CACjD,KAAK,EAAE,WAAW,GACjB,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,CAc3B;AAED,wBAAgB,2CAA2C,CACzD,KAAK,EAAE,WAAW;;;;;;EASnB;AAED,wBAAgB,8CAA8C,CAC5D,SAAS,EAAE,gBAAgB,GAC1B,wBAAwB,CAAC,GAAG,CAAC,CAK/B"}

package/build/cjs/util/stringify.d.cts

@@ -2,9 +2,9 @@
  * A function for changing the stringified key/value pairs of an object.
  *
  * @param value The value of the key/value pair.
- * @param defaultValueFormatter The function that would be called if this customizer wasnt used
+ * @param defaultValueFormatter The function that would be called if this customizer wasn't used
  * @param key The key of the key/value pair.
- * @param defaultKeyFormatter The function that would be called if this customizer wasnt used
+ * @param defaultKeyFormatter The function that would be called if this customizer wasn't used
  *
  * @returns A string, a tuple of strings, or undefined.
  *          If a string is returned, it will be used as the value of the key/value pair.
@@ -12,7 +12,7 @@
  *          and the second string will be used as the value of the key/value pair.
  *          If undefined is returned, the pair will be removed
  */
-type Customizer<K, V extends {}> = (value: V, defaultValueFormatter: (value: any) => string, key: K, defaultKeyFormatter: (key: string) => string) => [string, string] | string | undefined;
+type Customizer<K extends string | symbol | number, V extends {}> = (value: V, defaultValueFormatter: (value: any) => string, key: K extends "*" ? string : K, defaultKeyFormatter: (key: string) => string) => [string, string] | string | undefined;
 export declare function stringify<T extends Record<string, any>>(obj: T, customizer?: {
     [K in keyof T | "*"]?: Customizer<K, T[K]>;
 }, separator?: string): string;

package/build/cjs/util/stringify.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"stringify.d.ts","sourceRoot":"","sources":["../../../src/util/stringify.ts"],"names":[],"mappings":"AAgBA;;;;;;;;;;;;;GAaG;AACH,KAAK,UAAU,CAAC,CAAC,EAAE,CAAC,SAAS,EAAE,IAAI,CACjC,KAAK,EAAE,CAAC,EACR,qBAAqB,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,MAAM,EAC7C,GAAG,EAAE,CAAC,EACN,mBAAmB,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,KACzC,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,GAAG,SAAS,CAAC;AAU3C,wBAAgB,SAAS,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EACrD,GAAG,EAAE,CAAC,EACN,UAAU,GAAE;KACT,CAAC,IAAI,MAAM,CAAC,GAAG,GAAG,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;CACtC,EACN,SAAS,SAAQ,UA0BlB"}
+{"version":3,"file":"stringify.d.ts","sourceRoot":"","sources":["../../../src/util/stringify.ts"],"names":[],"mappings":"AAgBA;;;;;;;;;;;;;GAaG;AACH,KAAK,UAAU,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,CAAC,SAAS,EAAE,IAAI,CAClE,KAAK,EAAE,CAAC,EACR,qBAAqB,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,MAAM,EAC7C,GAAG,EAAE,CAAC,SAAS,GAAG,GAAG,MAAM,GAAG,CAAC,EAC/B,mBAAmB,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,KACzC,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,GAAG,SAAS,CAAC;AAU3C,wBAAgB,SAAS,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EACrD,GAAG,EAAE,CAAC,EACN,UAAU,GAAE;KACT,CAAC,IAAI,MAAM,CAAC,GAAG,GAAG,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;CACtC,EACN,SAAS,SAAQ,UA0BlB"}

package/build/cjs/util/{verifyOutdir.d.cts → verifyOutDir.d.cts}

@@ -5,5 +5,5 @@ import type { MinimalFs } from "../MinimalFs.cjs";
  * Re-generating an ontology on top of itself is not supported and may leave old
  * files around or refuse to update files with new contents in some cases.
  */
-export declare function verifyOutdir(outDir: string, fs: MinimalFs): Promise<void>;
-//# sourceMappingURL=verifyOutdir.d.ts.map
+export declare function verifyOutDir(outDir: string, fs: MinimalFs): Promise<void>;
+//# sourceMappingURL=verifyOutDir.d.ts.map

package/build/cjs/util/{verifyOutdir.d.ts.map → verifyOutDir.d.ts.map}

@@ -1 +1 @@
-{"version":3,"file":"verifyOutdir.d.ts","sourceRoot":"","sources":["../../../src/util/verifyOutdir.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEjD;;;;;GAKG;AACH,wBAAsB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,SAAS,iBAgB/D"}
+{"version":3,"file":"verifyOutDir.d.ts","sourceRoot":"","sources":["../../../src/util/verifyOutDir.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEjD;;;;;GAKG;AACH,wBAAsB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,SAAS,iBAgB/D"}

package/build/cjs/v1.1/backcompat/generateOntologyRuntimeDistDir.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generateOntologyRuntimeDistDir.d.ts","sourceRoot":"","sources":["../../../../src/v1.1/backcompat/generateOntologyRuntimeDistDir.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AASpD,wBAAsB,8BAA8B,CAClD,MAAM,EAAE,MAAM,EACd,EAAE,EAAE,SAAS,EACb,SAAS,SAAK,iBA8Cf"}
+{"version":3,"file":"generateOntologyRuntimeDistDir.d.ts","sourceRoot":"","sources":["../../../../src/v1.1/backcompat/generateOntologyRuntimeDistDir.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AASpD,wBAAsB,8BAA8B,CAClD,MAAM,EAAE,MAAM,EACd,EAAE,EAAE,SAAS,EACb,SAAS,SAAK,iBA6Cf"}

package/build/cjs/v1.1/generatePerQueryDataFiles.d.cts

@@ -1,4 +1,4 @@
 import type { MinimalFs } from "../MinimalFs.cjs";
 import type { WireOntologyDefinition } from "../WireOntologyDefinition.cjs";
-export declare function generatePerQueryDataFiles(ontology: WireOntologyDefinition, fs: MinimalFs, outDir: string, importExt?: string): Promise<void>;
+export declare function generatePerQueryDataFiles(ontology: WireOntologyDefinition, fs: MinimalFs, outDir: string, importExt?: string, v2?: boolean): Promise<void>;
 //# sourceMappingURL=generatePerQueryDataFiles.d.ts.map

package/build/cjs/v1.1/generatePerQueryDataFiles.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generatePerQueryDataFiles.d.ts","sourceRoot":"","sources":["../../../src/v1.1/generatePerQueryDataFiles.ts"],"names":[],"mappings":"AAkBA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAGjD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AAE3E,wBAAsB,yBAAyB,CAC7C,QAAQ,EAAE,sBAAsB,EAChC,EAAE,EAAE,SAAS,EACb,MAAM,EAAE,MAAM,EACd,SAAS,GAAE,MAAW,iBAiCvB"}
+{"version":3,"file":"generatePerQueryDataFiles.d.ts","sourceRoot":"","sources":["../../../src/v1.1/generatePerQueryDataFiles.ts"],"names":[],"mappings":"AAkBA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAWjD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AAE3E,wBAAsB,yBAAyB,CAC7C,QAAQ,EAAE,sBAAsB,EAChC,EAAE,EAAE,SAAS,EACb,MAAM,EAAE,MAAM,EACd,SAAS,GAAE,MAAW,EACtB,EAAE,GAAE,OAAe,iBAqFpB"}

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

@@ -1 +1 @@
-{"version":3,"file":"generateClientSdkVersionTwoPointZero.d.ts","sourceRoot":"","sources":["../../../src/v2.0/generateClientSdkVersionTwoPointZero.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AASjD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AAG3E,wBAAsB,oCAAoC,CACxD,QAAQ,EAAE,sBAAsB,EAChC,SAAS,EAAE,MAAM,EACjB,EAAE,EAAE,SAAS,EACb,MAAM,EAAE,MAAM,EACd,WAAW,GAAE,QAAQ,GAAG,UAAuB,iBA4JhD"}
+{"version":3,"file":"generateClientSdkVersionTwoPointZero.d.ts","sourceRoot":"","sources":["../../../src/v2.0/generateClientSdkVersionTwoPointZero.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAUjD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AAG3E,wBAAsB,oCAAoC,CACxD,QAAQ,EAAE,sBAAsB,EAChC,SAAS,EAAE,MAAM,EACjB,EAAE,EAAE,SAAS,EACb,MAAM,EAAE,MAAM,EACd,WAAW,GAAE,QAAQ,GAAG,UAAuB,iBAgLhD"}

package/build/esm/index.js

@@ -4,6 +4,8 @@ import path16__default, { join } from 'path';
 import { format } from 'prettier';
 import organizeImports from 'prettier-plugin-organize-imports';
 import { wireObjectTypeFullMetadataToSdkObjectTypeDefinition, __UNSTABLE_wireInterfaceTypeV2ToSdkObjectDefinition } from '@osdk/generator-converters';
+import fastDeepEqual from 'fast-deep-equal';
+import invariant from 'tiny-invariant';
 
 // src/generateClientSdkPackage.ts
 
@@ -218,6 +220,38 @@ function createModifiedEntities(addedObjects, modifiedObjects) {
   }
   return entities;
 }
+
+// src/shared/propertyJsdoc.ts
+function propertyJsdoc(property, {
+  isInherited,
+  apiName
+}) {
+  let ret = `/**
+`;
+  const renderDisplayName = property.displayName && property.displayName !== apiName;
+  if (isInherited || renderDisplayName || property.description) {
+    if (isInherited) {
+      ret += ` * (inherited from parent)
+`;
+    }
+    if (renderDisplayName) {
+      ret += ` *   display name: '${property.displayName}'${property.description ? "," : ""}
+`;
+    }
+    if (property.description) {
+      ret += ` *   description: ${property.description}
+`;
+    }
+  } else {
+    ret += ` * (no ontology metadata)
+`;
+  }
+  ret += ` */
+`;
+  return ret;
+}
+
+// src/shared/wireObjectTypeV2ToSdkObjectConst.ts
 function getObjectDefIdentifier(name, v2) {
   return v2 ? name : `${name}Def`;
 }
@@ -256,7 +290,9 @@ function wireObjectTypeV2ToSdkObjectConst(object, importExt, v2 = false) {
         }`,
       properties: (_value) => `{
           ${stringify(definition.properties, {
-        "*": (propertyDefinition) => `PropertyDef<"${propertyDefinition.type}", "${propertyDefinition.nullable ? "nullable" : "non-nullable"}", "${propertyDefinition.multiplicity ? "array" : "single"}">`
+        "*": (propertyDefinition, _, apiName) => [`${propertyJsdoc(propertyDefinition, {
+          apiName
+        })}${apiName}`, `PropertyDef<"${propertyDefinition.type}", "${propertyDefinition.nullable ? "nullable" : "non-nullable"}", "${propertyDefinition.multiplicity ? "array" : "single"}">`]
       })}
         }`
     })}
@@ -446,8 +482,8 @@ function camelize(name) {
   return name.replace(/-./g, (segment) => segment[1].toUpperCase());
 }
 
-// src/util/verifyOutdir.ts
-async function verifyOutdir(outDir, fs2) {
+// src/util/verifyOutDir.ts
+async function verifyOutDir(outDir, fs2) {
   try {
     const contents = await fs2.readdir(outDir);
     if (contents.length !== 0) {
@@ -545,7 +581,7 @@ function reexportConsts(typesToExport) {
           import  { ${typesToExport.map((q) => `${q} as OG_${q}`).join(", ")}} from "@osdk/legacy-client";
       
           ${typesToExport.map((q) => `
-      /** @deprecated submodule imports arent public api **/
+      /** @deprecated submodule imports aren't public api **/
               export const ${q} = OG_${q};
           `).join("\n\n")}
       `;
@@ -595,7 +631,7 @@ function reexportTypes(typesToExport, genericArgsLeft = "", genericArgsRight = c
     import type { ${typesToExport.map((q) => `${q} as OG_${q}`).join(", ")}} from "@osdk/legacy-client";
     
         ${typesToExport.map((q) => `
-      /** @deprecated submodule imports arent public api **/
+      /** @deprecated submodule imports aren't public api **/
       export type ${q}${genericArgsLeft} = OG_${q}${genericArgsRight};
     `).join("\n\n")}
     `;
@@ -905,10 +941,7 @@ async function generateOntologyRuntimeDistDir(outDir, fs2, importExt = "") {
   await generateBaseTypesDir(runtimeDistDir, fs2, importExt);
   await generateClientDir(runtimeDistDir, fs2, importExt);
   await generateFiltersDir(runtimeDistDir, fs2, importExt);
-  await fs2.writeFile(
-    path16.join(runtimeDistDir, "index.ts"),
-    // TRASHFIXME
-    await formatTs(`
+  await fs2.writeFile(path16.join(runtimeDistDir, "index.ts"), await formatTs(`
       export * from "./aggregations/index${importExt}";
       export * from "./baseTypes/index${importExt}";
       ${""}
@@ -918,8 +951,7 @@ async function generateOntologyRuntimeDistDir(outDir, fs2, importExt = "") {
     
       export * from "./ontologyProvider/index${importExt}";
       export * from "./paging/index${importExt}";
-`)
-  );
+`));
 }
 
 // src/v1.1/generateBackCompatDeprecatedExports.ts
@@ -1282,10 +1314,10 @@ function wireQueryDataTypeToQueryDataTypeDefinition(input) {
     case "union":
       const allowNulls = isNullableQueryDataType(input);
       if (allowNulls && input.unionTypes.length === 2) {
-        const nonnull = input.unionTypes.find((t) => t.type != null);
-        if (nonnull) {
+        const nonNull = input.unionTypes.find((t) => t.type != null);
+        if (nonNull) {
           return {
-            ...wireQueryDataTypeToQueryDataTypeDefinition(nonnull),
+            ...wireQueryDataTypeToQueryDataTypeDefinition(nonNull),
             nullable: true
           };
         }
@@ -1310,12 +1342,14 @@ function wireQueryDataTypeToQueryDataTypeDefinition(input) {
     case "twoDimensionalAggregation":
       return {
         type: "twoDimensionalAggregation",
-        twoDimensionalAggregation: get2DQueryAggregationProps(input)
+        twoDimensionalAggregation: get2DQueryAggregationProps(input),
+        nullable: false
       };
     case "threeDimensionalAggregation":
       return {
         type: "threeDimensionalAggregation",
-        threeDimensionalAggregation: get3DQueryAggregationProps(input)
+        threeDimensionalAggregation: get3DQueryAggregationProps(input),
+        nullable: false
       };
     case "null":
     case "unsupported":
@@ -1374,6 +1408,15 @@ function wireQueryTypeV2ToSdkQueryDefinition(input) {
     output: wireQueryDataTypeToQueryDataTypeDefinition(input.output)
   };
 }
+function wireQueryTypeV2ToSdkQueryDefinitionNoParams(input) {
+  return {
+    type: "query",
+    apiName: input.apiName,
+    description: input.description,
+    displayName: input.displayName,
+    version: input.version
+  };
+}
 function wireQueryParameterV2ToQueryParameterDefinition(parameter) {
   return {
     description: parameter.description,
@@ -1382,19 +1425,36 @@ function wireQueryParameterV2ToQueryParameterDefinition(parameter) {
 }
 
 // src/v1.1/generatePerQueryDataFiles.ts
-async function generatePerQueryDataFiles(ontology, fs2, outDir, importExt = "") {
+async function generatePerQueryDataFiles(ontology, fs2, outDir, importExt = "", v2 = false) {
   await fs2.mkdir(outDir, {
     recursive: true
   });
   await Promise.all(Object.values(ontology.queryTypes).map(async (query) => {
     const objectTypes = getObjectTypesFromQuery(query);
-    await fs2.writeFile(path16__default.join(outDir, `${query.apiName}.ts`), await formatTs(`
-        import { QueryDefinition } from "@osdk/api";
-
-        export const ${query.apiName} = ${JSON.stringify(wireQueryTypeV2ToSdkQueryDefinition(query))} satisfies QueryDefinition<"${query.apiName}", ${objectTypes.length > 0 ? objectTypes.map((apiName) => `"${apiName}"`).join("|") : "never"}>;`));
+    const importObjects = objectTypes.length > 0 ? `import {${[...objectTypes].join(",")}} from "../objects${importExt}";` : "";
+    if (v2) {
+      await fs2.writeFile(path16__default.join(outDir, `${query.apiName}.ts`), await formatTs(`
+          import { QueryDefinition } from "@osdk/api";
+          ${importObjects}
+          export const ${query.apiName} = {
+            ${stringify(deleteUndefineds(wireQueryTypeV2ToSdkQueryDefinitionNoParams(query)))},
+              parameters: {${Object.entries(query.parameters).map(([name, parameter]) => {
+        return `${name} : {${stringify(deleteUndefineds(wireQueryParameterV2ToQueryParameterDefinition(parameter)))},
+            ${parameter.dataType.type === "object" || parameter.dataType.type === "objectSet" ? getOsdkTargetTypeIfPresent(parameter.dataType.objectTypeApiName, v2) : ``}}`;
+      })}},
+              output: {${stringify(deleteUndefineds(wireQueryDataTypeToQueryDataTypeDefinition(query.output)))},
+            ${query.output.type === "object" || query.output.type === "objectSet" ? getOsdkTargetTypeIfPresent(query.output.objectTypeApiName, v2) : ``}}
+          } ${getQueryDefSatisfies(query.apiName, objectTypes)}`));
+    } else {
+      await fs2.writeFile(path16__default.join(outDir, `${query.apiName}.ts`), await formatTs(`
+            import { QueryDefinition } from "@osdk/api";
+    
+            export const ${query.apiName} = ${JSON.stringify(wireQueryTypeV2ToSdkQueryDefinition(query))} ${getQueryDefSatisfies(query.apiName, objectTypes)}`));
+    }
   }));
   await fs2.writeFile(path16__default.join(outDir, "index.ts"), await formatTs(`
   ${Object.values(ontology.queryTypes).map((query) => `export * from "./${query.apiName}${importExt}";`).join("\n")}
+    ${Object.keys(ontology.queryTypes).length === 0 ? "export {};" : ""}
   `));
 }
 function getObjectTypesFromQuery(query) {
@@ -1447,6 +1507,14 @@ function getObjectTypesFromDataType(dataType, types) {
       throw new Error(`Cannot find object types from unsupported QueryDataType ${dataType.type}`);
   }
 }
+function getQueryDefSatisfies(apiName, objectTypes) {
+  return `satisfies QueryDefinition<"${apiName}", ${objectTypes.length > 0 ? objectTypes.map((apiNameObj) => `"${apiNameObj}"`).join("|") : "never"}>;`;
+}
+function getOsdkTargetTypeIfPresent(objectTypeApiName, v2) {
+  return `
+      __OsdkTargetType: ${getObjectDefIdentifier(objectTypeApiName, v2)}
+    `;
+}
 async function generateQueries(ontology, fs2, outDir, importExt = "") {
   const importedObjects = /* @__PURE__ */ new Set();
   const signatures = [];
@@ -1596,7 +1664,7 @@ async function generateClientSdkVersionOneDotOne(ontology, userAgent, fs2, outDi
   const objectsDir = path16.join(outDir, "ontology", "objects");
   const actionsDir = path16.join(outDir, "ontology", "actions");
   const queriesDir = path16.join(outDir, "ontology", "queries");
-  await verifyOutdir(outDir, fs2);
+  await verifyOutDir(outDir, fs2);
   await fs2.mkdir(outDir, {
     recursive: true
   });
@@ -1616,9 +1684,37 @@ async function generateClientSdkVersionOneDotOne(ontology, userAgent, fs2, outDi
   await generateIndexFile(fs2, outDir, importExt);
   await generateBackCompatDeprecatedExports(fs2, outDir, importExt);
 }
-function __UNSTABLE_wireInterfaceTypeV2ToSdkObjectConst(interfaceDef, v2 = false) {
+function __UNSTABLE_wireInterfaceTypeV2ToSdkObjectConst(interfaceDef, ontology, v2 = false) {
   const definition = deleteUndefineds(__UNSTABLE_wireInterfaceTypeV2ToSdkObjectDefinition(interfaceDef, v2));
   const objectDefIdentifier = getObjectDefIdentifier(interfaceDef.apiName, v2);
+  const parents = definition.implements?.map((p) => {
+    !(ontology.interfaceTypes[p] != null) ? process.env.NODE_ENV !== "production" ? invariant(false, `Expected to find a parent interface named ${p} in the ontology and did not.`) : invariant(false) : void 0;
+    const it = deleteUndefineds(__UNSTABLE_wireInterfaceTypeV2ToSdkObjectDefinition(ontology.interfaceTypes[p], v2));
+    return it;
+  }) ?? [];
+  const mergedProperties = {
+    ...definition.properties
+  };
+  for (const parent of parents) {
+    for (const apiName of Object.keys(parent.properties)) {
+      if (definition.properties[apiName] != null) {
+        !fastDeepEqual(definition.properties[apiName], parent.properties[apiName]) ? process.env.NODE_ENV !== "production" ? invariant(false, `Interface ${definition.apiName} redefines property '${apiName}' from parent '${parent.apiName}' but the properties do not match`) : invariant(false) : void 0;
+      } else if (mergedProperties[apiName] != null) {
+        !fastDeepEqual(mergedProperties[apiName], parent.properties[apiName]) ? process.env.NODE_ENV !== "production" ? invariant(false, `Some interface defines a conflicting property '${apiName}' that does not match property from parent '${parent.apiName}'`) : invariant(false) : void 0;
+      }
+      mergedProperties[apiName] = parent.properties[apiName];
+    }
+  }
+  const ogProperties = definition.properties;
+  definition.properties = mergedProperties;
+  function localPropertyJsdoc(apiName) {
+    const property = definition.properties[apiName];
+    const isInherited = ogProperties[apiName] == null;
+    return propertyJsdoc(property, {
+      isInherited,
+      apiName
+    });
+  }
   function getV2Types() {
     return `
   export interface ${objectDefIdentifier} extends InterfaceDefinition<"${interfaceDef.apiName}", ${interfaceDef.apiName}>, VersionBound<$ExpectedClientVersion> {
@@ -1632,9 +1728,9 @@ function __UNSTABLE_wireInterfaceTypeV2ToSdkObjectConst(interfaceDef, v2 = false
         "*": (definition2) => `ObjectTypeLinkDefinition<${getObjectDefIdentifier(definition2.targetType, v2)}, ${definition2.multiplicity}>`
       })}
     }`,
-      properties: (_value) => `{
-      ${stringify(definition.properties, {
-        "*": (propertyDefinition) => `PropertyDef<"${propertyDefinition.type}", "${propertyDefinition.nullable ? "nullable" : "non-nullable"}", "${propertyDefinition.multiplicity ? "array" : "single"}">`
+      properties: (properties) => `{
+      ${stringify(properties, {
+        "*": (propertyDefinition, _, key) => [`${localPropertyJsdoc(key)}${key}`, `PropertyDef<"${propertyDefinition.type}", "${propertyDefinition.nullable ? "nullable" : "non-nullable"}", "${propertyDefinition.multiplicity ? "array" : "single"}">`]
       })}
     }`
     })}
@@ -1676,11 +1772,11 @@ async function generateOntologyMetadataFile(ontology, userAgent, fs2, outDir) {
 
 // src/v2.0/generateClientSdkVersionTwoPointZero.ts
 async function generateClientSdkVersionTwoPointZero(ontology, userAgent, fs2, outDir, packageType = "commonjs") {
-  await verifyOutdir(outDir, fs2);
+  await verifyOutDir(outDir, fs2);
   const sanitizedOntology = sanitizeMetadata(ontology);
   const objectNames = Object.keys(sanitizedOntology.objectTypes).sort((a, b) => a.localeCompare(b));
   const actionNames = Object.keys(sanitizedOntology.actionTypes).sort((a, b) => a.localeCompare(b));
-  Object.keys(sanitizedOntology.queryTypes).sort((a, b) => a.localeCompare(b));
+  const queryNames = Object.keys(sanitizedOntology.queryTypes).sort((a, b) => a.localeCompare(b));
   const interfaceNames = Object.keys(sanitizedOntology.interfaceTypes ?? {}).sort((a, b) => a.localeCompare(b));
   const importExt = packageType === "module" ? ".js" : "";
   await fs2.mkdir(outDir, {
@@ -1691,6 +1787,7 @@ async function generateClientSdkVersionTwoPointZero(ontology, userAgent, fs2, ou
         export * from "./ontology/actions/index${importExt}";
         export * from "./ontology/objects${importExt}";
         export * from "./ontology/interfaces${importExt}";
+        export * from "./ontology/queries/index${importExt}";
     `));
   await generateOntologyMetadataFile(sanitizedOntology, userAgent, fs2, outDir);
   await fs2.writeFile(path16__default.join(outDir, "Ontology.ts"), await formatTs(`
@@ -1698,6 +1795,7 @@ async function generateClientSdkVersionTwoPointZero(ontology, userAgent, fs2, ou
       import * as Actions from "./ontology/actions/index${importExt}";
       import * as Objects from "./ontology/objects${importExt}";
       import * as Interfaces from "./ontology/interfaces${importExt}";
+      import * as Queries from "./ontology/queries/index${importExt}";
       import { OntologyMetadata } from "./OntologyMetadata${importExt}";
       
       export interface Ontology extends OntologyDefinition<${stringUnionFrom2(objectNames)}> {
@@ -1713,7 +1811,9 @@ async function generateClientSdkVersionTwoPointZero(ontology, userAgent, fs2, ou
   }).join(",\n")}
         },
         queries: {
-          // TODO
+          ${queryNames.map((queryName) => {
+    return `${queryName}: typeof Queries.${queryName}`;
+  }).join(",\n")}
         },
         interfaces: {
           ${interfaceNames.map((objectName) => {
@@ -1736,7 +1836,9 @@ async function generateClientSdkVersionTwoPointZero(ontology, userAgent, fs2, ou
   }).join(",\n")}
         },
         queries: {
-          // TODO
+          ${queryNames.map((queryName) => {
+    return `${queryName}: Queries.${queryName}`;
+  }).join(",\n")}
         },
         interfaces: {
           ${interfaceNames.map((objectName) => {
@@ -1771,6 +1873,11 @@ async function generateClientSdkVersionTwoPointZero(ontology, userAgent, fs2, ou
     ${Object.keys(ontology.objectTypes).sort((a, b) => a.localeCompare(b)).map((apiName) => `export * from "./objects/${apiName}${importExt}";`).join("\n")}
     ${Object.keys(ontology.objectTypes).length === 0 ? "export {};" : ""}
     `));
+  const queriesDir = path16__default.join(outDir, "ontology", "queries");
+  await fs2.mkdir(queriesDir, {
+    recursive: true
+  });
+  await generatePerQueryDataFiles(sanitizedOntology, fs2, queriesDir, importExt, true);
 }
 function stringUnionFrom2(values) {
   if (values.length === 0) {
@@ -1792,7 +1899,7 @@ async function generateOntologyInterfaces(fs2, outDir, interfaceNames, ontology,
       import { $osdkMetadata, $expectedClientVersion } from "../../OntologyMetadata${importExt}";
       import type { $ExpectedClientVersion } from "../../OntologyMetadata${importExt}";
 
-      ${__UNSTABLE_wireInterfaceTypeV2ToSdkObjectConst(obj, true)}
+      ${__UNSTABLE_wireInterfaceTypeV2ToSdkObjectConst(obj, ontology, true)}
     `));
   }
   await fs2.writeFile(interfacesDir + ".ts", await formatTs(`