@osdk/generator 2.0.0-beta.6 → 2.0.0-beta.7

package/build/cjs/index.cjs

@@ -4,7 +4,6 @@ var fs = require('fs');
 var path5 = require('path');
 var generatorConverters = require('@osdk/generator-converters');
 var prettier = require('prettier');
-var organizeImports = require('prettier-plugin-organize-imports');
 var fastDeepEqual = require('fast-deep-equal');
 var invariant = require('tiny-invariant');
 
@@ -30,7 +29,6 @@ function _interopNamespace(e) {
 
 var fs__namespace = /*#__PURE__*/_interopNamespace(fs);
 var path5__namespace = /*#__PURE__*/_interopNamespace(path5);
-var organizeImports__default = /*#__PURE__*/_interopDefault(organizeImports);
 var fastDeepEqual__default = /*#__PURE__*/_interopDefault(fastDeepEqual);
 var invariant__default = /*#__PURE__*/_interopDefault(invariant);
 
@@ -68,9 +66,9 @@ var AbstractImportable = class {
   };
 };
 var EnhancedBase = class extends AbstractImportable {
-  constructor(common, og, fullApiName, basePath) {
+  constructor(common, raw, fullApiName, basePath) {
     super(common, fullApiName, basePath);
-    this.og = og;
+    this.raw = raw;
     if (!this.isLocal && !this.sourcePackage) {
       throw new Error(`Expected { ns:'${this.apiNamespace}', shortName: '${this.shortApiName}'} to be in namespace '${common.ontologyApiNamespace}' or in a provided package mapping`);
     }
@@ -84,18 +82,18 @@ function extractNamespace(fqApiName) {
 
 // src/GenerateContext/EnhancedAction.ts
 var EnhancedAction = class extends EnhancedBase {
-  constructor(common, og) {
-    super(common, og, og.apiName, "./ontology/actions");
-    this.og = og;
+  constructor(common, raw) {
+    super(common, raw, raw.apiName, "./ontology/actions");
+    this.raw = raw;
   }
   get description() {
-    return this.og.description;
+    return this.raw.description;
   }
   get parameters() {
-    return this.og.parameters;
+    return this.raw.parameters;
   }
   get operations() {
-    return this.og.operations;
+    return this.raw.operations;
   }
   get paramsIdentifier() {
     return `${this.shortApiName}.Params`;
@@ -115,9 +113,9 @@ function deleteUndefineds(obj) {
 
 // src/GenerateContext/EnhancedInterfaceType.ts
 var EnhancedInterfaceType = class extends EnhancedBase {
-  constructor(common, og) {
-    super(common, og, og.apiName, "./ontology/interfaces");
-    this.og = og;
+  constructor(common, raw) {
+    super(common, raw, raw.apiName, "./ontology/interfaces");
+    this.raw = raw;
   }
   getDefinitionIdentifier(v2) {
     return v2 ? this.shortApiName : `${this.shortApiName}Def`;
@@ -126,16 +124,16 @@ var EnhancedInterfaceType = class extends EnhancedBase {
     return this.getDefinitionIdentifier(v2);
   }
   get properties() {
-    return this.og.properties;
+    return this.raw.properties;
   }
   getCleanedUpDefinition(v2) {
-    return deleteUndefineds(generatorConverters.__UNSTABLE_wireInterfaceTypeV2ToSdkObjectDefinition(this.og, v2));
+    return deleteUndefineds(generatorConverters.__UNSTABLE_wireInterfaceTypeV2ToSdkObjectDefinition(this.raw, v2));
   }
 };
 var EnhancedObjectType = class extends EnhancedBase {
-  constructor(common, og) {
-    super(common, og, og.objectType.apiName, "./ontology/objects");
-    this.og = og;
+  constructor(common, raw) {
+    super(common, raw, raw.objectType.apiName, "./ontology/objects");
+    this.raw = raw;
   }
   getDefinitionIdentifier(v2) {
     return v2 ? `${this.shortApiName}` : `${this.shortApiName}Def`;
@@ -144,24 +142,24 @@ var EnhancedObjectType = class extends EnhancedBase {
     return this.getDefinitionIdentifier(v2);
   }
   getCleanedUpDefinition(v2) {
-    return deleteUndefineds(generatorConverters.wireObjectTypeFullMetadataToSdkObjectTypeDefinition(this.og, v2));
+    return deleteUndefineds(generatorConverters.wireObjectTypeFullMetadataToSdkObjectTypeDefinition(this.raw, v2));
   }
 };
 
 // src/GenerateContext/EnhancedQuery.ts
 var EnhancedQuery = class extends EnhancedBase {
-  constructor(common, og) {
-    super(common, og, og.apiName, "./ontology/queries");
-    this.og = og;
+  constructor(common, raw) {
+    super(common, raw, raw.apiName, "./ontology/queries");
+    this.raw = raw;
   }
   get description() {
-    return this.og.description;
+    return this.raw.description;
   }
   get parameters() {
-    return this.og.parameters;
+    return this.raw.parameters;
   }
   get output() {
-    return this.og.output;
+    return this.raw.output;
   }
   get paramsIdentifier() {
     return `${this.shortApiName}.Parameters`;
@@ -176,9 +174,9 @@ var EnhancedQuery = class extends EnhancedBase {
 
 // src/GenerateContext/EnhancedSharedPropertyType.ts
 var EnhancedSharedPropertyType = class extends EnhancedBase {
-  constructor(common, og) {
-    super(common, og, og.apiName, "./ontology/interfaces");
-    this.og = og;
+  constructor(common, raw) {
+    super(common, raw, raw.apiName, "./ontology/interfaces");
+    this.raw = raw;
   }
 };
 
@@ -203,20 +201,21 @@ var ForeignType = class extends AbstractImportable {
 
 // src/GenerateContext/EnhancedOntologyDefinition.ts
 var EnhancedOntologyDefinition = class {
-  constructor(original, ontologyApiNamespace, apiNamespacePackageMap, importExt) {
+  #foreignTypes = {};
+  constructor(raw, ontologyApiNamespace, apiNamespacePackageMap, importExt) {
     this.common = {
       apiNamespacePackageMap,
       enhancedOntology: this,
       importExt,
       ontologyApiNamespace
     };
-    this.og = original;
-    this.ontology = original.ontology;
-    this.objectTypes = remap(original.objectTypes, this.common, EnhancedObjectType);
-    this.actionTypes = remap(original.actionTypes, this.common, EnhancedAction);
-    this.queryTypes = remap(original.queryTypes, this.common, EnhancedQuery);
-    this.interfaceTypes = remap(original.interfaceTypes, this.common, EnhancedInterfaceType);
-    this.sharedPropertyTypes = remap(original.sharedPropertyTypes, this.common, EnhancedSharedPropertyType);
+    this.raw = raw;
+    this.ontology = raw.ontology;
+    this.objectTypes = remap(raw.objectTypes, this.common, EnhancedObjectType);
+    this.actionTypes = remap(raw.actionTypes, this.common, EnhancedAction);
+    this.queryTypes = remap(raw.queryTypes, this.common, EnhancedQuery);
+    this.interfaceTypes = remap(raw.interfaceTypes, this.common, EnhancedInterfaceType);
+    this.sharedPropertyTypes = remap(raw.sharedPropertyTypes, this.common, EnhancedSharedPropertyType);
   }
   #createRequireType = (type) => {
     return (fullApiName, localOnly) => {
@@ -229,7 +228,9 @@ var EnhancedOntologyDefinition = class {
         if (!this.common.apiNamespacePackageMap.has(apiNamespace)) {
           throw new Error(`Unable to find ${type}: Unknown namespace '${apiNamespace}'`);
         }
-        return new ForeignType(this.common, type, apiNamespace, shortApiName);
+        const ret2 = this.#foreignTypes[fullApiName] ?? new ForeignType(this.common, type, apiNamespace, shortApiName);
+        this.#foreignTypes[fullApiName] = ret2;
+        return ret2;
       }
       return ret;
     };
@@ -272,7 +273,6 @@ function formatTs(contents) {
       parser: "typescript",
       singleQuote: true,
       trailingComma: "all",
-      plugins: [organizeImports__default.default],
       tabWidth: 2,
       printWidth: 120
     });
@@ -315,7 +315,10 @@ async function generateOntologyMetadataFile({
 // src/shared/getObjectImports.ts
 function getObjectImports(objects, curApiName, currentFilePath, v2) {
   return Array.from(objects).filter((obj) => obj.fullApiName !== curApiName).map((obj) => {
-    return `import type { ${obj.getDefinitionIdentifier(v2)} as ${obj.getImportedDefinitionIdentifier(v2)} } from "${obj.getImportPathRelTo("./" + currentFilePath)}";`;
+    const defId = obj.getDefinitionIdentifier(v2);
+    const importedId = obj.getImportedDefinitionIdentifier(v2);
+    const nameOrAlias = defId === importedId ? defId : `${defId} as ${importedId}`;
+    return `import type { ${nameOrAlias} } from "${obj.getImportPathRelTo("./" + currentFilePath)}";`;
   }).join("\n");
 }
 
@@ -438,7 +441,7 @@ function stringUnionFrom(values) {
   }
 }
 
-// src/v1.1/wireObjectTypeV2ToV1ObjectInterfaceString.ts
+// src/v2.0/getDescriptionIfPresent.ts
 function getDescriptionIfPresent(description, includeNewline) {
   if (description) {
     return `/**
@@ -487,7 +490,7 @@ function wireObjectTypeV2ToSdkObjectConstV2(wireObject, {
 }, currentFilePath) {
   const object = ontology.requireObjectType(wireObject.objectType.apiName, true);
   const uniqueLinkTargetTypes = new Set(wireObject.linkTypes.map((a) => ontology.requireObjectType(a.objectTypeApiName, false)));
-  const definition = deleteUndefineds(generatorConverters.wireObjectTypeFullMetadataToSdkObjectTypeDefinition(object.og, true));
+  const definition = deleteUndefineds(generatorConverters.wireObjectTypeFullMetadataToSdkObjectTypeDefinition(object.raw, true));
   const objectDefIdentifier = object.getDefinitionIdentifier(true);
   const objectSetIdentifier = `${object.shortApiName}.ObjectSet`;
   const propertyKeysIdentifier = `${object.shortApiName}.PropertyKeys`;
@@ -496,7 +499,7 @@ function wireObjectTypeV2ToSdkObjectConstV2(wireObject, {
   const osdkObjectLinksIdentifier = `${object.shortApiName}.Links`;
   const osdkObjectIdentifier = `${object.shortApiName}.OsdkObject`;
   const identifiers = {
-    objectDefIdentifier: `${object.shortApiName}.Definition`,
+    objectDefIdentifier: `${object.shortApiName}`,
     osdkObjectLinksIdentifier,
     osdkObjectPropsIdentifier,
     osdkObjectStrictPropsIdentifier,
@@ -506,42 +509,18 @@ function wireObjectTypeV2ToSdkObjectConstV2(wireObject, {
   };
   function getV2Types() {
     return `import type {
-      AggregateOpts as $AggregateOpts,
-      AggregateOptsThatErrorsAndDisallowsOrderingWithMultipleGroupBy as $AggregateOptsThatErrorsAndDisallowsOrderingWithMultipleGroupBy,
-      AggregationsResults as $AggregationsResults, 
-      Augments as $Augments,
-      ConvertProps as $ConvertProps,
-      DefaultToFalse as $DefaultToFalse,
-      FetchPageArgs as $FetchPageArgs,
-      FetchPageResult as $FetchPageResult,
-      IsAny as $IsAny,
-      LinkedType as $LinkedType,
-      LinkNames as $LinkNames,
-      NullabilityAdherence as $NullabilityAdherence,
-      NullabilityAdherenceDefault as $NullabilityAdherenceDefault,
+      ObjectOrInterfacePropertyKeysFrom2 as $ObjectOrInterfacePropertyKeysFrom2,  
+      ObjectTypeDefinition as $ObjectTypeDefinition,
+      ObjectTypeLinkDefinition as $ObjectTypeLinkDefinition,
+    } from "@osdk/api";
+     import type {
       ObjectSet as $ObjectSet, 
       Osdk as $Osdk,
       OsdkObject as $OsdkObject,
-      OsdkObjectLinksEntry as $OsdkObjectLinksEntry,
-      OsdkObjectLinksObject as $OsdkObjectLinksObject,
-      OsdkObjectPropertyType as $OsdkObjectPropertyType,
-      PageResult as $PageResult,
-      PropertyValueClientToWire as $PropertyValueClientToWire,
       PropertyValueWireToClient as $PropType,
-      Result as $Result,
-      SelectArg as $SelectArg, 
       SingleLinkAccessor  as $SingleLinkAccessor,
-      SingleLinkAccessor as $SingleLinkAccessor
-      SingleOsdkResult as $SingleOsdkResult,
-      ValidToFrom as $ValidToFrom,
-      WhereClause as $WhereClause,
     } from "@osdk/client.api";
-    import type * as $clientApi from "@osdk/client.api";
-    import type {
-      ObjectOrInterfacePropertyKeysFrom2 as $ObjectOrInterfacePropertyKeysFrom2,  
-      ObjectTypeDefinition as $ObjectTypeDefinition,
-      ObjectTypeLinkDefinition as $ObjectTypeLinkDefinition,
-    } from "@osdk/api";
+
 
     export namespace ${object.shortApiName} {
 
@@ -554,16 +533,15 @@ function wireObjectTypeV2ToSdkObjectConstV2(wireObject, {
       ${createProps(object, "StrictProps", true)}
 
       ${createObjectSet(object, identifiers)}
-
-      ${createDefinition(object, ontology, "Definition", identifiers)}
+      
       ${createOsdkObject(object, "OsdkObject", identifiers)}
     }    
 
 
 
-
+    ${createDefinition(object, ontology, object.shortApiName, identifiers)}
+  
   
-  export type ${objectDefIdentifier} = ${object.shortApiName}.Definition;
 
 
     `;
@@ -685,7 +663,7 @@ function createLinks(ontology, object, identifier) {
 ${stringify(definition.links, {
     "*": (definition2, _, key) => {
       const linkTarget = ontology.requireObjectType(definition2.targetType).getImportedDefinitionIdentifier(true);
-      return [`readonly ${key}`, `${definition2.multiplicity ? `${linkTarget}.ObjectSet` : `$SingleLinkAccessor<${linkTarget}.Definition>`}
+      return [`readonly ${key}`, `${definition2.multiplicity ? `${linkTarget}.ObjectSet` : `$SingleLinkAccessor<${linkTarget}>`}
           `];
     }
   })}
@@ -710,10 +688,10 @@ async function generatePerActionDataFiles({
   });
   await Promise.all(Object.values(enhancedOntology.actionTypes).map(async (action) => {
     const currentFilePath = `${path5__namespace.default.join("ontology", "actions", `${action.shortApiName}.ts`)}`;
-    const uniqueApiNamesArray = extractReferencedObjectsFromAction(action.og);
+    const uniqueApiNamesArray = extractReferencedObjectsFromAction(action.raw);
     const uniqueApiNames = new Set(uniqueApiNamesArray);
     const uniqueApiNamesString = stringUnionFrom([...uniqueApiNames]);
-    const fullActionDef = deleteUndefineds(wireActionTypeV2ToSdkActionDefinition(action.og));
+    const fullActionDef = deleteUndefineds(wireActionTypeV2ToSdkActionDefinition(action.raw));
     const {
       parameters,
       ...actionDefSansParameters
@@ -737,9 +715,9 @@ async function generatePerActionDataFiles({
               return JSON.stringify(type);
             } else if (type.type === "object") {
               const obj = enhancedOntology.requireObjectType(type.object);
-              return `ObjectActionDataType<"${obj.fullApiName}", ${obj.getImportedDefinitionIdentifier(true)}.Definition>`;
+              return `ObjectActionDataType<"${obj.fullApiName}", ${obj.getImportedDefinitionIdentifier(true)}>`;
             } else if (type.type === "objectSet") {
-              return `ObjectSetActionDataType<"${type.objectSet}", ${getObjectDefIdentifier(type.objectSet, true)}.Definition>`;
+              return `ObjectSetActionDataType<"${type.objectSet}", ${getObjectDefIdentifier(type.objectSet, true)}>`;
             }
             return void 0;
           }
@@ -752,13 +730,13 @@ async function generatePerActionDataFiles({
       if (typeof input === "string") {
         return `ActionParam.PrimitiveType<${JSON.stringify(input)}>`;
       } else if (input.type === "object") {
-        return `ActionParam.ObjectType<${enhancedOntology.requireObjectType(input.object).getImportedDefinitionIdentifier(true)}.Definition>`;
+        return `ActionParam.ObjectType<${enhancedOntology.requireObjectType(input.object).getImportedDefinitionIdentifier(true)}>`;
       } else if (input.type === "objectSet") {
-        return `ActionParam.ObjectSetType<${enhancedOntology.requireObjectType(input.objectSet).getImportedDefinitionIdentifier(true)}.Definition>`;
+        return `ActionParam.ObjectSetType<${enhancedOntology.requireObjectType(input.objectSet).getImportedDefinitionIdentifier(true)}>`;
       }
     }
     function createV2Types() {
-      const oldParamsIdentifier = `${action.shortApiName}$Params`;
+      `${action.shortApiName}$Params`;
       return `
         
           export namespace ${action.shortApiName}{
@@ -775,8 +753,6 @@ async function generatePerActionDataFiles({
         }
       })}
             }
-            /** @deprecated **/
-            export type Parameters = Params;
 
 
               // Represents the definition of the action
@@ -798,11 +774,6 @@ async function generatePerActionDataFiles({
   
           }
 
-          /**
-           * @deprecated Use \`${action.paramsIdentifier}\`
-           */
-          export type ${oldParamsIdentifier} = ${action.paramsIdentifier} | ReadonlyArray<${action.paramsIdentifier}>;
-
           /** @deprecated Use \`${action.definitionIdentifier}\` **/
           export type ${action.shortApiName} = ${action.shortApiName}.Signatures;
           `;
@@ -837,9 +808,9 @@ async function generatePerActionDataFiles({
     const imports = getObjectImports(referencedObjectDefs, void 0, currentFilePath, true);
     await fs2.writeFile(path5__namespace.default.join(rootOutDir, currentFilePath), await formatTs(`
           import type { ActionDefinition, ObjectActionDataType, ObjectSetActionDataType, VersionBound} from "@osdk/api";
-          import type { ApplyActionOptions, ApplyBatchActionOptions, ActionReturnTypeForOptions, ActionParam } from '@osdk/client.api';
-          import { $osdkMetadata} from "../../OntologyMetadata${importExt}";
+          import type { ActionParam, ActionReturnTypeForOptions, ApplyActionOptions, ApplyBatchActionOptions,  } from '@osdk/client.api';
           import type { $ExpectedClientVersion } from "../../OntologyMetadata${importExt}";
+          import { $osdkMetadata} from "../../OntologyMetadata${importExt}";
           ${imports}
 
         
@@ -873,6 +844,7 @@ function extractReferencedObjectsFromAction(actionType) {
       case "deleteObject":
       case "createLink":
       case "deleteLink":
+      default:
         return [];
     }
   });
@@ -1127,8 +1099,9 @@ async function generatePerQueryDataFilesV2({
 async function generateV2QueryFile(fs2, outDir, relOutDir, query, importExt, ontology) {
   const relFilePath = path5__namespace.default.join(relOutDir, `${query.shortApiName}.ts`);
   const objectTypes = getObjectTypeApiNamesFromQuery(query);
-  const importObjects = getObjectImports2(ontology, objectTypes, relFilePath);
-  const baseProps = deleteUndefineds(wireQueryTypeV2ToSdkQueryDefinitionNoParams(query.og));
+  const objectTypeObjects = new Set(objectTypes.map((o) => ontology.requireObjectType(o)));
+  const importObjects = getObjectImports(objectTypeObjects, "", relFilePath, true);
+  const baseProps = deleteUndefineds(wireQueryTypeV2ToSdkQueryDefinitionNoParams(query.raw));
   const outputBase = deleteUndefineds(wireQueryDataTypeToQueryDataTypeDefinition(query.output));
   const referencedObjectTypes = objectTypes.length > 0 ? objectTypes.map((apiNameObj) => `"${apiNameObj}"`).join("|") : "never";
   await fs2.writeFile(path5__namespace.default.join(outDir, `${query.shortApiName}.ts`), await formatTs(`
@@ -1234,15 +1207,6 @@ function queryParamJsDoc(param, {
 `;
   return ret;
 }
-function getObjectImports2(enhancedOntology, objectTypes, filePath) {
-  let ret = "";
-  for (const fqObjectApiName of objectTypes) {
-    const obj = enhancedOntology.requireObjectType(fqObjectApiName);
-    ret += `import type { ${obj.getDefinitionIdentifier(true)} as ${obj.getImportedDefinitionIdentifier(true)} } from "${obj.getImportPathRelTo(filePath)}";
-`;
-  }
-  return ret;
-}
 function getQueryParamType(enhancedOntology, input, type) {
   let inner = `unknown /* ${input.type} */`;
   switch (input.type) {
@@ -1283,11 +1247,11 @@ function getQueryParamType(enhancedOntology, input, type) {
   return inner;
 }
 function __UNSTABLE_wireInterfaceTypeV2ToSdkObjectConst(interfaceDef, ontology, v2 = false) {
-  const definition = deleteUndefineds(generatorConverters.__UNSTABLE_wireInterfaceTypeV2ToSdkObjectDefinition(interfaceDef.og, v2));
+  const definition = deleteUndefineds(generatorConverters.__UNSTABLE_wireInterfaceTypeV2ToSdkObjectDefinition(interfaceDef.raw, v2));
   const objectDefIdentifier = interfaceDef.getDefinitionIdentifier(v2);
   const parents = definition.implements?.map((p) => {
     !(ontology.interfaceTypes[p] != null) ? process.env.NODE_ENV !== "production" ? invariant__default.default(false, `Expected to find a parent interface named ${p} in the ontology and did not.`) : invariant__default.default(false) : void 0;
-    const it = deleteUndefineds(generatorConverters.__UNSTABLE_wireInterfaceTypeV2ToSdkObjectDefinition(ontology.requireInterfaceType(p, true).og, v2));
+    const it = deleteUndefineds(generatorConverters.__UNSTABLE_wireInterfaceTypeV2ToSdkObjectDefinition(ontology.requireInterfaceType(p, true).raw, v2));
     return it;
   }) ?? [];
   const mergedProperties = {
@@ -1328,43 +1292,15 @@ function __UNSTABLE_wireInterfaceTypeV2ToSdkObjectConst(interfaceDef, ontology,
     propertyKeysIdentifier
   };
   function getV2Types() {
-    return `import type {
-      AggregateOpts as $AggregateOpts,
-      AggregateOptsThatErrorsAndDisallowsOrderingWithMultipleGroupBy as $AggregateOptsThatErrorsAndDisallowsOrderingWithMultipleGroupBy,
-      AggregationsResults as $AggregationsResults, 
-      Augments as $Augments,
-      ConvertProps as $ConvertProps,
-      DefaultToFalse as $DefaultToFalse,
-      FetchPageArgs as $FetchPageArgs,
-      FetchPageResult as $FetchPageResult,
-      IsAny as $IsAny,
-      LinkedType as $LinkedType,
-      LinkNames as $LinkNames,
-      NullabilityAdherence as $NullabilityAdherence,
-      NullabilityAdherenceDefault as $NullabilityAdherenceDefault,
+    return `    import type {
+    InterfaceDefinition as $InterfaceDefinition,
+    } from "@osdk/api";
+     import type {
       ObjectSet as $ObjectSet, 
       Osdk as $Osdk,
-      OsdkObject as $OsdkObject,
-      OsdkObjectLinksEntry as $OsdkObjectLinksEntry,
-      OsdkObjectLinksObject as $OsdkObjectLinksObject,
-      OsdkObjectPropertyType as $OsdkObjectPropertyType,
-      PageResult as $PageResult,
-      PropertyValueClientToWire as $PropertyValueClientToWire,
-      PropertyValueWireToClient as $PropType,
-      Result as $Result,
-      SelectArg as $SelectArg, 
-      SingleLinkAccessor  as $SingleLinkAccessor,
-      SingleOsdkResult as $SingleOsdkResult,
-      ValidToFrom as $ValidToFrom,
-      WhereClause as $WhereClause,
-    } from "@osdk/client.api";
-    import type * as $clientApi from "@osdk/client.api";
-    import type {
-      ObjectOrInterfacePropertyKeysFrom2 as $ObjectOrInterfacePropertyKeysFrom2, 
-      ObjectTypeLinkDefinition as $ObjectTypeLinkDefinition,
-      ObjectTypeDefinition as $ObjectTypeDefinition,
-      InterfaceDefinition as $InterfaceDefinition,
-    } from "@osdk/api";
+      PropertyValueWireToClient as $PropType,    } from "@osdk/client.api";
+    
+
 
     
 
@@ -1437,15 +1373,15 @@ async function generateRootIndexTsFile({
   importExt,
   ontologyApiNamespace
 }) {
-  fs2.writeFile(path5__namespace.default.join(outDir, "index.ts"), await formatTs(`${ontologyApiNamespace == null ? `export { $ontologyRid } from "./OntologyMetadata${importExt}";` : ``}
-        export * from "./ontology/actions${importExt}";
+  fs2.writeFile(path5__namespace.default.join(outDir, "index.ts"), await formatTs(`export * from "./ontology/actions${importExt}";
         export * as $Actions from "./ontology/actions${importExt}";
-        export * from "./ontology/objects${importExt}";
-        export * as $Objects from "./ontology/objects${importExt}";
         export * from "./ontology/interfaces${importExt}";
         export * as $Interfaces from "./ontology/interfaces${importExt}";
+        export * from "./ontology/objects${importExt}";
+        export * as $Objects from "./ontology/objects${importExt}";
         export * from "./ontology/queries${importExt}";
         export * as $Queries from "./ontology/queries${importExt}";
+        ${ontologyApiNamespace == null ? `export { $ontologyRid } from "./OntologyMetadata${importExt}";` : ``}
     `));
 }
 async function generateEachObjectFile(ctx) {
@@ -1462,11 +1398,10 @@ async function generateEachObjectFile(ctx) {
     const relPath = path5__namespace.default.join(".", "ontology", `objects`, `${obj.shortApiName}.ts`);
     const outFilePath = path5__namespace.default.join(outDir, relPath);
     await fs2.writeFile(outFilePath, await formatTs(`
-        import type {  VersionBound as $VersionBound, PropertyDef as $PropertyDef } from "@osdk/api";
-        import type { Osdk } from "@osdk/client.api";
+        import type { PropertyDef as $PropertyDef } from "@osdk/api";
         import { $osdkMetadata } from "../../OntologyMetadata${importExt}";
         import type { $ExpectedClientVersion } from "../../OntologyMetadata${importExt}";
-        ${wireObjectTypeV2ToSdkObjectConstV2(obj.og, ctx, relPath)}
+        ${wireObjectTypeV2ToSdkObjectConstV2(obj.raw, ctx, relPath)}
       `));
   }
 }
@@ -1514,10 +1449,8 @@ async function generateOntologyInterfaces({
   });
   for (const obj of Object.values(ontology.interfaceTypes)) {
     await fs2.writeFile(path5__namespace.default.join(interfacesDir, `${obj.shortApiName}.ts`), await formatTs(`
-    
-      import type { PropertyDef as $PropertyDef, VersionBound as $VersionBound } from "@osdk/api";
-      import { $osdkMetadata, $expectedClientVersion } from "../../OntologyMetadata${importExt}";
-      import type { $ExpectedClientVersion } from "../../OntologyMetadata${importExt}";
+        import type { PropertyDef as $PropertyDef } from "@osdk/api";
+        import { $osdkMetadata } from "../../OntologyMetadata${importExt}";
       ${__UNSTABLE_wireInterfaceTypeV2ToSdkObjectConst(obj, ontology, true)}
     `));
   }