@osdk/cli 0.24.2-beta.2 → 0.24.2

package/build/{browser/handleGenerate-BYKD4FQH.js → esm/handleGenerate-FRYQNME6.js}

@@ -85,20 +85,14 @@ var AbstractImportable = class {
    */
   importPath;
   uniqueImportName;
-  isLocal;
-  sourcePackage;
-  constructor(common2, fullApiName, basePath) {
+  constructor(common2, fullApiName, basePath, isLocal = true) {
     this._common = common2;
     this.fullApiName = fullApiName;
     [this.apiNamespace, this.shortApiName] = extractNamespace(this.fullApiName);
     const {
-      ontologyApiNamespace,
-      apiNamespacePackageMap,
       importExt
     } = common2;
-    this.isLocal = ontologyApiNamespace === this.apiNamespace;
-    this.sourcePackage = this.apiNamespace && !this.isLocal ? apiNamespacePackageMap.get(this.apiNamespace) : void 0;
-    this.importPath = this.isLocal ? `${basePath}/${this.shortApiName}${importExt}` : this.sourcePackage;
+    this.importPath = isLocal ? `${basePath}/${this.shortApiName}${importExt}` : basePath;
     this.uniqueImportName = this.shortApiName;
   }
   getImportPathRelTo = (filePath) => {
@@ -119,9 +113,6 @@ var EnhancedBase = class extends AbstractImportable {
   constructor(common2, raw, fullApiName, basePath) {
     super(common2, fullApiName, basePath);
     this.raw = raw;
-    if (!this.isLocal && !this.sourcePackage) {
-      throw new Error(`Expected { ns:'${this.apiNamespace}', shortName: '${this.shortApiName}'} to be in namespace '${common2.ontologyApiNamespace}' or in a provided package mapping`);
-    }
   }
 };
 function extractNamespace(fqApiName) {
@@ -675,21 +666,15 @@ var EnhancedSharedPropertyType = class extends EnhancedBase {
 init_esm_shims();
 var ForeignType = class extends AbstractImportable {
   _common;
-  type;
-  constructor(_common, type2, apiNamespace, shortApiName) {
-    super(_common, `${apiNamespace}.${shortApiName}`, _common.apiNamespacePackageMap.get(apiNamespace));
+  constructor(_common, apiNamespace, shortApiName, destinationPackage) {
+    super(_common, apiNamespace ? `${apiNamespace}.${shortApiName}` : shortApiName, destinationPackage, false);
     this._common = _common;
-    this.type = type2;
   }
   getImportedDefinitionIdentifier() {
-    return `$Imported$${this.type}$${this.apiNamespace.replace(/\./g, "$")}$${this.shortApiName}`;
+    return `$Imported$${this.apiNamespace?.replace(/\./g, "$")}$${this.shortApiName}`;
   }
-  getDefinitionIdentifier(v2) {
-    if (this.type === "objectTypes") {
-      return v2 ? this.uniqueImportName : `${this.uniqueImportName}Def`;
-    } else {
-      return this.uniqueImportName;
-    }
+  getDefinitionIdentifier() {
+    return this.uniqueImportName;
   }
 };
 
@@ -704,35 +689,25 @@ var EnhancedOntologyDefinition = class {
   #foreignTypes = {};
   raw;
   common;
-  constructor(raw, ontologyApiNamespace, apiNamespacePackageMap, importExt) {
+  constructor(raw, importExt, externalObjects, externalInterfaces, externalSpts) {
     this.common = {
-      apiNamespacePackageMap,
       enhancedOntology: this,
-      importExt,
-      ontologyApiNamespace
+      importExt
     };
     this.raw = raw;
     this.ontology = raw.ontology;
-    this.objectTypes = remap(raw.objectTypes, this.common, EnhancedObjectType);
+    this.objectTypes = remap(raw.objectTypes, this.common, EnhancedObjectType, externalObjects);
     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);
+    this.interfaceTypes = remap(raw.interfaceTypes, this.common, EnhancedInterfaceType, externalInterfaces);
+    this.sharedPropertyTypes = remap(raw.sharedPropertyTypes, this.common, EnhancedSharedPropertyType, externalSpts);
   }
   #createRequireType = (type2) => {
-    return (fullApiName, localOnly) => {
+    return (fullApiName) => {
       const ret = this[type2][fullApiName];
       if (!ret) {
-        const [apiNamespace, shortApiName] = extractNamespace(fullApiName);
-        if (localOnly || !apiNamespace) {
-          throw new Error(`Unable to find ${type2}: No entry for '${fullApiName}`);
-        }
-        if (!this.common.apiNamespacePackageMap.has(apiNamespace)) {
-          throw new Error(`Unable to find ${type2}: Unknown namespace '${apiNamespace}'`);
-        }
-        const ret2 = this.#foreignTypes[fullApiName] ?? new ForeignType(this.common, type2, apiNamespace, shortApiName);
-        this.#foreignTypes[fullApiName] = ret2;
-        return ret2;
+        extractNamespace(fullApiName);
+        throw new Error(`Unable to find ${type2}: No entry for '${fullApiName}`);
       }
       return ret;
     };
@@ -743,15 +718,31 @@ var EnhancedOntologyDefinition = class {
   requireQueryType = this.#createRequireType("queryTypes");
   requireSharedPropertyType = this.#createRequireType("sharedPropertyTypes");
 };
-function remap(r, common2, Constructor) {
-  return Object.fromEntries(Object.entries(r ?? {}).map(([fullApiName, v]) => {
-    return [fullApiName, new Constructor(common2, v)];
-  }).sort((a, b) => a[0].localeCompare(b[0])));
+function remap(r, common2, Constructor, externalMap) {
+  const entries = [];
+  for (const [fullApiName, v] of Object.entries(r ?? {})) {
+    if (!externalMap?.has(fullApiName)) {
+      entries.push([fullApiName, new Constructor(common2, v)]);
+    }
+  }
+  if (externalMap) {
+    for (const [fullApiName, destPackage] of externalMap) {
+      const [apiNamespace, shortApiName] = extractNamespace(fullApiName);
+      entries.push([fullApiName, new ForeignType(common2, apiNamespace, shortApiName, destPackage)]);
+    }
+  }
+  return Object.fromEntries(entries.sort((a, b) => a[0].localeCompare(b[0])));
 }
 
 // ../generator/build/esm/GenerateContext/enhanceOntology.js
-function enhanceOntology(sanitized, ontologyApiNamespace, apiNamespacePackageMap, importExt) {
-  return new EnhancedOntologyDefinition(sanitized, ontologyApiNamespace, apiNamespacePackageMap, importExt);
+function enhanceOntology({
+  sanitized,
+  importExt,
+  externalObjects,
+  externalInterfaces,
+  externalSpts
+}) {
+  return new EnhancedOntologyDefinition(sanitized, importExt, externalObjects, externalInterfaces, externalSpts);
 }
 
 // ../generator/build/esm/shared/sanitizeMetadata.js
@@ -771,6 +762,24 @@ function camelize(name) {
   return name.replace(/-./g, (segment) => segment[1].toUpperCase());
 }
 
+// ../generator/build/esm/util/verifyOutDir.js
+init_esm_shims();
+async function verifyOutDir(outDir, fs9) {
+  try {
+    const contents = await fs9.readdir(outDir);
+    if (contents.length !== 0) {
+      throw new Error(`outDir ${outDir} is not empty, please delete its contents and try again`);
+    }
+  } catch (e) {
+    if (!(e.code === "ENOENT")) {
+      throw e;
+    }
+  }
+}
+
+// ../generator/build/esm/v2.0/generateMetadata.js
+init_esm_shims();
+
 // ../generator/build/esm/util/test/formatTs.js
 init_esm_shims();
 
@@ -21115,23 +21124,7 @@ function formatTs(contents) {
   }
 }
 
-// ../generator/build/esm/util/verifyOutDir.js
-init_esm_shims();
-async function verifyOutDir(outDir, fs9) {
-  try {
-    const contents = await fs9.readdir(outDir);
-    if (contents.length !== 0) {
-      throw new Error(`outDir ${outDir} is not empty, please delete its contents and try again`);
-    }
-  } catch (e) {
-    if (!(e.code === "ENOENT")) {
-      throw e;
-    }
-  }
-}
-
 // ../generator/build/esm/v2.0/generateMetadata.js
-init_esm_shims();
 var ExpectedOsdkVersion = "2.0.2";
 async function generateOntologyMetadataFile({
   fs: fs9,
@@ -21248,6 +21241,9 @@ function wireObjectTypeV2ToSdkObjectConstV2(wireObject, {
   ontology
 }, currentFilePath) {
   const object = ontology.requireObjectType(wireObject.objectType.apiName, true);
+  if (object instanceof ForeignType) {
+    throw new Error("Should not be generating types for an external type");
+  }
   const uniqueLinkTargetTypes = new Set(wireObject.linkTypes.map((a) => ontology.requireObjectType(a.objectTypeApiName, false)));
   const definition = deleteUndefineds(wireObjectTypeFullMetadataToSdkObjectMetadata(object.raw, true));
   const objectDefIdentifier = object.getDefinitionIdentifier(true);
@@ -21267,7 +21263,7 @@ function wireObjectTypeV2ToSdkObjectConstV2(wireObject, {
     propertyKeysIdentifier
   };
   const imports = getObjectImports(uniqueLinkTargetTypes, definition.apiName, currentFilePath, true);
-  return `${imports}${function() {
+  return `${imports}${function(object2) {
     return `import type {
       PropertyKeys as $PropertyKeys,  
       ObjectTypeDefinition as $ObjectTypeDefinition,
@@ -21282,26 +21278,26 @@ function wireObjectTypeV2ToSdkObjectConstV2(wireObject, {
     } from "@osdk/api";
 
 
-    export namespace ${object.shortApiName} {
+    export namespace ${object2.shortApiName} {
 
-      ${createPropertyKeys(object)}
+      ${createPropertyKeys(object2)}
 
 
-      ${createLinks(ontology, object, "Links")}
+      ${createLinks(ontology, object2, "Links")}
 
-      ${createProps(object, "Props", false)}
-      ${createProps(object, "StrictProps", true)}
+      ${createProps(object2, "Props", false)}
+      ${createProps(object2, "StrictProps", true)}
 
-      ${createObjectSet(object, identifiers)}
+      ${createObjectSet(object2, identifiers)}
       
-      ${createOsdkObject(object, "OsdkObject", identifiers)}
+      ${createOsdkObject(object2, "OsdkInstance", identifiers)}
     }    
 
 
 
-    ${createDefinition(object, ontology, object.shortApiName, identifiers)}
+    ${createDefinition(object2, ontology, object2.shortApiName, identifiers)}
     `;
-  }()}
+  }(object)}
 
     export const ${object.shortApiName}: ${objectDefIdentifier}
     = {
@@ -21318,16 +21314,22 @@ function createOsdkObject(object, identifier, {
 }) {
   object.getCleanedUpDefinition(true);
   return `
-  export type ${identifier}<
+    export type ${identifier}<
       OPTIONS extends never | "$notStrict" | "$rid" = never,
       K extends keyof ${osdkObjectPropsIdentifier}= keyof ${osdkObjectPropsIdentifier},
-
-  > 
-    = $Osdk<
+    > 
+    = $Osdk.Instance<
         ${objectDefIdentifier}, 
-        K | OPTIONS
-      > 
+        OPTIONS,
+        K
+      >;
    
+
+    /** @deprecated use ${identifier} */
+    export type OsdkObject<
+      OPTIONS extends never | "$notStrict" | "$rid" = never,
+      K extends keyof ${osdkObjectPropsIdentifier}= keyof ${osdkObjectPropsIdentifier},
+    > = ${identifier}<OPTIONS, K>;
   ;
     `;
 }
@@ -21637,6 +21639,177 @@ function extractReferencedObjectsFromActionParameter(actionParameter) {
   }
 }
 
+// ../generator/build/esm/v2.0/generatePerInterfaceDataFiles.js
+init_esm_shims();
+
+// ../generator/build/esm/v2.0/UNSTABLE_wireInterfaceTypeV2ToSdkObjectConst.js
+init_esm_shims();
+var import_fast_deep_equal = __toESM(require_fast_deep_equal(), 1);
+
+// ../../node_modules/.pnpm/tiny-invariant@1.3.3/node_modules/tiny-invariant/dist/esm/tiny-invariant.js
+init_esm_shims();
+var isProduction = process.env.NODE_ENV === "production";
+var prefix = "Invariant failed";
+function invariant(condition, message) {
+  if (isProduction) {
+    throw new Error(prefix);
+  }
+  var provided = typeof message === "function" ? message() : message;
+  var value = provided ? "".concat(prefix, ": ").concat(provided) : prefix;
+  throw new Error(value);
+}
+
+// ../generator/build/esm/v2.0/UNSTABLE_wireInterfaceTypeV2ToSdkObjectConst.js
+function __UNSTABLE_wireInterfaceTypeV2ToSdkObjectConst(interfaceDef, ontology, v2 = false) {
+  const definition = deleteUndefineds(__UNSTABLE_wireInterfaceTypeV2ToSdkObjectDefinition(interfaceDef.raw));
+  const objectDefIdentifier = interfaceDef.getDefinitionIdentifier(v2);
+  const parents = definition.implements?.map((p) => {
+    const parent = ontology.requireInterfaceType(p, true);
+    if (parent instanceof EnhancedInterfaceType) {
+      const it = deleteUndefineds(__UNSTABLE_wireInterfaceTypeV2ToSdkObjectDefinition(parent.raw));
+      return it;
+    }
+  }) ?? [];
+  const mergedProperties = {
+    ...definition.properties
+  };
+  for (const parent of parents) {
+    if (parent == null) {
+      continue;
+    }
+    for (const apiName of Object.keys(parent.properties)) {
+      if (definition.properties[apiName] != null) {
+        !(0, import_fast_deep_equal.default)(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()  : void 0;
+      } else if (mergedProperties[apiName] != null) {
+        !(0, import_fast_deep_equal.default)(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()  : void 0;
+      }
+      mergedProperties[apiName] = parent.properties[apiName];
+    }
+  }
+  definition.properties = mergedProperties;
+  const objectSetIdentifier = `${interfaceDef.shortApiName}.ObjectSet`;
+  const propertyKeysIdentifier = `${interfaceDef.shortApiName}.PropertyKeys`;
+  const osdkObjectPropsIdentifier = `${interfaceDef.shortApiName}.Props`;
+  const osdkObjectStrictPropsIdentifier = `${interfaceDef.shortApiName}.StrictProps`;
+  const osdkObjectLinksIdentifier = `OsdkObjectLinks$${objectDefIdentifier}`;
+  const osdkObjectIdentifier = `${interfaceDef.shortApiName}.OsdkObject`;
+  const ids = {
+    objectDefIdentifier: interfaceDef.shortApiName,
+    osdkObjectLinksIdentifier,
+    osdkObjectPropsIdentifier,
+    osdkObjectStrictPropsIdentifier,
+    objectSetIdentifier,
+    osdkObjectIdentifier,
+    propertyKeysIdentifier
+  };
+  if (interfaceDef.apiNamespace) {
+    const badProperties = Object.keys(definition.properties).filter((apiName) => extractNamespace(apiName)[0] == null);
+    if (badProperties.length > 0) {
+      throw new Error(`Interfaces with fully qualified api names MUST NOT have any properties with an unqualified api name. Interface: ${interfaceDef.fullApiName}, properties: ${badProperties.join(", ")}`);
+    }
+  }
+  return `${[].join("\n")}
+    ${v2 ? function() {
+    return `import type {
+      InterfaceDefinition as $InterfaceDefinition,
+      ObjectSet as $ObjectSet, 
+      Osdk as $Osdk,
+      PropertyValueWireToClient as $PropType,
+    } from "@osdk/api";
+    
+        ${Object.keys(definition.links).length === 0 ? `export type ${osdkObjectLinksIdentifier} = {};` : `
+        export interface ${osdkObjectLinksIdentifier}  {
+${stringify(definition.links, {
+      "*": (definition2) => {
+        const linkTarget = ontology.requireObjectType(definition2.targetType).getImportedDefinitionIdentifier(v2);
+        return `${definition2.multiplicity ? `${linkTarget}["objectSet"]` : `SingleLinkAccessor<${linkTarget}>`}
+          `;
+      }
+    })}
+    }
+    `}
+
+    export namespace ${interfaceDef.shortApiName} {
+
+      ${createPropertyKeys(interfaceDef)}
+
+
+      ${createProps(interfaceDef, "Props", false)}
+      ${createProps(interfaceDef, "StrictProps", true)}
+
+
+      ${createObjectSet(interfaceDef, ids)}
+
+      ${createOsdkObject(interfaceDef, "OsdkInstance", ids)}
+      
+    }    
+
+    ${createDefinition(interfaceDef, ontology, interfaceDef.shortApiName, ids)}
+
+`;
+  }() : ""}
+
+    export const ${interfaceDef.shortApiName}: ${interfaceDef.shortApiName} = {
+      type: "interface",
+      apiName: "${interfaceDef.fullApiName}",
+      osdkMetadata: $osdkMetadata,
+       };`;
+}
+
+// ../generator/build/esm/v2.0/generatePerInterfaceDataFiles.js
+async function generatePerInterfaceDataFiles({
+  fs: fs9,
+  outDir,
+  ontology,
+  importExt
+}) {
+  const interfacesDir = path9__default.join(outDir, "ontology", "interfaces");
+  await fs9.mkdir(interfacesDir, {
+    recursive: true
+  });
+  for (const obj of Object.values(ontology.interfaceTypes)) {
+    if (obj instanceof ForeignType) continue;
+    await fs9.writeFile(path9__default.join(interfacesDir, `${obj.shortApiName}.ts`), await formatTs(`
+        import type { PropertyDef as $PropertyDef } from "@osdk/api";
+        import { $osdkMetadata } from "../../OntologyMetadata${importExt}";
+      ${__UNSTABLE_wireInterfaceTypeV2ToSdkObjectConst(obj, ontology, true)}
+    `));
+  }
+  await fs9.writeFile(interfacesDir + ".ts", await formatTs(`
+    ${Object.values(ontology.interfaceTypes).filter((i2) => i2 instanceof EnhancedInterfaceType).map((interfaceType) => `export {${interfaceType.shortApiName}} from "./interfaces/${interfaceType.shortApiName}${importExt}";`).join("\n")}
+    ${Object.keys(ontology.interfaceTypes).length === 0 ? "export {}" : ""}
+    `));
+}
+
+// ../generator/build/esm/v2.0/generatePerObjectDataFiles.js
+init_esm_shims();
+async function generatePerObjectDataFiles(ctx) {
+  const {
+    fs: fs9,
+    outDir,
+    ontology,
+    importExt
+  } = ctx;
+  await fs9.mkdir(path9__default.join(outDir, "ontology", "objects"), {
+    recursive: true
+  });
+  for (const obj of Object.values(ontology.objectTypes)) {
+    if (obj instanceof ForeignType) continue;
+    const relPath = path9__default.join(".", "ontology", `objects`, `${obj.shortApiName}.ts`);
+    const outFilePath = path9__default.join(outDir, relPath);
+    await fs9.writeFile(outFilePath, await formatTs(`
+        import type { PropertyDef as $PropertyDef } from "@osdk/api";
+        import { $osdkMetadata } from "../../OntologyMetadata${importExt}";
+        import type { $ExpectedClientVersion } from "../../OntologyMetadata${importExt}";
+        ${wireObjectTypeV2ToSdkObjectConstV2(obj.raw, ctx, relPath)}
+      `));
+  }
+  await fs9.writeFile(path9__default.join(outDir, "ontology", "objects.ts"), await formatTs(`
+    ${Object.values(ctx.ontology.objectTypes).filter((o) => o instanceof EnhancedObjectType).map((objType) => `export {${objType.shortApiName}} from "./objects/${objType.shortApiName}${importExt}";`).join("\n")}
+    ${Object.keys(ontology.objectTypes).length === 0 ? "export {};" : ""}
+    `));
+}
+
 // ../generator/build/esm/v2.0/generatePerQueryDataFiles.js
 init_esm_shims();
 
@@ -21714,7 +21887,7 @@ async function generatePerQueryDataFilesV2({
     await generateV2QueryFile(fs9, outDir, relOutDir, query, importExt, ontology);
   }));
   await fs9.writeFile(`${outDir}.ts`, await formatTs(`
-    ${Object.values(ontology.queryTypes).map((query) => `export * from "${query.getImportPathRelTo(relOutDir)}";`).join("\n")}
+    ${Object.values(ontology.queryTypes).map((query) => `export {${query.shortApiName}} from "${query.getImportPathRelTo(relOutDir)}";`).join("\n")}
       ${Object.keys(ontology.queryTypes).length === 0 ? "export {};" : ""}
     `));
 }
@@ -21867,219 +22040,69 @@ function getQueryParamType(enhancedOntology, input, type2) {
   return inner;
 }
 
-// ../generator/build/esm/v2.0/UNSTABLE_wireInterfaceTypeV2ToSdkObjectConst.js
-init_esm_shims();
-var import_fast_deep_equal = __toESM(require_fast_deep_equal(), 1);
-
-// ../../node_modules/.pnpm/tiny-invariant@1.3.3/node_modules/tiny-invariant/dist/esm/tiny-invariant.js
+// ../generator/build/esm/v2.0/generateRootIndexTsFile.js
 init_esm_shims();
-var isProduction = process.env.NODE_ENV === "production";
-var prefix = "Invariant failed";
-function invariant(condition, message) {
-  if (isProduction) {
-    throw new Error(prefix);
-  }
-  var provided = typeof message === "function" ? message() : message;
-  var value = provided ? "".concat(prefix, ": ").concat(provided) : prefix;
-  throw new Error(value);
-}
-
-// ../generator/build/esm/v2.0/UNSTABLE_wireInterfaceTypeV2ToSdkObjectConst.js
-function __UNSTABLE_wireInterfaceTypeV2ToSdkObjectConst(interfaceDef, ontology, v2 = false) {
-  const definition = deleteUndefineds(__UNSTABLE_wireInterfaceTypeV2ToSdkObjectDefinition(interfaceDef.raw));
-  const objectDefIdentifier = interfaceDef.getDefinitionIdentifier(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()  : void 0;
-    const it = deleteUndefineds(__UNSTABLE_wireInterfaceTypeV2ToSdkObjectDefinition(ontology.requireInterfaceType(p, true).raw));
-    return it;
-  }) ?? [];
-  const mergedProperties = {
-    ...definition.properties
-  };
-  for (const parent of parents) {
-    for (const apiName of Object.keys(parent.properties)) {
-      if (definition.properties[apiName] != null) {
-        !(0, import_fast_deep_equal.default)(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()  : void 0;
-      } else if (mergedProperties[apiName] != null) {
-        !(0, import_fast_deep_equal.default)(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()  : void 0;
-      }
-      mergedProperties[apiName] = parent.properties[apiName];
-    }
-  }
-  definition.properties;
-  definition.properties = mergedProperties;
-  const objectSetIdentifier = `${interfaceDef.shortApiName}.ObjectSet`;
-  const propertyKeysIdentifier = `${interfaceDef.shortApiName}.PropertyKeys`;
-  const osdkObjectPropsIdentifier = `${interfaceDef.shortApiName}.Props`;
-  const osdkObjectStrictPropsIdentifier = `${interfaceDef.shortApiName}.StrictProps`;
-  const osdkObjectLinksIdentifier = `OsdkObjectLinks$${objectDefIdentifier}`;
-  const osdkObjectIdentifier = `${interfaceDef.shortApiName}.OsdkObject`;
-  const ids = {
-    objectDefIdentifier: interfaceDef.shortApiName,
-    osdkObjectLinksIdentifier,
-    osdkObjectPropsIdentifier,
-    osdkObjectStrictPropsIdentifier,
-    objectSetIdentifier,
-    osdkObjectIdentifier,
-    propertyKeysIdentifier
-  };
-  if (interfaceDef.apiNamespace) {
-    const badProperties = Object.keys(definition.properties).filter((apiName) => extractNamespace(apiName)[0] == null);
-    if (badProperties.length > 0) {
-      throw new Error(`Interfaces with fully qualified api names MUST NOT have any properties with an unqualified api name. Interface: ${interfaceDef.fullApiName}, properties: ${badProperties.join(", ")}`);
-    }
-  }
-  return `${[].join("\n")}
-    ${v2 ? function() {
-    return `import type {
-      InterfaceDefinition as $InterfaceDefinition,
-      ObjectSet as $ObjectSet, 
-      Osdk as $Osdk,
-      PropertyValueWireToClient as $PropType,
-    } from "@osdk/api";
-    
-        ${Object.keys(definition.links).length === 0 ? `export type ${osdkObjectLinksIdentifier} = {};` : `
-        export interface ${osdkObjectLinksIdentifier}  {
-${stringify(definition.links, {
-      "*": (definition2) => {
-        const linkTarget = ontology.requireObjectType(definition2.targetType).getImportedDefinitionIdentifier(v2);
-        return `${definition2.multiplicity ? `${linkTarget}["objectSet"]` : `SingleLinkAccessor<${linkTarget}>`}
-          `;
-      }
-    })}
-    }
-    `}
-
-    export namespace ${interfaceDef.shortApiName} {
-
-      ${createPropertyKeys(interfaceDef)}
-
-
-      ${createProps(interfaceDef, "Props", false)}
-      ${createProps(interfaceDef, "StrictProps", true)}
-
-
-      ${createObjectSet(interfaceDef, ids)}
-
-      ${createOsdkObject(interfaceDef, "OsdkObject", ids)}
-      
-    }    
-
-    ${createDefinition(interfaceDef, ontology, interfaceDef.shortApiName, ids)}
-
-`;
-  }() : ""}
-
-    export const ${interfaceDef.shortApiName}: ${interfaceDef.shortApiName} = {
-      type: "interface",
-      apiName: "${interfaceDef.fullApiName}",
-      osdkMetadata: $osdkMetadata,
-       };`;
-}
-
-// ../generator/build/esm/v2.0/generateClientSdkVersionTwoPointZero.js
 async function generateRootIndexTsFile({
   fs: fs9,
   outDir,
   importExt,
-  ontologyApiNamespace
+  ontologyApiNamespace,
+  ontology
 }) {
-  fs9.writeFile(path9__default.join(outDir, "index.ts"), await formatTs(`export * from "./ontology/actions${importExt}";
+  fs9.writeFile(path9__default.join(outDir, "index.ts"), await formatTs(`export {${helper(ontology.actionTypes)}} from "./ontology/actions${importExt}";
         export * as $Actions from "./ontology/actions${importExt}";
-        export * from "./ontology/interfaces${importExt}";
+        export {${helper(ontology.interfaceTypes)}} from "./ontology/interfaces${importExt}";
         export * as $Interfaces from "./ontology/interfaces${importExt}";
-        export * from "./ontology/objects${importExt}";
+        export {${helper(ontology.objectTypes)}} from "./ontology/objects${importExt}";
         export * as $Objects from "./ontology/objects${importExt}";
-        export * from "./ontology/queries${importExt}";
+        export {${helper(ontology.queryTypes)}} from "./ontology/queries${importExt}";
         export * as $Queries from "./ontology/queries${importExt}";
         ${ontologyApiNamespace == null ? `export { $ontologyRid } from "./OntologyMetadata${importExt}";` : ``}
     `));
 }
-async function generateEachObjectFile(ctx) {
-  const {
-    fs: fs9,
-    outDir,
-    ontology,
-    importExt
-  } = ctx;
-  await fs9.mkdir(path9__default.join(outDir, "ontology", "objects"), {
-    recursive: true
-  });
-  for (const obj of Object.values(ontology.objectTypes)) {
-    const relPath = path9__default.join(".", "ontology", `objects`, `${obj.shortApiName}.ts`);
-    const outFilePath = path9__default.join(outDir, relPath);
-    await fs9.writeFile(outFilePath, await formatTs(`
-        import type { PropertyDef as $PropertyDef } from "@osdk/api";
-        import { $osdkMetadata } from "../../OntologyMetadata${importExt}";
-        import type { $ExpectedClientVersion } from "../../OntologyMetadata${importExt}";
-        ${wireObjectTypeV2ToSdkObjectConstV2(obj.raw, ctx, relPath)}
-      `));
-  }
+function helper(x) {
+  return Object.values(x).filter((x2) => !(x2 instanceof ForeignType)).map((a) => a.shortApiName).join(", ");
 }
-async function generateClientSdkVersionTwoPointZero(ontology, userAgent, fs9, outDir, packageType = "commonjs", ontologyApiNamespace, apiNamespacePackageMap = /* @__PURE__ */ new Map()) {
+
+// ../generator/build/esm/v2.0/generateClientSdkVersionTwoPointZero.js
+async function generateClientSdkVersionTwoPointZero(ontology, userAgent, fs9, outDir, packageType = "commonjs", externalObjects = /* @__PURE__ */ new Map(), externalInterfaces = /* @__PURE__ */ new Map(), externalSpts = /* @__PURE__ */ new Map()) {
   const importExt = packageType === "module" ? ".js" : "";
   await verifyOutDir(outDir, fs9);
   const sanitizedOntology = sanitizeMetadata(ontology);
   await fs9.mkdir(outDir, {
     recursive: true
   });
-  const enhancedOntology = enhanceOntology(sanitizedOntology, ontologyApiNamespace, apiNamespacePackageMap, importExt);
+  const enhancedOntology = enhanceOntology({
+    sanitized: sanitizedOntology,
+    importExt,
+    externalObjects,
+    externalInterfaces,
+    externalSpts
+  });
   const ctx = {
     sanitizedOntology,
     ontology: enhancedOntology,
     importExt,
     fs: fs9,
-    outDir,
-    ontologyApiNamespace,
-    apiNamespacePackageMap
+    outDir
   };
   await generateRootIndexTsFile(ctx);
   await generateOntologyMetadataFile(ctx, userAgent);
-  await generateEachObjectFile(ctx);
-  await generateOntologyInterfaces(ctx);
-  const actionsDir = path9__default.join(outDir, "ontology", "actions");
-  await fs9.mkdir(actionsDir, {
-    recursive: true
-  });
+  await generatePerObjectDataFiles(ctx);
+  await generatePerInterfaceDataFiles(ctx);
   await generatePerActionDataFiles(ctx);
-  await fs9.writeFile(path9__default.join(outDir, "ontology", "objects.ts"), await formatTs(`
-    ${Object.values(enhancedOntology.objectTypes).map((objType) => `export * from "./objects/${objType.shortApiName}${importExt}";`).join("\n")}
-    ${Object.keys(ontology.objectTypes).length === 0 ? "export {};" : ""}
-    `));
   await generatePerQueryDataFilesV2(ctx);
 }
-async function generateOntologyInterfaces({
-  fs: fs9,
-  outDir,
-  ontology,
-  importExt
-}) {
-  const interfacesDir = path9__default.join(outDir, "ontology", "interfaces");
-  await fs9.mkdir(interfacesDir, {
-    recursive: true
-  });
-  for (const obj of Object.values(ontology.interfaceTypes)) {
-    await fs9.writeFile(path9__default.join(interfacesDir, `${obj.shortApiName}.ts`), await formatTs(`
-        import type { PropertyDef as $PropertyDef } from "@osdk/api";
-        import { $osdkMetadata } from "../../OntologyMetadata${importExt}";
-      ${__UNSTABLE_wireInterfaceTypeV2ToSdkObjectConst(obj, ontology, true)}
-    `));
-  }
-  await fs9.writeFile(interfacesDir + ".ts", await formatTs(`
-    ${Object.values(ontology.interfaceTypes).map((interfaceType) => `export * from "./interfaces/${interfaceType.shortApiName}${importExt}";`).join("\n")}
-    ${Object.keys(ontology.interfaceTypes).length === 0 ? "export {}" : ""}
-    `));
-}
 
 // ../generator/build/esm/generateClientSdkPackage.js
-async function generateClientSdkPackage(packageName, packageVersion, sdkVersion, baseOutDir, ontology, minimalFs, dependencyVersions, cliVersion, ontologyApiNamespace, apiNamespacePackageMap) {
+async function generateClientSdkPackage(packageName, packageVersion, sdkVersion, baseOutDir, ontology, minimalFs, dependencyVersions, cliVersion, externalObjects = /* @__PURE__ */ new Map(), externalInterfaces = /* @__PURE__ */ new Map()) {
   if (!packageName) throw new Error("Package name is required");
   if (sdkVersion === "1.1") {
     throw new Error("This generator version does not support generating v1 sdks");
   }
   for (const packageType of ["module", "commonjs"]) {
     const outDir = path9.join(baseOutDir, "dist", packageType);
-    generateClientSdkVersionTwoPointZero(ontology, `typescript-sdk/${packageVersion} osdk-cli/${cliVersion}`, minimalFs, outDir, packageType, ontologyApiNamespace, apiNamespacePackageMap);
+    generateClientSdkVersionTwoPointZero(ontology, `typescript-sdk/${packageVersion} osdk-cli/${cliVersion}`, minimalFs, outDir, packageType, externalObjects, externalInterfaces);
     await fs8.promises.mkdir(outDir, {
       recursive: true
     });
@@ -22195,12 +22218,12 @@ var symbolClientContext = Symbol("ClientContext");
 
 // ../shared.net.platformapi/build/esm/foundryPlatformFetch.js
 async function foundryPlatformFetch(client, [httpMethodNum, origPath, flags, contentType, responseContentType], ...args) {
-  const path19 = origPath.replace(/\{([^}]+)\}/g, () => encodeURIComponent(args.shift()));
+  const path21 = origPath.replace(/\{([^}]+)\}/g, () => encodeURIComponent(args.shift()));
   const body = flags & 1 ? args.shift() : void 0;
   const queryArgs = flags & 2 ? args.shift() : void 0;
   const headerArgs = flags & 4 ? args.shift() : void 0;
   const method = ["GET", "POST", "PUT", "DELETE", "PATCH"][httpMethodNum];
-  return await apiFetch(client[symbolClientContext] ?? client, method, path19, body, queryArgs, headerArgs, contentType, responseContentType);
+  return await apiFetch(client[symbolClientContext] ?? client, method, path21, body, queryArgs, headerArgs, contentType, responseContentType);
 }
 async function apiFetch(clientCtx, method, endpointPath, data, queryArguments, headers, requestMediaType, responseMediaType) {
   const url2 = new URL(`/api${endpointPath}`, clientCtx.baseUrl);
@@ -22309,7 +22332,7 @@ init_esm_shims();
 
 // ../cli.cmd.typescript/build/esm/generate/handleGenerate.mjs
 var import_fast_deep_equal2 = __toESM(require_fast_deep_equal(), 1);
-var USER_AGENT = `osdk-cli.cmd.typescript/${"0.24.2-beta.2"}`;
+var USER_AGENT = `osdk-cli.cmd.typescript/${"0.24.2"}`;
 async function handleGenerate(args) {
   let success = false;
   if (args.ontologyPath) {
@@ -22445,7 +22468,7 @@ async function generateClientSdk(ontology, args) {
       }
       return true;
     }
-    await generateClientSdkPackage(args.packageName, args.version, args.beta ? "2.0" : "1.1", args.outDir, ontology, minimalFs, await getDependencyVersions(), "0.24.2-beta.2", args.ontologyApiNamespace, args.apiNamespaceMap);
+    await generateClientSdkPackage(args.packageName, args.version, args.beta ? "2.0" : "1.1", args.outDir, ontology, minimalFs, await getDependencyVersions(), "0.24.2", args.externalObjects, args.externalInterfaces);
     return true;
   } catch (e) {
     consola.error("OSDK generation failed", e.message, e.stack);
@@ -22467,8 +22490,8 @@ async function getDependencyVersions() {
   const typescriptVersion = ourPackageJson.devDependencies.typescript;
   const tslibVersion = ourPackageJson.dependencies.tslib;
   const areTheTypesWrongVersion = ourPackageJson.dependencies["@arethetypeswrong/cli"];
-  const osdkClientVersion = `^${"2.0.2-beta.2"}`;
-  const osdkApiVersion = `^${"2.0.2-beta.2"}`;
+  const osdkClientVersion = `^${"2.0.2"}`;
+  const osdkApiVersion = `^${"2.0.2"}`;
   const osdkLegacyClientVersion = `^${process.env.PACKAGE_LEGACY_CLIENT_VERSION}`;
   return {
     typescriptVersion,
@@ -22492,7 +22515,7 @@ async function getOurPackageJsonPath() {
   return cachedOurPackageJsonPath = ourPackageJsonPath;
 }
 async function generateSourceFiles(args, ontology, fs9) {
-  await generateClientSdkVersionTwoPointZero(ontology, getUserAgent(args.version), fs9, args.outDir, args.packageType, args.ontologyApiNamespace, args.apiNamespaceMap);
+  await generateClientSdkVersionTwoPointZero(ontology, getUserAgent(args.version), fs9, args.outDir, args.packageType, args.externalObjects, args.externalInterfaces);
 }
 function getUserAgent(version) {
   if (version === "dev") {
@@ -22503,16 +22526,16 @@ function getUserAgent(version) {
 }
 function createNormalFs() {
   return {
-    writeFile: (path19, contents) => {
-      return fs8.promises.writeFile(path19, contents, "utf-8");
+    writeFile: (path21, contents) => {
+      return fs8.promises.writeFile(path21, contents, "utf-8");
     },
-    mkdir: async (path19, options8) => {
-      await fs8.promises.mkdir(path19, options8);
+    mkdir: async (path21, options8) => {
+      await fs8.promises.mkdir(path21, options8);
     },
-    readdir: async (path19) => fs8.promises.readdir(path19)
+    readdir: async (path21) => fs8.promises.readdir(path21)
   };
 }
 
 export { getDependencyVersions, handleGenerate, updateVersionsIfTheyExist };
-//# sourceMappingURL=handleGenerate-BYKD4FQH.js.map
-//# sourceMappingURL=handleGenerate-BYKD4FQH.js.map
+//# sourceMappingURL=handleGenerate-FRYQNME6.js.map
+//# sourceMappingURL=handleGenerate-FRYQNME6.js.map